svn commit: r241345 - head
Author: dougb Date: Mon Oct 8 10:34:49 2012 New Revision: 241345 URL: http://svn.freebsd.org/changeset/base/241345 Log: Remove my pre-commit review request for mergemaster Modified: head/MAINTAINERS Modified: head/MAINTAINERS == --- head/MAINTAINERSMon Oct 8 08:03:58 2012(r241344) +++ head/MAINTAINERSMon Oct 8 10:34:49 2012(r241345) @@ -21,7 +21,6 @@ It is not a registry of 'turf' or privat subsystem login notes - kqueue jmg Pre-commit review requested. -mergemasterdougb Prefers to pre-approve commits libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. UFS EAsrwatson Pre-commit review requested. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241346 - svnadmin/conf
Author: dougb Date: Mon Oct 8 10:43:59 2012 New Revision: 241346 URL: http://svn.freebsd.org/changeset/base/241346 Log: Good night. :) Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessMon Oct 8 10:34:49 2012(r241345) +++ svnadmin/conf/accessMon Oct 8 10:43:59 2012(r241346) @@ -71,7 +71,6 @@ dfr dg dim dmarion -dougb dteske dumbbell dwhite ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241337 - stable/9/usr.sbin/mergemaster
Author: dougb
Date: Mon Oct 8 05:50:58 2012
New Revision: 241337
URL: http://svn.freebsd.org/changeset/base/241337
Log:
MFC r241218:
Remove references to CVS so that people will stop bringing it up
For -p:
The localtime update should have been excluded in the first place
The make.conf comparison has been OBE for some time now, and there
is no src.conf equivalent to share/examples/make.conf, so remove
the whole thing.
Update copyright
Modified:
stable/9/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
stable/9/usr.sbin/mergemaster/ (props changed)
Modified: stable/9/usr.sbin/mergemaster/mergemaster.sh
==
--- stable/9/usr.sbin/mergemaster/mergemaster.shSun Oct 7 23:45:19
2012(r241336)
+++ stable/9/usr.sbin/mergemaster/mergemaster.shMon Oct 8 05:50:58
2012(r241337)
@@ -5,8 +5,8 @@
# Compare files created by /usr/src/etc/Makefile (or the directory
# the user specifies) with the currently installed copies.
-# Copyright 1998-2011 Douglas Barton
-# do...@freebsd.org
+# Copyright (c) 1998-2012 Douglas Barton, All rights reserved
+# Please see detailed copyright below
# $FreeBSD$
@@ -532,9 +532,9 @@ if [ -t 0 ]; then
esac
fi
-# Define what CVS $Id tag to look for to aid portability.
+# Define what $Id tag to look for to aid portability.
#
-CVS_ID_TAG=FreeBSD
+ID_TAG=FreeBSD
delete_temproot () {
rm -rf ${TEMPROOT} 2/dev/null
@@ -1095,17 +1095,17 @@ for COMPFILE in `find . -type f | sort`;
case ${STRICT} in
'' | [Nn][Oo])
-# Compare CVS $Id's first so if the file hasn't been modified
+# Compare $Id's first so if the file hasn't been modified
# local changes will be ignored.
# If the files have the same $Id, delete the one in temproot so the
# user will have less to wade through if files are left to merge by hand.
#
-CVSID1=`grep [$]${CVS_ID_TAG}: ${DESTDIR}${COMPFILE#.} 2/dev/null`
-CVSID2=`grep [$]${CVS_ID_TAG}: ${COMPFILE} 2/dev/null` || CVSID2=none
+ID1=`grep [$]${ID_TAG}: ${DESTDIR}${COMPFILE#.} 2/dev/null`
+ID2=`grep [$]${ID_TAG}: ${COMPFILE} 2/dev/null` || ID2=none
-case ${CVSID2} in
-${CVSID1})
- echo *** Temp ${COMPFILE} and installed have the same CVS Id, deleting
+case ${ID2} in
+${ID1})
+ echo *** Temp ${COMPFILE} and installed have the same Id, deleting
rm ${COMPFILE}
;;
esac
@@ -1334,7 +1334,7 @@ case ${NEED_PWD_MKDB} in
;;
esac
-if [ -e ${DESTDIR}/etc/localtime ]; then # Ignore if TZ == UTC
+if [ -e ${DESTDIR}/etc/localtime -a -z ${PRE_WORLD} ]; then#
Ignore if TZ == UTC
echo ''
[ -n ${DESTDIR} ] tzs_args=-C ${DESTDIR}
if [ -f ${DESTDIR}/var/db/zoneinfo ]; then
@@ -1380,29 +1380,35 @@ case ${COMP_CONFS} in
;;
esac
-case ${PRE_WORLD} in
-'') ;;
-*)
- MAKE_CONF=${SOURCEDIR}/share/examples/etc/make.conf
-
- (echo ''
- echo '*** Comparing make variables'
- echo ''
- echo *** From ${DESTDIR}/etc/make.conf
- echo *** From ${MAKE_CONF}
-
- for MAKE_VAR in `grep -i ^[a-z] ${DESTDIR}/etc/make.conf | cut -d '=' -f 1`;
do
-echo ''
-grep -w ^${MAKE_VAR} ${DESTDIR}/etc/make.conf
-grep -w ^#${MAKE_VAR} ${MAKE_CONF} ||
- echo ' * No example variable with this name'
- done) | ${PAGER}
- ;;
-esac
-
if [ -n ${PRESERVE_FILES} ]; then
find -d $PRESERVE_FILES_DIR -type d -empty -delete 2/dev/null
rmdir $PRESERVE_FILES_DIR 2/dev/null
fi
exit 0
+
+#~~~
+
+# Copyright (c) 1998-2012 Douglas Barton
+# 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 THE 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 THE 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
svn commit: r241338 - stable/8/usr.sbin/mergemaster
Author: dougb
Date: Mon Oct 8 05:51:26 2012
New Revision: 241338
URL: http://svn.freebsd.org/changeset/base/241338
Log:
MFC r241218:
Remove references to CVS so that people will stop bringing it up
For -p:
The localtime update should have been excluded in the first place
The make.conf comparison has been OBE for some time now, and there
is no src.conf equivalent to share/examples/make.conf, so remove
the whole thing.
Update copyright
Modified:
stable/8/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
stable/8/usr.sbin/mergemaster/ (props changed)
Modified: stable/8/usr.sbin/mergemaster/mergemaster.sh
==
--- stable/8/usr.sbin/mergemaster/mergemaster.shMon Oct 8 05:50:58
2012(r241337)
+++ stable/8/usr.sbin/mergemaster/mergemaster.shMon Oct 8 05:51:26
2012(r241338)
@@ -5,8 +5,8 @@
# Compare files created by /usr/src/etc/Makefile (or the directory
# the user specifies) with the currently installed copies.
-# Copyright 1998-2011 Douglas Barton
-# do...@freebsd.org
+# Copyright (c) 1998-2012 Douglas Barton, All rights reserved
+# Please see detailed copyright below
# $FreeBSD$
@@ -532,9 +532,9 @@ if [ -t 0 ]; then
esac
fi
-# Define what CVS $Id tag to look for to aid portability.
+# Define what $Id tag to look for to aid portability.
#
-CVS_ID_TAG=FreeBSD
+ID_TAG=FreeBSD
delete_temproot () {
rm -rf ${TEMPROOT} 2/dev/null
@@ -1097,17 +1097,17 @@ for COMPFILE in `find . -type f | sort`;
case ${STRICT} in
'' | [Nn][Oo])
-# Compare CVS $Id's first so if the file hasn't been modified
+# Compare $Id's first so if the file hasn't been modified
# local changes will be ignored.
# If the files have the same $Id, delete the one in temproot so the
# user will have less to wade through if files are left to merge by hand.
#
-CVSID1=`grep [$]${CVS_ID_TAG}: ${DESTDIR}${COMPFILE#.} 2/dev/null`
-CVSID2=`grep [$]${CVS_ID_TAG}: ${COMPFILE} 2/dev/null` || CVSID2=none
+ID1=`grep [$]${ID_TAG}: ${DESTDIR}${COMPFILE#.} 2/dev/null`
+ID2=`grep [$]${ID_TAG}: ${COMPFILE} 2/dev/null` || ID2=none
-case ${CVSID2} in
-${CVSID1})
- echo *** Temp ${COMPFILE} and installed have the same CVS Id, deleting
+case ${ID2} in
+${ID1})
+ echo *** Temp ${COMPFILE} and installed have the same Id, deleting
rm ${COMPFILE}
;;
esac
@@ -1336,7 +1336,7 @@ case ${NEED_PWD_MKDB} in
;;
esac
-if [ -e ${DESTDIR}/etc/localtime ]; then # Ignore if TZ == UTC
+if [ -e ${DESTDIR}/etc/localtime -a -z ${PRE_WORLD} ]; then#
Ignore if TZ == UTC
echo ''
[ -n ${DESTDIR} ] tzs_args=-C ${DESTDIR}
if [ -f ${DESTDIR}/var/db/zoneinfo ]; then
@@ -1382,29 +1382,35 @@ case ${COMP_CONFS} in
;;
esac
-case ${PRE_WORLD} in
-'') ;;
-*)
- MAKE_CONF=${SOURCEDIR}/share/examples/etc/make.conf
-
- (echo ''
- echo '*** Comparing make variables'
- echo ''
- echo *** From ${DESTDIR}/etc/make.conf
- echo *** From ${MAKE_CONF}
-
- for MAKE_VAR in `grep -i ^[a-z] ${DESTDIR}/etc/make.conf | cut -d '=' -f 1`;
do
-echo ''
-grep -w ^${MAKE_VAR} ${DESTDIR}/etc/make.conf
-grep -w ^#${MAKE_VAR} ${MAKE_CONF} ||
- echo ' * No example variable with this name'
- done) | ${PAGER}
- ;;
-esac
-
if [ -n ${PRESERVE_FILES} ]; then
find -d $PRESERVE_FILES_DIR -type d -empty -delete 2/dev/null
rmdir $PRESERVE_FILES_DIR 2/dev/null
fi
exit 0
+
+#~~~
+
+# Copyright (c) 1998-2012 Douglas Barton
+# 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 THE 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 THE 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
svn commit: r241339 - stable/7/usr.sbin/mergemaster
Author: dougb
Date: Mon Oct 8 05:51:47 2012
New Revision: 241339
URL: http://svn.freebsd.org/changeset/base/241339
Log:
MFC r241218:
Remove references to CVS so that people will stop bringing it up
For -p:
The localtime update should have been excluded in the first place
The make.conf comparison has been OBE for some time now, and there
is no src.conf equivalent to share/examples/make.conf, so remove
the whole thing.
Update copyright
Modified:
stable/7/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
stable/7/usr.sbin/mergemaster/ (props changed)
Modified: stable/7/usr.sbin/mergemaster/mergemaster.sh
==
--- stable/7/usr.sbin/mergemaster/mergemaster.shMon Oct 8 05:51:26
2012(r241338)
+++ stable/7/usr.sbin/mergemaster/mergemaster.shMon Oct 8 05:51:47
2012(r241339)
@@ -5,8 +5,8 @@
# Compare files created by /usr/src/etc/Makefile (or the directory
# the user specifies) with the currently installed copies.
-# Copyright 1998-2011 Douglas Barton
-# do...@freebsd.org
+# Copyright (c) 1998-2012 Douglas Barton, All rights reserved
+# Please see detailed copyright below
# $FreeBSD$
@@ -532,9 +532,9 @@ if [ -t 0 ]; then
esac
fi
-# Define what CVS $Id tag to look for to aid portability.
+# Define what $Id tag to look for to aid portability.
#
-CVS_ID_TAG=FreeBSD
+ID_TAG=FreeBSD
delete_temproot () {
rm -rf ${TEMPROOT} 2/dev/null
@@ -1094,17 +1094,17 @@ for COMPFILE in `find . -type f | sort`;
case ${STRICT} in
'' | [Nn][Oo])
-# Compare CVS $Id's first so if the file hasn't been modified
+# Compare $Id's first so if the file hasn't been modified
# local changes will be ignored.
# If the files have the same $Id, delete the one in temproot so the
# user will have less to wade through if files are left to merge by hand.
#
-CVSID1=`grep [$]${CVS_ID_TAG}: ${DESTDIR}${COMPFILE#.} 2/dev/null`
-CVSID2=`grep [$]${CVS_ID_TAG}: ${COMPFILE} 2/dev/null` || CVSID2=none
+ID1=`grep [$]${ID_TAG}: ${DESTDIR}${COMPFILE#.} 2/dev/null`
+ID2=`grep [$]${ID_TAG}: ${COMPFILE} 2/dev/null` || ID2=none
-case ${CVSID2} in
-${CVSID1})
- echo *** Temp ${COMPFILE} and installed have the same CVS Id, deleting
+case ${ID2} in
+${ID1})
+ echo *** Temp ${COMPFILE} and installed have the same Id, deleting
rm ${COMPFILE}
;;
esac
@@ -1322,7 +1322,7 @@ case ${NEED_PWD_MKDB} in
;;
esac
-if [ -e ${DESTDIR}/etc/localtime ]; then # Ignore if TZ == UTC
+if [ -e ${DESTDIR}/etc/localtime -a -z ${PRE_WORLD} ]; then#
Ignore if TZ == UTC
echo ''
[ -n ${DESTDIR} ] tzs_args=-C ${DESTDIR}
if [ -f ${DESTDIR}/var/db/zoneinfo ]; then
@@ -1368,29 +1368,35 @@ case ${COMP_CONFS} in
;;
esac
-case ${PRE_WORLD} in
-'') ;;
-*)
- MAKE_CONF=${SOURCEDIR}/share/examples/etc/make.conf
-
- (echo ''
- echo '*** Comparing make variables'
- echo ''
- echo *** From ${DESTDIR}/etc/make.conf
- echo *** From ${MAKE_CONF}
-
- for MAKE_VAR in `grep -i ^[a-z] ${DESTDIR}/etc/make.conf | cut -d '=' -f 1`;
do
-echo ''
-grep -w ^${MAKE_VAR} ${DESTDIR}/etc/make.conf
-grep -w ^#${MAKE_VAR} ${MAKE_CONF} ||
- echo ' * No example variable with this name'
- done) | ${PAGER}
- ;;
-esac
-
if [ -n ${PRESERVE_FILES} ]; then
find -d $PRESERVE_FILES_DIR -type d -empty -delete 2/dev/null
rmdir $PRESERVE_FILES_DIR 2/dev/null
fi
exit 0
+
+#~~~
+
+# Copyright (c) 1998-2012 Douglas Barton
+# 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 THE 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 THE 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
svn commit: r241203 - stable/8/games/fortune/datfiles
Author: dougb Date: Thu Oct 4 22:16:38 2012 New Revision: 241203 URL: http://svn.freebsd.org/changeset/base/241203 Log: MFC r238879: Add a couple of nice quotes from Edward Everett Hale Modified: stable/8/games/fortune/datfiles/fortunes Directory Properties: stable/8/games/fortune/ (props changed) Modified: stable/8/games/fortune/datfiles/fortunes == --- stable/8/games/fortune/datfiles/fortunesThu Oct 4 22:16:17 2012 (r241202) +++ stable/8/games/fortune/datfiles/fortunesThu Oct 4 22:16:38 2012 (r241203) @@ -22100,6 +22100,11 @@ planet. Tuna, chicken, sparrow-brains, e world that they like, but catnip is crack from home. -- Bill Cole % +I am only one, but I am one. I cannot do everything, but I can do +something. And I will not let what I cannot do interfere with what +I can do. + -- Edward Everett Hale, (1822 - 1909) +% I am professionally trained in computer science, which is to say (in all seriousness) that I am extremely poorly educated. -- Joseph Weizenbaum, Computer Power and Human Reason @@ -31413,6 +31418,10 @@ Look ere ye leap. % Look out! Behind you! % +Look up and not down, look forward and not back, look out and not in, +and lend a hand. + -- Edward Everett Hale, Lowell Institute Lectures (1869) +% Look, we play the Star Spangled Banner before every game. You want us to pay income taxes, too? -- Bill Veeck, Chicago White Sox ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241202 - stable/9/games/fortune/datfiles
Author: dougb Date: Thu Oct 4 22:16:17 2012 New Revision: 241202 URL: http://svn.freebsd.org/changeset/base/241202 Log: MFC r238879: Add a couple of nice quotes from Edward Everett Hale Modified: stable/9/games/fortune/datfiles/fortunes Directory Properties: stable/9/games/fortune/ (props changed) Modified: stable/9/games/fortune/datfiles/fortunes == --- stable/9/games/fortune/datfiles/fortunesThu Oct 4 21:55:37 2012 (r241201) +++ stable/9/games/fortune/datfiles/fortunesThu Oct 4 22:16:17 2012 (r241202) @@ -22100,6 +22100,11 @@ planet. Tuna, chicken, sparrow-brains, e world that they like, but catnip is crack from home. -- Bill Cole % +I am only one, but I am one. I cannot do everything, but I can do +something. And I will not let what I cannot do interfere with what +I can do. + -- Edward Everett Hale, (1822 - 1909) +% I am professionally trained in computer science, which is to say (in all seriousness) that I am extremely poorly educated. -- Joseph Weizenbaum, Computer Power and Human Reason @@ -31413,6 +31418,10 @@ Look ere ye leap. % Look out! Behind you! % +Look up and not down, look forward and not back, look out and not in, +and lend a hand. + -- Edward Everett Hale, Lowell Institute Lectures (1869) +% Look, we play the Star Spangled Banner before every game. You want us to pay income taxes, too? -- Bill Veeck, Chicago White Sox ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241204 - stable/7/games/fortune/datfiles
Author: dougb Date: Thu Oct 4 22:16:58 2012 New Revision: 241204 URL: http://svn.freebsd.org/changeset/base/241204 Log: MFC r238879: Add a couple of nice quotes from Edward Everett Hale Modified: stable/7/games/fortune/datfiles/fortunes Directory Properties: stable/7/games/fortune/ (props changed) Modified: stable/7/games/fortune/datfiles/fortunes == --- stable/7/games/fortune/datfiles/fortunesThu Oct 4 22:16:38 2012 (r241203) +++ stable/7/games/fortune/datfiles/fortunesThu Oct 4 22:16:58 2012 (r241204) @@ -22100,6 +22100,11 @@ planet. Tuna, chicken, sparrow-brains, e world that they like, but catnip is crack from home. -- Bill Cole % +I am only one, but I am one. I cannot do everything, but I can do +something. And I will not let what I cannot do interfere with what +I can do. + -- Edward Everett Hale, (1822 - 1909) +% I am professionally trained in computer science, which is to say (in all seriousness) that I am extremely poorly educated. -- Joseph Weizenbaum, Computer Power and Human Reason @@ -31413,6 +31418,10 @@ Look ere ye leap. % Look out! Behind you! % +Look up and not down, look forward and not back, look out and not in, +and lend a hand. + -- Edward Everett Hale, Lowell Institute Lectures (1869) +% Look, we play the Star Spangled Banner before every game. You want us to pay income taxes, too? -- Bill Veeck, Chicago White Sox ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241206 - stable/8/libexec/save-entropy
Author: dougb
Date: Thu Oct 4 22:23:57 2012
New Revision: 241206
URL: http://svn.freebsd.org/changeset/base/241206
Log:
MFC r240090:
Improve file rotation
Modified:
stable/8/libexec/save-entropy/save-entropy.sh
Directory Properties:
stable/8/libexec/save-entropy/ (props changed)
Modified: stable/8/libexec/save-entropy/save-entropy.sh
==
--- stable/8/libexec/save-entropy/save-entropy.sh Thu Oct 4 22:23:40
2012(r241205)
+++ stable/8/libexec/save-entropy/save-entropy.sh Thu Oct 4 22:23:57
2012(r241206)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2001-2006 Douglas Barton, do...@freebsd.org
+# Copyright (c) 2001-2006,2012 Douglas Barton, do...@freebsd.org
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
# This script is called by cron to store bits of randomness which are
# then used to seed /dev/random on boot.
-# Originally developed by Doug Barton, do...@freebsd.org
+# Originally developed by Doug Barton, do...@freebsd.org
PATH=/bin:/usr/bin
@@ -55,38 +55,36 @@ entropy_save_sz=${entropy_save_sz:-2048}
entropy_save_num=${entropy_save_num:-8}
if [ ! -d ${entropy_dir} ]; then
- umask 077
- mkdir ${entropy_dir} || {
- logger -is -t $0 The entropy directory ${entropy_dir} does not \
-exist, and cannot be created. Therefore no entropy can be saved. ;
- exit 1;}
- /usr/sbin/chown operator:operator ${entropy_dir}
- chmod 0700 ${entropy_dir}
+ install -d -o operator -g operator -m 0700 ${entropy_dir} || {
+ logger -is -t $0 The entropy directory ${entropy_dir} does \
+ not exist, and cannot be created. Therefore no entropy can \
+ be saved.; exit 1; }
fi
+cd ${entropy_dir} || {
+ logger -is -t $0 Cannot cd to the entropy directory:
${entropy_dir}. \
+ Entropy file rotation is aborted.; exit 1; }
+
+for f in saved-entropy.*; do
+ case ${f} in saved-entropy.\*) continue ;; esac # No files match
+ [ ${f#saved-entropy\.} -ge ${entropy_save_num} ] unlink ${f}
+done
+
umask 377
-esn_m1=$(( ${entropy_save_num} - 1 ))
-for file_num in `jot $esn_m1 $esn_m1 1`; do
- if [ -e ${entropy_dir}/saved-entropy.${file_num} ]; then
- if [ -f ${entropy_dir}/saved-entropy.${file_num} ]; then
- new_file=saved-entropy.$(( $file_num + 1 ))
- if [ -e ${entropy_dir}/${new_file} ]; then
- unlink ${entropy_dir}/${new_file}
- fi
- mv ${entropy_dir}/saved-entropy.${file_num} \
- ${entropy_dir}/${new_file}
- else
- logger -is -t $0 \
-${entropy_dir}/saved-entropy.${file_num} is not a regular file, and therefore
\
-it will not be rotated. Entropy file harvesting is aborted.
- exit 1
- fi
+n=$(( ${entropy_save_num} - 1 ))
+while [ ${n} -ge 1 ]; do
+ if [ -f saved-entropy.${n} ]; then
+ mv saved-entropy.${n} saved-entropy.$(( ${n} + 1 ))
+ elif [ -e saved-entropy.${n} -o -L saved-entropy.${n} ]; then
+ logger -is -t $0 \
+ ${entropy_dir}/saved-entropy.${n} is not a regular file, and so \
+ it will not be rotated. Entropy file rotation is aborted.
+ exit 1
fi
+ n=$(( ${n} - 1 ))
done
-dd if=/dev/random of=${entropy_dir}/saved-entropy.1 \
-bs=$entropy_save_sz count=1 2 /dev/null
+dd if=/dev/random of=saved-entropy.1 bs=${entropy_save_sz} count=1 2/dev/null
exit 0
-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241207 - stable/7/libexec/save-entropy
Author: dougb
Date: Thu Oct 4 22:24:14 2012
New Revision: 241207
URL: http://svn.freebsd.org/changeset/base/241207
Log:
MFC r240090:
Improve file rotation
Modified:
stable/7/libexec/save-entropy/save-entropy.sh
Directory Properties:
stable/7/libexec/save-entropy/ (props changed)
Modified: stable/7/libexec/save-entropy/save-entropy.sh
==
--- stable/7/libexec/save-entropy/save-entropy.sh Thu Oct 4 22:23:57
2012(r241206)
+++ stable/7/libexec/save-entropy/save-entropy.sh Thu Oct 4 22:24:14
2012(r241207)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2001-2006 Douglas Barton, do...@freebsd.org
+# Copyright (c) 2001-2006,2012 Douglas Barton, do...@freebsd.org
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
# This script is called by cron to store bits of randomness which are
# then used to seed /dev/random on boot.
-# Originally developed by Doug Barton, do...@freebsd.org
+# Originally developed by Doug Barton, do...@freebsd.org
PATH=/bin:/usr/bin
@@ -55,38 +55,36 @@ entropy_save_sz=${entropy_save_sz:-2048}
entropy_save_num=${entropy_save_num:-8}
if [ ! -d ${entropy_dir} ]; then
- umask 077
- mkdir ${entropy_dir} || {
- logger -is -t $0 The entropy directory ${entropy_dir} does not \
-exist, and cannot be created. Therefore no entropy can be saved. ;
- exit 1;}
- /usr/sbin/chown operator:operator ${entropy_dir}
- chmod 0700 ${entropy_dir}
+ install -d -o operator -g operator -m 0700 ${entropy_dir} || {
+ logger -is -t $0 The entropy directory ${entropy_dir} does \
+ not exist, and cannot be created. Therefore no entropy can \
+ be saved.; exit 1; }
fi
+cd ${entropy_dir} || {
+ logger -is -t $0 Cannot cd to the entropy directory:
${entropy_dir}. \
+ Entropy file rotation is aborted.; exit 1; }
+
+for f in saved-entropy.*; do
+ case ${f} in saved-entropy.\*) continue ;; esac # No files match
+ [ ${f#saved-entropy\.} -ge ${entropy_save_num} ] unlink ${f}
+done
+
umask 377
-esn_m1=$(( ${entropy_save_num} - 1 ))
-for file_num in `jot $esn_m1 $esn_m1 1`; do
- if [ -e ${entropy_dir}/saved-entropy.${file_num} ]; then
- if [ -f ${entropy_dir}/saved-entropy.${file_num} ]; then
- new_file=saved-entropy.$(( $file_num + 1 ))
- if [ -e ${entropy_dir}/${new_file} ]; then
- unlink ${entropy_dir}/${new_file}
- fi
- mv ${entropy_dir}/saved-entropy.${file_num} \
- ${entropy_dir}/${new_file}
- else
- logger -is -t $0 \
-${entropy_dir}/saved-entropy.${file_num} is not a regular file, and therefore
\
-it will not be rotated. Entropy file harvesting is aborted.
- exit 1
- fi
+n=$(( ${entropy_save_num} - 1 ))
+while [ ${n} -ge 1 ]; do
+ if [ -f saved-entropy.${n} ]; then
+ mv saved-entropy.${n} saved-entropy.$(( ${n} + 1 ))
+ elif [ -e saved-entropy.${n} -o -L saved-entropy.${n} ]; then
+ logger -is -t $0 \
+ ${entropy_dir}/saved-entropy.${n} is not a regular file, and so \
+ it will not be rotated. Entropy file rotation is aborted.
+ exit 1
fi
+ n=$(( ${n} - 1 ))
done
-dd if=/dev/random of=${entropy_dir}/saved-entropy.1 \
-bs=$entropy_save_sz count=1 2 /dev/null
+dd if=/dev/random of=saved-entropy.1 bs=${entropy_save_sz} count=1 2/dev/null
exit 0
-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241205 - stable/9/libexec/save-entropy
Author: dougb
Date: Thu Oct 4 22:23:40 2012
New Revision: 241205
URL: http://svn.freebsd.org/changeset/base/241205
Log:
MFC r240090:
Improve file rotation
Modified:
stable/9/libexec/save-entropy/save-entropy.sh
Directory Properties:
stable/9/libexec/save-entropy/ (props changed)
Modified: stable/9/libexec/save-entropy/save-entropy.sh
==
--- stable/9/libexec/save-entropy/save-entropy.sh Thu Oct 4 22:16:58
2012(r241204)
+++ stable/9/libexec/save-entropy/save-entropy.sh Thu Oct 4 22:23:40
2012(r241205)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2001-2006 Douglas Barton, do...@freebsd.org
+# Copyright (c) 2001-2006,2012 Douglas Barton, do...@freebsd.org
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
# This script is called by cron to store bits of randomness which are
# then used to seed /dev/random on boot.
-# Originally developed by Doug Barton, do...@freebsd.org
+# Originally developed by Doug Barton, do...@freebsd.org
PATH=/bin:/usr/bin
@@ -55,38 +55,36 @@ entropy_save_sz=${entropy_save_sz:-2048}
entropy_save_num=${entropy_save_num:-8}
if [ ! -d ${entropy_dir} ]; then
- umask 077
- mkdir ${entropy_dir} || {
- logger -is -t $0 The entropy directory ${entropy_dir} does not \
-exist, and cannot be created. Therefore no entropy can be saved. ;
- exit 1;}
- /usr/sbin/chown operator:operator ${entropy_dir}
- chmod 0700 ${entropy_dir}
+ install -d -o operator -g operator -m 0700 ${entropy_dir} || {
+ logger -is -t $0 The entropy directory ${entropy_dir} does \
+ not exist, and cannot be created. Therefore no entropy can \
+ be saved.; exit 1; }
fi
+cd ${entropy_dir} || {
+ logger -is -t $0 Cannot cd to the entropy directory:
${entropy_dir}. \
+ Entropy file rotation is aborted.; exit 1; }
+
+for f in saved-entropy.*; do
+ case ${f} in saved-entropy.\*) continue ;; esac # No files match
+ [ ${f#saved-entropy\.} -ge ${entropy_save_num} ] unlink ${f}
+done
+
umask 377
-esn_m1=$(( ${entropy_save_num} - 1 ))
-for file_num in `jot $esn_m1 $esn_m1 1`; do
- if [ -e ${entropy_dir}/saved-entropy.${file_num} ]; then
- if [ -f ${entropy_dir}/saved-entropy.${file_num} ]; then
- new_file=saved-entropy.$(( $file_num + 1 ))
- if [ -e ${entropy_dir}/${new_file} ]; then
- unlink ${entropy_dir}/${new_file}
- fi
- mv ${entropy_dir}/saved-entropy.${file_num} \
- ${entropy_dir}/${new_file}
- else
- logger -is -t $0 \
-${entropy_dir}/saved-entropy.${file_num} is not a regular file, and therefore
\
-it will not be rotated. Entropy file harvesting is aborted.
- exit 1
- fi
+n=$(( ${entropy_save_num} - 1 ))
+while [ ${n} -ge 1 ]; do
+ if [ -f saved-entropy.${n} ]; then
+ mv saved-entropy.${n} saved-entropy.$(( ${n} + 1 ))
+ elif [ -e saved-entropy.${n} -o -L saved-entropy.${n} ]; then
+ logger -is -t $0 \
+ ${entropy_dir}/saved-entropy.${n} is not a regular file, and so \
+ it will not be rotated. Entropy file rotation is aborted.
+ exit 1
fi
+ n=$(( ${n} - 1 ))
done
-dd if=/dev/random of=${entropy_dir}/saved-entropy.1 \
-bs=$entropy_save_sz count=1 2 /dev/null
+dd if=/dev/random of=saved-entropy.1 bs=${entropy_save_sz} count=1 2/dev/null
exit 0
-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241208 - in stable/9/etc: . rc.d
Author: dougb
Date: Thu Oct 4 22:31:56 2012
New Revision: 241208
URL: http://svn.freebsd.org/changeset/base/241208
Log:
MFC r229822:
There is no longer a need to abstract ${rcvar_manpage} as we are not
attempting to maintain compatibility with NetBSD for some years now.
Modified:
stable/9/etc/rc.d/hostname
stable/9/etc/rc.subr
Directory Properties:
stable/9/etc/ (props changed)
Modified: stable/9/etc/rc.d/hostname
==
--- stable/9/etc/rc.d/hostname Thu Oct 4 22:24:14 2012(r241207)
+++ stable/9/etc/rc.d/hostname Thu Oct 4 22:31:56 2012(r241208)
@@ -65,7 +65,7 @@ hostname_start()
# Null hostname is probably OK if DHCP is in use.
#
if [ -z `list_net_interfaces dhcp` ]; then
- warn \$hostname is not set -- see ${rcvar_manpage}.
+ warn \$hostname is not set -- see rc.conf(5).
fi
return
fi
Modified: stable/9/etc/rc.subr
==
--- stable/9/etc/rc.subrThu Oct 4 22:24:14 2012(r241207)
+++ stable/9/etc/rc.subrThu Oct 4 22:31:56 2012(r241208)
@@ -32,7 +32,6 @@
# functions used by various rc scripts
#
-: ${rcvar_manpage:='rc.conf(5)'}
: ${RC_PID:=$$}; export RC_PID
#
@@ -159,7 +158,7 @@ checkyesno()
return 1
;;
*)
- warn \$${1} is not set properly - see ${rcvar_manpage}.
+ warn \$${1} is not set properly - see rc.conf(5).
return 1
;;
esac
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241209 - in stable/8/etc: . rc.d
Author: dougb
Date: Thu Oct 4 22:32:12 2012
New Revision: 241209
URL: http://svn.freebsd.org/changeset/base/241209
Log:
MFC r229822:
There is no longer a need to abstract ${rcvar_manpage} as we are not
attempting to maintain compatibility with NetBSD for some years now.
Modified:
stable/8/etc/rc.d/hostname
stable/8/etc/rc.subr
Directory Properties:
stable/8/etc/ (props changed)
Modified: stable/8/etc/rc.d/hostname
==
--- stable/8/etc/rc.d/hostname Thu Oct 4 22:31:56 2012(r241208)
+++ stable/8/etc/rc.d/hostname Thu Oct 4 22:32:12 2012(r241209)
@@ -65,7 +65,7 @@ hostname_start()
# Null hostname is probably OK if DHCP is in use.
#
if [ -z `list_net_interfaces dhcp` ]; then
- warn \$hostname is not set -- see ${rcvar_manpage}.
+ warn \$hostname is not set -- see rc.conf(5).
fi
return
fi
Modified: stable/8/etc/rc.subr
==
--- stable/8/etc/rc.subrThu Oct 4 22:31:56 2012(r241208)
+++ stable/8/etc/rc.subrThu Oct 4 22:32:12 2012(r241209)
@@ -32,7 +32,6 @@
# functions used by various rc scripts
#
-: ${rcvar_manpage:='rc.conf(5)'}
: ${RC_PID:=$$}; export RC_PID
#
@@ -159,7 +158,7 @@ checkyesno()
return 1
;;
*)
- warn \$${1} is not set properly - see ${rcvar_manpage}.
+ warn \$${1} is not set properly - see rc.conf(5).
return 1
;;
esac
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241210 - in stable/7/etc: . rc.d
Author: dougb
Date: Thu Oct 4 22:32:27 2012
New Revision: 241210
URL: http://svn.freebsd.org/changeset/base/241210
Log:
MFC r229822:
There is no longer a need to abstract ${rcvar_manpage} as we are not
attempting to maintain compatibility with NetBSD for some years now.
Modified:
stable/7/etc/rc.d/hostname
stable/7/etc/rc.subr
Directory Properties:
stable/7/etc/ (props changed)
Modified: stable/7/etc/rc.d/hostname
==
--- stable/7/etc/rc.d/hostname Thu Oct 4 22:32:12 2012(r241209)
+++ stable/7/etc/rc.d/hostname Thu Oct 4 22:32:27 2012(r241210)
@@ -65,7 +65,7 @@ hostname_start()
# Null hostname is probably OK if DHCP is in use.
#
if [ -z `list_net_interfaces dhcp` ]; then
- warn \$hostname is not set -- see ${rcvar_manpage}.
+ warn \$hostname is not set -- see rc.conf(5).
fi
return
fi
Modified: stable/7/etc/rc.subr
==
--- stable/7/etc/rc.subrThu Oct 4 22:32:12 2012(r241209)
+++ stable/7/etc/rc.subrThu Oct 4 22:32:27 2012(r241210)
@@ -39,7 +39,6 @@
# functions used by various rc scripts
#
-: ${rcvar_manpage:='rc.conf(5)'}
: ${RC_PID:=$$}; export RC_PID
#
@@ -143,7 +142,7 @@ checkyesno()
return 1
;;
*)
- warn \$${1} is not set properly - see ${rcvar_manpage}.
+ warn \$${1} is not set properly - see rc.conf(5).
return 1
;;
esac
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241218 - head/usr.sbin/mergemaster
Author: dougb
Date: Fri Oct 5 05:01:42 2012
New Revision: 241218
URL: http://svn.freebsd.org/changeset/base/241218
Log:
Remove references to CVS so that people will stop bringing it up
For -p:
The localtime update should have been excluded in the first place
The make.conf comparison has been OBE for some time now, and there
is no src.conf equivalent to share/examples/make.conf, so remove
the whole thing.
Update copyright
Modified:
head/usr.sbin/mergemaster/mergemaster.sh
Modified: head/usr.sbin/mergemaster/mergemaster.sh
==
--- head/usr.sbin/mergemaster/mergemaster.shFri Oct 5 04:35:20 2012
(r241217)
+++ head/usr.sbin/mergemaster/mergemaster.shFri Oct 5 05:01:42 2012
(r241218)
@@ -5,8 +5,8 @@
# Compare files created by /usr/src/etc/Makefile (or the directory
# the user specifies) with the currently installed copies.
-# Copyright 1998-2011 Douglas Barton
-# do...@freebsd.org
+# Copyright (c) 1998-2012 Douglas Barton, All rights reserved
+# Please see detailed copyright below
# $FreeBSD$
@@ -532,9 +532,9 @@ if [ -t 0 ]; then
esac
fi
-# Define what CVS $Id tag to look for to aid portability.
+# Define what $Id tag to look for to aid portability.
#
-CVS_ID_TAG=FreeBSD
+ID_TAG=FreeBSD
delete_temproot () {
rm -rf ${TEMPROOT} 2/dev/null
@@ -1095,17 +1095,17 @@ for COMPFILE in `find . -type f | sort`;
case ${STRICT} in
'' | [Nn][Oo])
-# Compare CVS $Id's first so if the file hasn't been modified
+# Compare $Id's first so if the file hasn't been modified
# local changes will be ignored.
# If the files have the same $Id, delete the one in temproot so the
# user will have less to wade through if files are left to merge by hand.
#
-CVSID1=`grep [$]${CVS_ID_TAG}: ${DESTDIR}${COMPFILE#.} 2/dev/null`
-CVSID2=`grep [$]${CVS_ID_TAG}: ${COMPFILE} 2/dev/null` || CVSID2=none
+ID1=`grep [$]${ID_TAG}: ${DESTDIR}${COMPFILE#.} 2/dev/null`
+ID2=`grep [$]${ID_TAG}: ${COMPFILE} 2/dev/null` || ID2=none
-case ${CVSID2} in
-${CVSID1})
- echo *** Temp ${COMPFILE} and installed have the same CVS Id, deleting
+case ${ID2} in
+${ID1})
+ echo *** Temp ${COMPFILE} and installed have the same Id, deleting
rm ${COMPFILE}
;;
esac
@@ -1334,7 +1334,7 @@ case ${NEED_PWD_MKDB} in
;;
esac
-if [ -e ${DESTDIR}/etc/localtime ]; then # Ignore if TZ == UTC
+if [ -e ${DESTDIR}/etc/localtime -a -z ${PRE_WORLD} ]; then#
Ignore if TZ == UTC
echo ''
[ -n ${DESTDIR} ] tzs_args=-C ${DESTDIR}
if [ -f ${DESTDIR}/var/db/zoneinfo ]; then
@@ -1380,29 +1380,35 @@ case ${COMP_CONFS} in
;;
esac
-case ${PRE_WORLD} in
-'') ;;
-*)
- MAKE_CONF=${SOURCEDIR}/share/examples/etc/make.conf
-
- (echo ''
- echo '*** Comparing make variables'
- echo ''
- echo *** From ${DESTDIR}/etc/make.conf
- echo *** From ${MAKE_CONF}
-
- for MAKE_VAR in `grep -i ^[a-z] ${DESTDIR}/etc/make.conf | cut -d '=' -f 1`;
do
-echo ''
-grep -w ^${MAKE_VAR} ${DESTDIR}/etc/make.conf
-grep -w ^#${MAKE_VAR} ${MAKE_CONF} ||
- echo ' * No example variable with this name'
- done) | ${PAGER}
- ;;
-esac
-
if [ -n ${PRESERVE_FILES} ]; then
find -d $PRESERVE_FILES_DIR -type d -empty -delete 2/dev/null
rmdir $PRESERVE_FILES_DIR 2/dev/null
fi
exit 0
+
+#~~~
+
+# Copyright (c) 1998-2012 Douglas Barton
+# 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 THE 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 THE 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.
___
svn-src-all@freebsd.org mailing list
Re: svn commit: r241149 - in head/usr.sbin: . bsdconfig/share sysrc
Was this discussed on freebsd-rc@ at some point, and I just missed it? ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r240843 - head/usr.sbin/bsdconfig/timezone/share
On 09/22/2012 15:16, Devin Teske wrote: - if : 2 /dev/null $_PATH_DB; then + if true 2 /dev/null $_PATH_DB; then cat -EOF $_PATH_DB $zoneinfo EOF Is there a reason you're not using mktemp here? -- I am only one, but I am one. I cannot do everything, but I can do something. And I will not let what I cannot do interfere with what I can do. -- Edward Everett Hale, (1822 - 1909) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r240726 - in vendor/bind9/dist: . lib/dns lib/dns/include/dns
Author: dougb
Date: Thu Sep 20 03:38:28 2012
New Revision: 240726
URL: http://svn.freebsd.org/changeset/base/240726
Log:
Vendor import of BIND 9.8.3-P3
Modified:
vendor/bind9/dist/CHANGES
vendor/bind9/dist/lib/dns/include/dns/rdata.h
vendor/bind9/dist/lib/dns/master.c
vendor/bind9/dist/lib/dns/rdata.c
vendor/bind9/dist/lib/dns/rdataslab.c
vendor/bind9/dist/version
Modified: vendor/bind9/dist/CHANGES
==
--- vendor/bind9/dist/CHANGES Thu Sep 20 03:29:43 2012(r240725)
+++ vendor/bind9/dist/CHANGES Thu Sep 20 03:38:28 2012(r240726)
@@ -1,3 +1,8 @@
+ --- 9.8.3-P3 released ---
+
+3364. [security] Named could die on specially crafted record.
+ [RT #30416]
+
--- 9.8.3-P2 released ---
3346. [security] Bad-cache data could be used before it was
Modified: vendor/bind9/dist/lib/dns/include/dns/rdata.h
==
--- vendor/bind9/dist/lib/dns/include/dns/rdata.h Thu Sep 20 03:29:43
2012(r240725)
+++ vendor/bind9/dist/lib/dns/include/dns/rdata.h Thu Sep 20 03:38:28
2012(r240726)
@@ -147,6 +147,17 @@ struct dns_rdata {
(((rdata)-flags ~(DNS_RDATA_UPDATE|DNS_RDATA_OFFLINE)) == 0)
/*
+ * The maximum length of a RDATA that can be sent on the wire.
+ * Max packet size (65535) less header (12), less name (1), type (2),
+ * class (2), ttl(4), length (2).
+ *
+ * None of the defined types that support name compression can exceed
+ * this and all new types are to be sent uncompressed.
+ */
+
+#define DNS_RDATA_MAXLENGTH65512U
+
+/*
* Flags affecting rdata formatting style. Flags 0x
* are used by masterfile-level formatting and defined elsewhere.
* See additional comments at dns_rdata_tofmttext().
Modified: vendor/bind9/dist/lib/dns/master.c
==
--- vendor/bind9/dist/lib/dns/master.c Thu Sep 20 03:29:43 2012
(r240725)
+++ vendor/bind9/dist/lib/dns/master.c Thu Sep 20 03:38:28 2012
(r240726)
@@ -75,7 +75,7 @@
/*%
* max message size - header - root - type - class - ttl - rdlen
*/
-#define MINTSIZ (65535 - 12 - 1 - 2 - 2 - 4 - 2)
+#define MINTSIZ DNS_RDATA_MAXLENGTH
/*%
* Size for tokens in the presentation format,
* The largest tokens are the base64 blocks in KEY and CERT records,
Modified: vendor/bind9/dist/lib/dns/rdata.c
==
--- vendor/bind9/dist/lib/dns/rdata.c Thu Sep 20 03:29:43 2012
(r240725)
+++ vendor/bind9/dist/lib/dns/rdata.c Thu Sep 20 03:38:28 2012
(r240726)
@@ -429,6 +429,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
isc_buffer_t st;
isc_boolean_t use_default = ISC_FALSE;
isc_uint32_t activelength;
+ size_t length;
REQUIRE(dctx != NULL);
if (rdata != NULL) {
@@ -459,6 +460,14 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
}
/*
+* Reject any rdata that expands out to more than DNS_RDATA_MAXLENGTH
+* as we cannot transmit it.
+*/
+ length = isc_buffer_usedlength(target) - isc_buffer_usedlength(st);
+ if (result == ISC_R_SUCCESS length DNS_RDATA_MAXLENGTH)
+ result = DNS_R_FORMERR;
+
+ /*
* We should have consumed all of our buffer.
*/
if (result == ISC_R_SUCCESS !buffer_empty(source))
@@ -466,8 +475,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
if (rdata != NULL result == ISC_R_SUCCESS) {
region.base = isc_buffer_used(st);
- region.length = isc_buffer_usedlength(target) -
- isc_buffer_usedlength(st);
+ region.length = length;
dns_rdata_fromregion(rdata, rdclass, type, region);
}
@@ -602,6 +610,7 @@ dns_rdata_fromtext(dns_rdata_t *rdata, d
unsigned long line;
void (*callback)(dns_rdatacallbacks_t *, const char *, ...);
isc_result_t tresult;
+ size_t length;
REQUIRE(origin == NULL || dns_name_isabsolute(origin) == ISC_TRUE);
if (rdata != NULL) {
@@ -673,10 +682,13 @@ dns_rdata_fromtext(dns_rdata_t *rdata, d
}
} while (1);
+ length = isc_buffer_usedlength(target) - isc_buffer_usedlength(st);
+ if (result == ISC_R_SUCCESS length DNS_RDATA_MAXLENGTH)
+ result = ISC_R_NOSPACE;
+
if (rdata != NULL result == ISC_R_SUCCESS) {
region.base = isc_buffer_used(st);
- region.length = isc_buffer_usedlength(target) -
- isc_buffer_usedlength(st);
+ region.length = length;
dns_rdata_fromregion(rdata, rdclass, type, region);
}
if (result != ISC_R_SUCCESS) {
@@ -804,6 +816,7 @@
svn commit: r240727 - vendor/bind9/9.8.3-P3
Author: dougb Date: Thu Sep 20 03:42:14 2012 New Revision: 240727 URL: http://svn.freebsd.org/changeset/base/240727 Log: Tag the 9.8.3-P3 release Added: vendor/bind9/9.8.3-P3/ - copied from r240726, vendor/bind9/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r240729 - in head/contrib/bind9: . lib/dns lib/dns/include/dns
Author: dougb
Date: Thu Sep 20 04:12:09 2012
New Revision: 240729
URL: http://svn.freebsd.org/changeset/base/240729
Log:
Upgrade to 9.8.3-P3:
Prevents a crash when queried for a record whose RDATA exceeds
65535 bytes.
Prevents a crash when validating caused by using Bad cache data
before it has been initialized.
ISC_QUEUE handling for recursive clients was updated to address
a race condition that could cause a memory leak. This rarely
occurred with UDP clients, but could be a significant problem
for a server handling a steady rate of TCP queries.
A condition has been corrected where improper handling of
zero-length RDATA could cause undesirable behavior, including
termination of the named process.
For more information: https://kb.isc.org/article/AA-00788
Modified:
head/contrib/bind9/CHANGES
head/contrib/bind9/lib/dns/include/dns/rdata.h
head/contrib/bind9/lib/dns/master.c
head/contrib/bind9/lib/dns/rdata.c
head/contrib/bind9/lib/dns/rdataslab.c
head/contrib/bind9/version
Directory Properties:
head/contrib/bind9/ (props changed)
Modified: head/contrib/bind9/CHANGES
==
--- head/contrib/bind9/CHANGES Thu Sep 20 03:48:36 2012(r240728)
+++ head/contrib/bind9/CHANGES Thu Sep 20 04:12:09 2012(r240729)
@@ -1,3 +1,8 @@
+ --- 9.8.3-P3 released ---
+
+3364. [security] Named could die on specially crafted record.
+ [RT #30416]
+
--- 9.8.3-P2 released ---
3346. [security] Bad-cache data could be used before it was
Modified: head/contrib/bind9/lib/dns/include/dns/rdata.h
==
--- head/contrib/bind9/lib/dns/include/dns/rdata.h Thu Sep 20 03:48:36
2012(r240728)
+++ head/contrib/bind9/lib/dns/include/dns/rdata.h Thu Sep 20 04:12:09
2012(r240729)
@@ -147,6 +147,17 @@ struct dns_rdata {
(((rdata)-flags ~(DNS_RDATA_UPDATE|DNS_RDATA_OFFLINE)) == 0)
/*
+ * The maximum length of a RDATA that can be sent on the wire.
+ * Max packet size (65535) less header (12), less name (1), type (2),
+ * class (2), ttl(4), length (2).
+ *
+ * None of the defined types that support name compression can exceed
+ * this and all new types are to be sent uncompressed.
+ */
+
+#define DNS_RDATA_MAXLENGTH65512U
+
+/*
* Flags affecting rdata formatting style. Flags 0x
* are used by masterfile-level formatting and defined elsewhere.
* See additional comments at dns_rdata_tofmttext().
Modified: head/contrib/bind9/lib/dns/master.c
==
--- head/contrib/bind9/lib/dns/master.c Thu Sep 20 03:48:36 2012
(r240728)
+++ head/contrib/bind9/lib/dns/master.c Thu Sep 20 04:12:09 2012
(r240729)
@@ -75,7 +75,7 @@
/*%
* max message size - header - root - type - class - ttl - rdlen
*/
-#define MINTSIZ (65535 - 12 - 1 - 2 - 2 - 4 - 2)
+#define MINTSIZ DNS_RDATA_MAXLENGTH
/*%
* Size for tokens in the presentation format,
* The largest tokens are the base64 blocks in KEY and CERT records,
Modified: head/contrib/bind9/lib/dns/rdata.c
==
--- head/contrib/bind9/lib/dns/rdata.c Thu Sep 20 03:48:36 2012
(r240728)
+++ head/contrib/bind9/lib/dns/rdata.c Thu Sep 20 04:12:09 2012
(r240729)
@@ -429,6 +429,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
isc_buffer_t st;
isc_boolean_t use_default = ISC_FALSE;
isc_uint32_t activelength;
+ size_t length;
REQUIRE(dctx != NULL);
if (rdata != NULL) {
@@ -459,6 +460,14 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
}
/*
+* Reject any rdata that expands out to more than DNS_RDATA_MAXLENGTH
+* as we cannot transmit it.
+*/
+ length = isc_buffer_usedlength(target) - isc_buffer_usedlength(st);
+ if (result == ISC_R_SUCCESS length DNS_RDATA_MAXLENGTH)
+ result = DNS_R_FORMERR;
+
+ /*
* We should have consumed all of our buffer.
*/
if (result == ISC_R_SUCCESS !buffer_empty(source))
@@ -466,8 +475,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
if (rdata != NULL result == ISC_R_SUCCESS) {
region.base = isc_buffer_used(st);
- region.length = isc_buffer_usedlength(target) -
- isc_buffer_usedlength(st);
+ region.length = length;
dns_rdata_fromregion(rdata, rdclass, type, region);
}
@@ -602,6 +610,7 @@ dns_rdata_fromtext(dns_rdata_t *rdata, d
unsigned long line;
void (*callback)(dns_rdatacallbacks_t *, const char *, ...);
isc_result_t tresult;
+ size_t length;
REQUIRE(origin == NULL || dns_name_isabsolute(origin) == ISC_TRUE);
svn commit: r240730 - in vendor/bind9/dist-9.6: . bin/named bin/nsupdate lib/dns lib/dns/include/dns
Author: dougb
Date: Thu Sep 20 04:21:05 2012
New Revision: 240730
URL: http://svn.freebsd.org/changeset/base/240730
Log:
Vendor import of BIND 9.6-ESV-R7-P3
Modified:
vendor/bind9/dist-9.6/CHANGES
vendor/bind9/dist-9.6/bin/named/server.c
vendor/bind9/dist-9.6/bin/nsupdate/nsupdate.c
vendor/bind9/dist-9.6/lib/dns/include/dns/rdata.h
vendor/bind9/dist-9.6/lib/dns/master.c
vendor/bind9/dist-9.6/lib/dns/rdata.c
vendor/bind9/dist-9.6/lib/dns/rdataslab.c
vendor/bind9/dist-9.6/version
Modified: vendor/bind9/dist-9.6/CHANGES
==
--- vendor/bind9/dist-9.6/CHANGES Thu Sep 20 04:12:09 2012
(r240729)
+++ vendor/bind9/dist-9.6/CHANGES Thu Sep 20 04:21:05 2012
(r240730)
@@ -1,3 +1,11 @@
+ --- 9.6-ESV-R7-P3 released ---
+
+3364. [security] Named could die on specially crafted record.
+ [RT #30416]
+
+3358 [bug] Fix declaration of fatal in bin/named/server.c
+ and bin/nsupdate/main.c. [RT #30522]
+
--- 9.6-ESV-R7-P2 released ---
3346. [security] Bad-cache data could be used before it was
Modified: vendor/bind9/dist-9.6/bin/named/server.c
==
--- vendor/bind9/dist-9.6/bin/named/server.cThu Sep 20 04:12:09 2012
(r240729)
+++ vendor/bind9/dist-9.6/bin/named/server.cThu Sep 20 04:21:05 2012
(r240730)
@@ -228,7 +228,7 @@ static const struct {
{ NULL, ISC_FALSE }
};
-ISC_PLATFORM_NORETURN_POST static void
+ISC_PLATFORM_NORETURN_PRE static void
fatal(const char *msg, isc_result_t result) ISC_PLATFORM_NORETURN_POST;
static void
Modified: vendor/bind9/dist-9.6/bin/nsupdate/nsupdate.c
==
--- vendor/bind9/dist-9.6/bin/nsupdate/nsupdate.c Thu Sep 20 04:12:09
2012(r240729)
+++ vendor/bind9/dist-9.6/bin/nsupdate/nsupdate.c Thu Sep 20 04:21:05
2012(r240730)
@@ -174,7 +174,7 @@ typedef struct nsu_requestinfo {
static void
sendrequest(isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr,
dns_message_t *msg, dns_request_t **request);
-ISC_PLATFORM_NORETURN_POST static void
+ISC_PLATFORM_NORETURN_PRE static void
fatal(const char *format, ...)
ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST;
Modified: vendor/bind9/dist-9.6/lib/dns/include/dns/rdata.h
==
--- vendor/bind9/dist-9.6/lib/dns/include/dns/rdata.h Thu Sep 20 04:12:09
2012(r240729)
+++ vendor/bind9/dist-9.6/lib/dns/include/dns/rdata.h Thu Sep 20 04:21:05
2012(r240730)
@@ -128,6 +128,17 @@ struct dns_rdata {
#define DNS_RDATA_OFFLINE 0x0002 /*% RRSIG has a offline key. */
/*
+ * The maximum length of a RDATA that can be sent on the wire.
+ * Max packet size (65535) less header (12), less name (1), type (2),
+ * class (2), ttl(4), length (2).
+ *
+ * None of the defined types that support name compression can exceed
+ * this and all new types are to be sent uncompressed.
+ */
+
+#define DNS_RDATA_MAXLENGTH65512U
+
+/*
* Flags affecting rdata formatting style. Flags 0x
* are used by masterfile-level formatting and defined elsewhere.
* See additional comments at dns_rdata_tofmttext().
Modified: vendor/bind9/dist-9.6/lib/dns/master.c
==
--- vendor/bind9/dist-9.6/lib/dns/master.c Thu Sep 20 04:12:09 2012
(r240729)
+++ vendor/bind9/dist-9.6/lib/dns/master.c Thu Sep 20 04:21:05 2012
(r240730)
@@ -75,7 +75,7 @@
/*%
* max message size - header - root - type - class - ttl - rdlen
*/
-#define MINTSIZ (65535 - 12 - 1 - 2 - 2 - 4 - 2)
+#define MINTSIZ DNS_RDATA_MAXLENGTH
/*%
* Size for tokens in the presentation format,
* The largest tokens are the base64 blocks in KEY and CERT records,
Modified: vendor/bind9/dist-9.6/lib/dns/rdata.c
==
--- vendor/bind9/dist-9.6/lib/dns/rdata.c Thu Sep 20 04:12:09 2012
(r240729)
+++ vendor/bind9/dist-9.6/lib/dns/rdata.c Thu Sep 20 04:21:05 2012
(r240730)
@@ -414,6 +414,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
isc_buffer_t st;
isc_boolean_t use_default = ISC_FALSE;
isc_uint32_t activelength;
+ size_t length;
REQUIRE(dctx != NULL);
if (rdata != NULL) {
@@ -444,6 +445,14 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
}
/*
+* Reject any rdata that expands out to more than DNS_RDATA_MAXLENGTH
+* as we cannot transmit it.
+*/
+ length = isc_buffer_usedlength(target) - isc_buffer_usedlength(st);
+ if (result == ISC_R_SUCCESS length DNS_RDATA_MAXLENGTH)
+ result =
svn commit: r240731 - vendor/bind9/9.6-ESV-R7-P3
Author: dougb Date: Thu Sep 20 04:21:29 2012 New Revision: 240731 URL: http://svn.freebsd.org/changeset/base/240731 Log: Tag the 9.6-ESV-R7-P3 release Added: vendor/bind9/9.6-ESV-R7-P3/ - copied from r240730, vendor/bind9/dist-9.6/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r240732 - in stable/8/contrib/bind9: . bin/named bin/nsupdate lib/dns lib/dns/include/dns
Author: dougb
Date: Thu Sep 20 04:35:20 2012
New Revision: 240732
URL: http://svn.freebsd.org/changeset/base/240732
Log:
Upgrade to 9.6-ESV-R7-P3:
Prevents a crash when queried for a record whose RDATA exceeds
65535 bytes.
Prevents a crash when validating caused by using Bad cache data
before it has been initialized.
ISC_QUEUE handling for recursive clients was updated to address
a race condition that could cause a memory leak. This rarely
occurred with UDP clients, but could be a significant problem
for a server handling a steady rate of TCP queries.
A condition has been corrected where improper handling of
zero-length RDATA could cause undesirable behavior, including
termination of the named process.
For more information: https://kb.isc.org/article/AA-00788
Modified:
stable/8/contrib/bind9/CHANGES
stable/8/contrib/bind9/bin/named/server.c
stable/8/contrib/bind9/bin/nsupdate/nsupdate.c
stable/8/contrib/bind9/lib/dns/include/dns/rdata.h
stable/8/contrib/bind9/lib/dns/master.c
stable/8/contrib/bind9/lib/dns/rdata.c
stable/8/contrib/bind9/lib/dns/rdataslab.c
stable/8/contrib/bind9/version
Directory Properties:
stable/8/contrib/bind9/ (props changed)
Modified: stable/8/contrib/bind9/CHANGES
==
--- stable/8/contrib/bind9/CHANGES Thu Sep 20 04:21:29 2012
(r240731)
+++ stable/8/contrib/bind9/CHANGES Thu Sep 20 04:35:20 2012
(r240732)
@@ -1,3 +1,11 @@
+ --- 9.6-ESV-R7-P3 released ---
+
+3364. [security] Named could die on specially crafted record.
+ [RT #30416]
+
+3358 [bug] Fix declaration of fatal in bin/named/server.c
+ and bin/nsupdate/main.c. [RT #30522]
+
--- 9.6-ESV-R7-P2 released ---
3346. [security] Bad-cache data could be used before it was
Modified: stable/8/contrib/bind9/bin/named/server.c
==
--- stable/8/contrib/bind9/bin/named/server.c Thu Sep 20 04:21:29 2012
(r240731)
+++ stable/8/contrib/bind9/bin/named/server.c Thu Sep 20 04:35:20 2012
(r240732)
@@ -228,7 +228,7 @@ static const struct {
{ NULL, ISC_FALSE }
};
-ISC_PLATFORM_NORETURN_POST static void
+ISC_PLATFORM_NORETURN_PRE static void
fatal(const char *msg, isc_result_t result) ISC_PLATFORM_NORETURN_POST;
static void
Modified: stable/8/contrib/bind9/bin/nsupdate/nsupdate.c
==
--- stable/8/contrib/bind9/bin/nsupdate/nsupdate.c Thu Sep 20 04:21:29
2012(r240731)
+++ stable/8/contrib/bind9/bin/nsupdate/nsupdate.c Thu Sep 20 04:35:20
2012(r240732)
@@ -174,7 +174,7 @@ typedef struct nsu_requestinfo {
static void
sendrequest(isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr,
dns_message_t *msg, dns_request_t **request);
-ISC_PLATFORM_NORETURN_POST static void
+ISC_PLATFORM_NORETURN_PRE static void
fatal(const char *format, ...)
ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST;
Modified: stable/8/contrib/bind9/lib/dns/include/dns/rdata.h
==
--- stable/8/contrib/bind9/lib/dns/include/dns/rdata.h Thu Sep 20 04:21:29
2012(r240731)
+++ stable/8/contrib/bind9/lib/dns/include/dns/rdata.h Thu Sep 20 04:35:20
2012(r240732)
@@ -128,6 +128,17 @@ struct dns_rdata {
#define DNS_RDATA_OFFLINE 0x0002 /*% RRSIG has a offline key. */
/*
+ * The maximum length of a RDATA that can be sent on the wire.
+ * Max packet size (65535) less header (12), less name (1), type (2),
+ * class (2), ttl(4), length (2).
+ *
+ * None of the defined types that support name compression can exceed
+ * this and all new types are to be sent uncompressed.
+ */
+
+#define DNS_RDATA_MAXLENGTH65512U
+
+/*
* Flags affecting rdata formatting style. Flags 0x
* are used by masterfile-level formatting and defined elsewhere.
* See additional comments at dns_rdata_tofmttext().
Modified: stable/8/contrib/bind9/lib/dns/master.c
==
--- stable/8/contrib/bind9/lib/dns/master.c Thu Sep 20 04:21:29 2012
(r240731)
+++ stable/8/contrib/bind9/lib/dns/master.c Thu Sep 20 04:35:20 2012
(r240732)
@@ -75,7 +75,7 @@
/*%
* max message size - header - root - type - class - ttl - rdlen
*/
-#define MINTSIZ (65535 - 12 - 1 - 2 - 2 - 4 - 2)
+#define MINTSIZ DNS_RDATA_MAXLENGTH
/*%
* Size for tokens in the presentation format,
* The largest tokens are the base64 blocks in KEY and CERT records,
Modified: stable/8/contrib/bind9/lib/dns/rdata.c
==
--- stable/8/contrib/bind9/lib/dns/rdata.c Thu Sep 20 04:21:29 2012
Re: svn commit: r240628 - head/sbin/ipfw
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 09/18/2012 03:36, Hiroki Sato wrote: Doug Barton do...@freebsd.org wrote in 5058036f.1010...@freebsd.org: do On 09/17/2012 19:33, Benjamin Kaduk wrote: doWhitespace cleanup for ipfw.8 -- start each sentence on a new line, do do We generally don't do this at all absent other changes. do do We definitely don't make whitespace-only changes mixed in with other do changes, as it makes the diff too hard to read. Please read docs/157452 before blaming the commit. The committer is responsible for what they finally commit. The mentor is responsible for review to make sure that final commit meets project guidelines. That said, Ben properly split his changes into 2 patches for the PR, so you should have been sure to tell him to commit it that way, and more importantly, WHY to commit it that way. And I do not think adding commas is not making the diff hard to read. That wasn't my point. Mixing ws changes with content changes makes it hard to pick out the content changes (as you well know). Doug - -- I am only one, but I am one. I cannot do everything, but I can do something. And I will not let what I cannot do interfere with what I can do. -- Edward Everett Hale, (1822 - 1909) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBCAAGBQJQWRqjAAoJEFzGhvEaGryEt+cIAKQ0eCL/aftTelXyl6pbZT4X UlMECcMqpdQdEtbT91qz+6Pvl3HBO1OcrkywVX3kVt7WNsIKRcBoN/Ns+6Vnvagm G5wMY2MBoJO/v56S7JPC9E6O5YbYM03Fek6ZPNbGO9aIWAzjVhoW7ceN5J4cVErJ Xhtasz86HGXQVpbjmbhGT17iMvXRKHS3Nj+6C48rKr9DmNyqC2snXoY7HsLCmA/z x9GEtkbVOS+fR2REWP/6rseHCqn+MiqMtM5nMwyfHREp1noDNi2oqOtf/oDXDqAK TAWP/nv+m81gK0VFmnpHS6Z/YhhtGUyoNzryZmfpArXtML3+GzbId1R0Y+l6rmY= =O2Vn -END PGP SIGNATURE- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r240628 - head/sbin/ipfw
On 09/17/2012 19:33, Benjamin Kaduk wrote: Whitespace cleanup for ipfw.8 -- start each sentence on a new line, We generally don't do this at all absent other changes. We definitely don't make whitespace-only changes mixed in with other changes, as it makes the diff too hard to read. Your mentor should have caught this. -- I am only one, but I am one. I cannot do everything, but I can do something. And I will not let what I cannot do interfere with what I can do. -- Edward Everett Hale, (1822 - 1909) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r240225 - stable/9/sys/cddl/compat/opensolaris/sys
On 9/8/2012 12:39 PM, Eitan Adler wrote: On 8 September 2012 15:36, Doug Barton do...@freebsd.org wrote: On 09/08/2012 12:21, Martin Matuska wrote: This commit is missing the PR number It's actually pretty common to summarize the commit message in an MFC, rather than reproducing it verbatim. The PR number is still important in order for dfilter to act correctly. While reasonable minds can differ on this topic, I regard that as a reason _not_ to include the PR number in merges. IMO it's far better to have one line MFCs complete than it is to repeat the same commit message verbatim in GNATS N times. Doug -- I am only one, but I am one. I cannot do everything, but I can do something. And I will not let what I cannot do interfere with what I can do. -- Edward Everett Hale, (1822 - 1909) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r240225 - stable/9/sys/cddl/compat/opensolaris/sys
On 09/08/2012 12:21, Martin Matuska wrote: This commit is missing the PR number It's actually pretty common to summarize the commit message in an MFC, rather than reproducing it verbatim. -- I am only one, but I am one. I cannot do everything, but I can do something. And I will not let what I cannot do interfere with what I can do. -- Edward Everett Hale, (1822 - 1909) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r239927 - head/tools/tools/track
On 08/30/2012 12:56 PM, Dag-Erling Sm�rgrav wrote: Author: des Date: Thu Aug 30 22:56:32 2012 New Revision: 239927 URL: http://svn.freebsd.org/changeset/base/239927 Log: The error syntax has changed. Modified: head/tools/tools/track/track.sh Modified: head/tools/tools/track/track.sh == --- head/tools/tools/track/track.sh Thu Aug 30 22:18:25 2012 (r239926) +++ head/tools/tools/track/track.sh Thu Aug 30 22:56:32 2012 (r239927) @@ -35,7 +35,7 @@ do \\\*) endl=\r\n ;; - \*\*\*\ Error*) + \*\*\**) Are you sure that the double ** is necessary here? endl=\r\n ;; \=\=\=*) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r239568 - head/etc/rc.d
On 8/22/2012 3:25 PM, David O'Brien wrote: On Wed, Aug 22, 2012 at 02:37:37PM -0700, Doug Barton wrote: Were these changes discussed somewhere and I missed it? They were not discussed. I did not see the need. This is simple functionality. If securelevel is raised 0, one cannot start up a firewall nor make major changes to time. Thus these components are required to be done before raising securelevel. I'm not opposed per se, but the security aspects should be discussed on freebsd-security@, I'm sorry, I didn't feel that ensuring the software follows the published specification of its functionality to have such a security aspect. and it's preferable that significant changes to rcorder be looked at on freebsd-rc@ as well. I don't consider this to be a significant change. I do have some significant changes that I do want freebsd-rc@ to review I will be sending soon. Can you hold off on MFC'ing any of this until it's been reviewed more thoroughly? Yes. Thanks. Just to reiterate, I'm not saying that either your changes or your methodology were wrong ... I personally would just like a little time to review them before we move forward. Doug -- I am only one, but I am one. I cannot do everything, but I can do something. And I will not let what I cannot do interfere with what I can do. -- Edward Everett Hale, (1822 - 1909) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r239568 - head/etc/rc.d
Were these changes discussed somewhere and I missed it? I'm not opposed per se, but the security aspects should be discussed on freebsd-security@, and it's preferable that significant changes to rcorder be looked at on freebsd-rc@ as well. Can you hold off on MFC'ing any of this until it's been reviewed more thoroughly? Doug On 08/22/2012 11:35, David E. O'Brien wrote: Author: obrien Date: Wed Aug 22 18:35:17 2012 New Revision: 239568 URL: http://svn.freebsd.org/changeset/base/239568 Log: Add dependencies based on security(7). Modified: head/etc/rc.d/securelevel Modified: head/etc/rc.d/securelevel == --- head/etc/rc.d/securelevel Wed Aug 22 18:30:13 2012(r239567) +++ head/etc/rc.d/securelevel Wed Aug 22 18:35:17 2012(r239568) @@ -4,6 +4,7 @@ # # PROVIDE: securelevel +# REQUIRE: adjkerntz ipfw ipfilter pf . /etc/rc.subr -- I am only one, but I am one. I cannot do everything, but I can do something. And I will not let what I cannot do interfere with what I can do. -- Edward Everett Hale, (1822 - 1909) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238973 - head/sys/x86/x86
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 08/01/2012 10:32, Konstantin Belousov wrote: It should have been the text Forced commit? :) - -- I am only one, but I am one. I cannot do everything, but I can do something. And I will not let what I cannot do interfere with what I can do. -- Edward Everett Hale, (1822 - 1909) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBCAAGBQJQH210AAoJEFzGhvEaGryEQ/8H/jTrpM5C8TiyxU4A3wTieeUx 1IlDUpRaiLO65u6iWE2/NcxstL2QOnBHNmuIDSZ3MCDf7ytlH8XuDkEA0kj54zlK /evgsR4wP9us53lWtLPG4PUcKtjU0iZ10lP4iGENbdP/5pf/pbT1sZ7NDqeXajT/ RrwiIipgdCwZRqQ9MaU/3EUUH1gA40Y7Wohm6gRT0rFEBOHagjpIpOW1oPPmNSjE TJW30JDJXkccCn3BGjcPA93zhPcW1Hg+O6Ekr88gTp2SdGDgHhI6O27j/2zN/xgZ GjFHVlynA4p3a+e9sfi4j0b3jLVaoz5vyaWPJmeHfKpP02wxUL9l44AF/ErodpA= =GiTg -END PGP SIGNATURE- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238622 - head/etc/rc.d
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
On 08/02/2012 20:58, Hiroki Sato wrote:
Doug Barton do...@freebsd.org wrote in
501af66a.8020...@freebsd.org:
do On 8/2/2012 2:25 PM, Maksim Yevmenkin wrote: do On Thu, Aug
2, 2012 at 1:55 PM, Hiroki Sato h...@freebsd.org wrote: do do
Just curious, why ip6addrctl_enable=NO is not enough here? do
do Because the behavior of the script for =NO is to prefer v4.
No, when ip6addrctl_enable=NO the rc.d/ip6addtctl script will be
simply ignored. No rule will be installed in that case.
I wondered about that, but the script has an explicit case for it.
do I would do like to eliminate yes/no/none keywords in
$ip6addrctl_policy because do such keywords are vague. If we
need the empty rule for some reason, do empty would be a
better name for the policy, I think. do do Personally I think
that the established meanings of yes and no are do well
understood, but I wouldn't object to emitting a warning for them
to do help the user make a more explicit selection.
I do not think ip6addrctl_policy={yes|no} is meaningful.
Aside from my argument that the script is poorly named, and the whole
interface is badly designed ... I think users who would say yes here
would expect that IPv6 would be preferred, and no to mean it would
not be. That is in fact what happens now, so in that sense at least
things seem to be meaningful. :)
do While we're at it, the way that the current script replicates
the test do for checkyesno in case is bogus, and should be
changed. I had fixed this do in the change set that you(hrs)
backed out. To stick with the structure do of the current script,
something like this would work: do do
http://people.freebsd.org/~dougb/ip6addrctl.diff do do That also
brings in the warning described above.
I think additional warnings are not needed because a warning will
be displayed when ipv6_prefer={yes|no} is defined. I have no
objection to use checkyesno() itself to check if the variable is
defined as yes or no.
There is a warning in the script already, I just made it consistent;
and you were the one who suggested warnings for yes/no. But as you
know I'm prohibited from making changes to that code, so you have my
patch, do with it as you will.
Doug
- --
I am only one, but I am one. I cannot do everything, but I can do
something. And I will not let what I cannot do interfere with what
I can do.
-- Edward Everett Hale, (1822 - 1909)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (FreeBSD)
iQEcBAEBCAAGBQJQH3E0AAoJEFzGhvEaGryENTMH/R6HW7J8+2BLJEwor+VyFWUH
da9d+wrp7GSmBjY2dFko+6Z8A3McIqZDTJ9TdTKerilOMBpZkhT86ZUk1eOldBPp
rMKmMcZlK5Z/8s6l1qGGAFbfX7MFq+qQU6d8xo730o5ldRmBQhhmgH0pAZOLF2Iv
4HI1njrJ56KUnDERh0LhrJ+A5n62JyO1ML/YgGFeU5qvDevomDygmrU+zWhTftLJ
0ACW1YVyK5d8Sg5J44s66nbjMeNk1PXpdVN0CA/n03bryoI39S7kLl1iVInQ99MA
afK8UMV8TTbYd7KOlY091NaBny0K2U7LTY7iprMQ2cHE9DaXHewu3X4FFW9eXoY=
=UNRQ
-END PGP SIGNATURE-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238622 - head/etc/rc.d
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 08/02/2012 22:28, Hiroki Sato wrote: John Hay j...@meraka.org.za wrote in 20120803042301.ga78...@zibbi.meraka.csir.co.za: jh While you guys are here, may I add a request that we go back to prefering jh IPv6 when IPv6 addresses are enabled. That is the way it was from FBSD-4 jh up to FBSD-8. 9 is a big POLA here. Actually all that used to be needed was ipv6_enable. I modified the rc.d code for this prior to 9-release to make it compatible with the old knobs (aka, expected behavior), but hrs overruled me and installed his version instead. jh The world is past World IPv6 Launch jh and I think people expect that if they configure IPv6 addresses, that jh would be prefered. If you configure IPv6 addresses and do not want them jh prefered, you are the odd one out and should have to do something. I agree. My proposal was that if an interface is configured for IPv4 it should get the same treatment for IPv6. That is, if it's set up for DHCP in IPv4 then it should automatically do SLAAC/RA in IPv6; and if it's statically configured in v4, the user should have to configure it in v6 as well (either with a static definition or by explicitly enabling RA). I wanted to move to a model where you could simply say ifconfig_em0=auto and have it DTRT. jh Otherwise when in the future are we going to change it? IPv4-preferred was chosen as the default because difference of the loopback performance was large. I am a big fun to make FreeBSD IPv6-capable by default and prefer IPv6, but the concern was a possible negative impact for people who are using only IPv4. Hiroki, you and Bjoern made the same argument over 2 years ago. Are you saying that nothing has been done to improve this in that whole time? If this is such an important problem, why hasn't it been addressed? So, can we change it for 10.X now? We cannot use whether IPv6 address is configured because ::1 is always configured in GENERIC kernel. The change will be IPv6-preferred if the kernel has INET6 support. Aren't those 2 ways to say the same thing? There is no v6 address configured on lo0 if there is no INET6 in the kernel. In the current regime I think it would be sufficient to prefer v6 if the user has configured an interface with it (see below). I did this in my version of the code that you reverted, so you can crib from that if you need to. Preferring IPv6 addresses has needed a knob in rc.conf even in 4.x: 4.X: ipv6_enable=YES Until you introduced the changes in 9, it was not necessary to configure the address if you were using RA. Now even with RA it's necessary to do ifconfig_em0_ipv6=inet6 accept_rtadv ipv6_ifconfig_em0=2001:db8::1 prefixlen 64 9.X and later: ip6addrctl_policy=ipv6_prefer ifconfig_em0_ipv6=inet6 2001:db8::1 prefixlen 64 and if we change the default to ipv6_prefer, ip6addrctl_policy= line will be unnecessary. But it will still be necessary to configure the interface. John, In regards to your desire for this to work automatically, we're not there yet. We don't currently have a good way to build v6 into the kernel, and configure interfaces with it, but not actually *use* v6 unless we get a network. What you described was the end goal of the changes I put in, which were ultimately reverted. Doug - -- I am only one, but I am one. I cannot do everything, but I can do something. And I will not let what I cannot do interfere with what I can do. -- Edward Everett Hale, (1822 - 1909) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBCAAGBQJQH3cJAAoJEFzGhvEaGryEgkIIAIOEDh1f2pFXusK0bqytMJIo +6A+ZGNRXkNttXDX53XQxpxQ4MO4zhQIazWV5a8IpbnkIQfAU91st/7oNREPbrr4 18AU4XGlrij5biyhL7BmmP29h5AjHQ4M++WqUxltT64xQ3wTS6HEWCqtrT+CV18S zQK+OBCatU43Fc90FibFMA1N1WVsGpo7C2XCyDBhplwEBld3f4vuS4kBWx9XNGKu aeKqpCgT/XL2PzHlo/YRDHTYU2GiKEFuYyesZBhfLbBw3eFpNl31U8CGT4BzRVy+ +v0n1mfJqup6ApdPeKtOtviUW+5iEEQNf2dnHxKTvihBQ8pSJUqPWeMFalpbEDk= =f8Es -END PGP SIGNATURE- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238973 - head/sys/x86/x86
On 08/06/2012 07:12 AM, Steve Kargl wrote: On Mon, Aug 06, 2012 at 12:08:36AM -0700, Doug Barton wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 08/01/2012 10:32, Konstantin Belousov wrote: It should have been the text Forced commit? :) Try 'svn log sys/x86/x86/tsc.c | more' Awesome. :) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238622 - head/etc/rc.d
On 8/2/2012 2:25 PM, Maksim Yevmenkin wrote: On Thu, Aug 2, 2012 at 1:55 PM, Hiroki Sato h...@freebsd.org wrote: Just curious, why ip6addrctl_enable=NO is not enough here? Because the behavior of the script for =NO is to prefer v4. I would like to eliminate yes/no/none keywords in $ip6addrctl_policy because such keywords are vague. If we need the empty rule for some reason, empty would be a better name for the policy, I think. Personally I think that the established meanings of yes and no are well understood, but I wouldn't object to emitting a warning for them to help the user make a more explicit selection. While we're at it, the way that the current script replicates the test for checkyesno in case is bogus, and should be changed. I had fixed this in the change set that you(hrs) backed out. To stick with the structure of the current script, something like this would work: http://people.freebsd.org/~dougb/ip6addrctl.diff That also brings in the warning described above. i just wanted to make sure that there is a way to absolutely make sure that there is no default address selection policy installed. the wide know rule 9 of rfc 3484 is really messing things up for dns-style load balancing. even when ipv6 is not used. Maksim, can you say more about this? Or point me to a reference that has the discussion? personally, i don't think that none is unreasonable word for ip6addrctl_policy, but i don't feel particularly strongly about it. any name will do as long as original functionality is preserved. I agree that none is reasonable, and is in line with other rc.d knobs. I would not object to empty being added as a synonym though. One request however, is this new knob documented in rc.conf.5? If not, can you do that please? :) Doug -- I am only one, but I am one. I cannot do everything, but I can do something. And I will not let what I cannot do interfere with what I can do. -- Edward Everett Hale, (1822 - 1909) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238912 - head/sys/dev/netmap
It seems this broke the build?
On 07/30/2012 11:21, Luigi Rizzo wrote:
Author: luigi
Date: Mon Jul 30 18:21:48 2012
New Revision: 238912
URL: http://svn.freebsd.org/changeset/base/238912
Log:
- move the inclusion of netmap headers to the common part of the code;
- more portable annotations for unused arguments;
Modified:
head/sys/dev/netmap/netmap.c
head/sys/dev/netmap/netmap_mem2.c
Modified: head/sys/dev/netmap/netmap.c
==
--- head/sys/dev/netmap/netmap.c Mon Jul 30 15:37:47 2012
(r238911)
+++ head/sys/dev/netmap/netmap.c Mon Jul 30 18:21:48 2012
(r238912)
@@ -90,13 +90,14 @@ __FBSDID($FreeBSD$);
#include net/if.h
#include net/bpf.h /* BIOCIMMEDIATE */
#include net/vnet.h
-#include net/netmap.h
-#include dev/netmap/netmap_kern.h
#include machine/bus.h /* bus_dmamap_* */
MALLOC_DEFINE(M_NETMAP, netmap, Network memory map);
#endif /* __FreeBSD__ */
+#include net/netmap.h
+#include dev/netmap/netmap_kern.h
+
/*
* lock and unlock for the netmap memory allocator
*/
@@ -764,8 +765,8 @@ netmap_set_ringid(struct netmap_priv_d *
* Return 0 on success, errno otherwise.
*/
static int
-netmap_ioctl(__unused struct cdev *dev, u_long cmd, caddr_t data,
- __unused int fflag, struct thread *td)
+netmap_ioctl(struct cdev *dev, u_long cmd, caddr_t data,
+ int fflag, struct thread *td)
{
struct netmap_priv_d *priv = NULL;
struct ifnet *ifp;
@@ -775,6 +776,8 @@ netmap_ioctl(__unused struct cdev *dev,
u_int i, lim;
struct netmap_if *nifp;
+ (void)dev; /* UNUSED */
+ (void)fflag;/* UNUSED */
#ifdef linux
#define devfs_get_cdevpriv(pp) \
({ *(struct netmap_priv_d **)pp = ((struct file *)td)-private_data;
\
@@ -1551,7 +1554,7 @@ linux_netmap_poll(struct file * file, st
}
static int
-netmap_mmap(__unused struct file *f, struct vm_area_struct *vma)
+netmap_mmap(struct file *f, struct vm_area_struct *vma)
{
int lut_skip, i, j;
int user_skip = 0;
@@ -1565,6 +1568,7 @@ netmap_mmap(__unused struct file *f, str
* vma-vm_end: end of the mapping user address space
*/
+ (void)f;/* UNUSED */
// XXX security checks
for (i = 0; i 3; i++) { /* loop through obj_pools */
@@ -1599,7 +1603,7 @@ netmap_start_linux(struct sk_buff *skb,
}
-#if LINUX_VERSION_CODE KERNEL_VERSION(2,6,38)
+#if LINUX_VERSION_CODE KERNEL_VERSION(2,6,37) // XXX was 38
#define LIN_IOCTL_NAME .ioctl
int
linux_netmap_ioctl(struct inode *inode, struct file *file, u_int cmd, u_long
data /* arg */)
@@ -1623,8 +1627,9 @@ linux_netmap_ioctl(struct file *file, u_
static int
-netmap_release(__unused struct inode *inode, struct file *file)
+netmap_release(struct inode *inode, struct file *file)
{
+ (void)inode;/* UNUSED */
if (file-private_data)
netmap_dtor(file-private_data);
return (0);
Modified: head/sys/dev/netmap/netmap_mem2.c
==
--- head/sys/dev/netmap/netmap_mem2.c Mon Jul 30 15:37:47 2012
(r238911)
+++ head/sys/dev/netmap/netmap_mem2.c Mon Jul 30 18:21:48 2012
(r238912)
@@ -25,7 +25,7 @@
/*
* $FreeBSD$
- * $Id: netmap_mem2.c 10830 2012-03-22 18:06:01Z luigi $
+ * $Id: netmap_mem2.c 11445 2012-07-30 10:49:07Z luigi $
*
* New memory allocator for netmap
*/
@@ -300,12 +300,13 @@ netmap_obj_free_va(struct netmap_obj_poo
static void
-netmap_new_bufs(struct netmap_if *nifp __unused,
+netmap_new_bufs(struct netmap_if *nifp,
struct netmap_slot *slot, u_int n)
{
struct netmap_obj_pool *p = nm_mem-nm_buf_pool;
uint32_t i = 0; /* slot counter */
+ (void)nifp; /* UNUSED */
for (i = 0; i n; i++) {
void *vaddr = netmap_buf_malloc();
if (vaddr == NULL) {
--
I am only one, but I am one. I cannot do everything, but I can do
something. And I will not let what I cannot do interfere with what
I can do.
-- Edward Everett Hale, (1822 - 1909)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r238879 - head/games/fortune/datfiles
Author: dougb Date: Sun Jul 29 01:01:35 2012 New Revision: 238879 URL: http://svn.freebsd.org/changeset/base/238879 Log: Add a couple of nice quotes from Edward Everett Hale Modified: head/games/fortune/datfiles/fortunes Modified: head/games/fortune/datfiles/fortunes == --- head/games/fortune/datfiles/fortunesSun Jul 29 00:45:24 2012 (r238878) +++ head/games/fortune/datfiles/fortunesSun Jul 29 01:01:35 2012 (r238879) @@ -22100,6 +22100,11 @@ planet. Tuna, chicken, sparrow-brains, e world that they like, but catnip is crack from home. -- Bill Cole % +I am only one, but I am one. I cannot do everything, but I can do +something. And I will not let what I cannot do interfere with what +I can do. + -- Edward Everett Hale, (1822 - 1909) +% I am professionally trained in computer science, which is to say (in all seriousness) that I am extremely poorly educated. -- Joseph Weizenbaum, Computer Power and Human Reason @@ -31413,6 +31418,10 @@ Look ere ye leap. % Look out! Behind you! % +Look up and not down, look forward and not back, look out and not in, +and lend a hand. + -- Edward Everett Hale, Lowell Institute Lectures (1869) +% Look, we play the Star Spangled Banner before every game. You want us to pay income taxes, too? -- Bill Veeck, Chicago White Sox ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r238744 - in vendor/bind9/dist: . lib/dns
Author: dougb
Date: Tue Jul 24 18:48:17 2012
New Revision: 238744
URL: http://svn.freebsd.org/changeset/base/238744
Log:
Vendor import of BIND 9.8.3-P2
Modified:
vendor/bind9/dist/CHANGES
vendor/bind9/dist/lib/dns/resolver.c
vendor/bind9/dist/lib/dns/zone.c
vendor/bind9/dist/version
Modified: vendor/bind9/dist/CHANGES
==
--- vendor/bind9/dist/CHANGES Tue Jul 24 18:01:28 2012(r238743)
+++ vendor/bind9/dist/CHANGES Tue Jul 24 18:48:17 2012(r238744)
@@ -1,3 +1,12 @@
+ --- 9.8.3-P2 released ---
+
+3346. [security] Bad-cache data could be used before it was
+ initialized, causing an assert. [RT #30025]
+
+3342. [bug] Change #3314 broke saving of stub zones to disk
+ resulting in excessive cpu usage in some cases.
+ [RT #29952]
+
--- 9.8.3-P1 released ---
3331. [security] dns_rdataslab_fromrdataset could produce bad
Modified: vendor/bind9/dist/lib/dns/resolver.c
==
--- vendor/bind9/dist/lib/dns/resolver.cTue Jul 24 18:01:28 2012
(r238743)
+++ vendor/bind9/dist/lib/dns/resolver.cTue Jul 24 18:48:17 2012
(r238744)
@@ -8448,6 +8448,7 @@ dns_resolver_addbadcache(dns_resolver_t
goto cleanup;
bad-type = type;
bad-hashval = hashval;
+ bad-expire = *expire;
isc_buffer_init(buffer, bad + 1, name-length);
dns_name_init(bad-name, NULL);
dns_name_copy(name, bad-name, buffer);
@@ -8459,8 +8460,8 @@ dns_resolver_addbadcache(dns_resolver_t
if (resolver-badcount resolver-badhash * 2
resolver-badhash DNS_BADCACHE_SIZE)
resizehash(resolver, now, ISC_FALSE);
- }
- bad-expire = *expire;
+ } else
+ bad-expire = *expire;
cleanup:
UNLOCK(resolver-lock);
}
Modified: vendor/bind9/dist/lib/dns/zone.c
==
--- vendor/bind9/dist/lib/dns/zone.cTue Jul 24 18:01:28 2012
(r238743)
+++ vendor/bind9/dist/lib/dns/zone.cTue Jul 24 18:48:17 2012
(r238744)
@@ -8027,13 +8027,14 @@ zone_maintenance(dns_zone_t *zone) {
case dns_zone_master:
case dns_zone_slave:
case dns_zone_key:
+ case dns_zone_stub:
LOCK_ZONE(zone);
if (zone-masterfile != NULL
isc_time_compare(now, zone-dumptime) = 0
DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)
DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP)) {
dumping = was_dumping(zone);
- } else
+ } else
dumping = ISC_TRUE;
UNLOCK_ZONE(zone);
if (!dumping) {
@@ -8386,7 +8387,7 @@ zone_dump(dns_zone_t *zone, isc_boolean_
goto fail;
}
- if (compact) {
+ if (compact zone-type != dns_zone_stub) {
dns_zone_t *dummy = NULL;
LOCK_ZONE(zone);
zone_iattach(zone, dummy);
@@ -9242,7 +9243,7 @@ stub_callback(isc_task_t *task, isc_even
dns_zone_t *zone = NULL;
char master[ISC_SOCKADDR_FORMATSIZE];
char source[ISC_SOCKADDR_FORMATSIZE];
- isc_uint32_t nscnt, cnamecnt;
+ isc_uint32_t nscnt, cnamecnt, refresh, retry, expire;
isc_result_t result;
isc_time_t now;
isc_boolean_t exiting = ISC_FALSE;
@@ -9390,19 +9391,32 @@ stub_callback(isc_task_t *task, isc_even
ZONEDB_LOCK(zone-dblock, isc_rwlocktype_write);
if (zone-db == NULL)
zone_attachdb(zone, stub-db);
+ result = zone_get_from_db(zone, zone-db, NULL, NULL, NULL, refresh,
+ retry, expire, NULL, NULL);
+ if (result == ISC_R_SUCCESS) {
+ zone-refresh = RANGE(refresh, zone-minrefresh,
+ zone-maxrefresh);
+ zone-retry = RANGE(retry, zone-minretry, zone-maxretry);
+ zone-expire = RANGE(expire, zone-refresh + zone-retry,
+DNS_MAX_EXPIRE);
+ DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_HAVETIMERS);
+ }
ZONEDB_UNLOCK(zone-dblock, isc_rwlocktype_write);
dns_db_detach(stub-db);
- if (zone-masterfile != NULL)
- zone_needdump(zone, 0);
-
dns_message_destroy(msg);
isc_event_free(event);
dns_request_destroy(zone-request);
+
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_REFRESH);
+ DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_LOADED);
DNS_ZONE_JITTER_ADD(now, zone-refresh, zone-refreshtime);
isc_interval_set(i, zone-expire, 0);
svn commit: r238745 - vendor/bind9/9.8.3-P2
Author: dougb Date: Tue Jul 24 18:49:18 2012 New Revision: 238745 URL: http://svn.freebsd.org/changeset/base/238745 Log: Tag the 9.8.3-P2 release Added: vendor/bind9/9.8.3-P2/ - copied from r238744, vendor/bind9/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r238746 - in head/contrib/bind9: . lib/dns
Author: dougb
Date: Tue Jul 24 18:53:28 2012
New Revision: 238746
URL: http://svn.freebsd.org/changeset/base/238746
Log:
Heavy DNSSEC Validation Load Can Cause a Bad Cache Assertion Failure
in BIND9
High numbers of queries with DNSSEC validation enabled can cause an
assertion failure in named, caused by using a bad cache data structure
before it has been initialized.
CVE: CVE-2012-3817
Posting date: 24 July, 2012
Modified:
head/contrib/bind9/CHANGES
head/contrib/bind9/lib/dns/resolver.c
head/contrib/bind9/lib/dns/zone.c
head/contrib/bind9/version
Directory Properties:
head/contrib/bind9/ (props changed)
Modified: head/contrib/bind9/CHANGES
==
--- head/contrib/bind9/CHANGES Tue Jul 24 18:49:18 2012(r238745)
+++ head/contrib/bind9/CHANGES Tue Jul 24 18:53:28 2012(r238746)
@@ -1,3 +1,12 @@
+ --- 9.8.3-P2 released ---
+
+3346. [security] Bad-cache data could be used before it was
+ initialized, causing an assert. [RT #30025]
+
+3342. [bug] Change #3314 broke saving of stub zones to disk
+ resulting in excessive cpu usage in some cases.
+ [RT #29952]
+
--- 9.8.3-P1 released ---
3331. [security] dns_rdataslab_fromrdataset could produce bad
Modified: head/contrib/bind9/lib/dns/resolver.c
==
--- head/contrib/bind9/lib/dns/resolver.c Tue Jul 24 18:49:18 2012
(r238745)
+++ head/contrib/bind9/lib/dns/resolver.c Tue Jul 24 18:53:28 2012
(r238746)
@@ -8448,6 +8448,7 @@ dns_resolver_addbadcache(dns_resolver_t
goto cleanup;
bad-type = type;
bad-hashval = hashval;
+ bad-expire = *expire;
isc_buffer_init(buffer, bad + 1, name-length);
dns_name_init(bad-name, NULL);
dns_name_copy(name, bad-name, buffer);
@@ -8459,8 +8460,8 @@ dns_resolver_addbadcache(dns_resolver_t
if (resolver-badcount resolver-badhash * 2
resolver-badhash DNS_BADCACHE_SIZE)
resizehash(resolver, now, ISC_FALSE);
- }
- bad-expire = *expire;
+ } else
+ bad-expire = *expire;
cleanup:
UNLOCK(resolver-lock);
}
Modified: head/contrib/bind9/lib/dns/zone.c
==
--- head/contrib/bind9/lib/dns/zone.c Tue Jul 24 18:49:18 2012
(r238745)
+++ head/contrib/bind9/lib/dns/zone.c Tue Jul 24 18:53:28 2012
(r238746)
@@ -8027,13 +8027,14 @@ zone_maintenance(dns_zone_t *zone) {
case dns_zone_master:
case dns_zone_slave:
case dns_zone_key:
+ case dns_zone_stub:
LOCK_ZONE(zone);
if (zone-masterfile != NULL
isc_time_compare(now, zone-dumptime) = 0
DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)
DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP)) {
dumping = was_dumping(zone);
- } else
+ } else
dumping = ISC_TRUE;
UNLOCK_ZONE(zone);
if (!dumping) {
@@ -8386,7 +8387,7 @@ zone_dump(dns_zone_t *zone, isc_boolean_
goto fail;
}
- if (compact) {
+ if (compact zone-type != dns_zone_stub) {
dns_zone_t *dummy = NULL;
LOCK_ZONE(zone);
zone_iattach(zone, dummy);
@@ -9242,7 +9243,7 @@ stub_callback(isc_task_t *task, isc_even
dns_zone_t *zone = NULL;
char master[ISC_SOCKADDR_FORMATSIZE];
char source[ISC_SOCKADDR_FORMATSIZE];
- isc_uint32_t nscnt, cnamecnt;
+ isc_uint32_t nscnt, cnamecnt, refresh, retry, expire;
isc_result_t result;
isc_time_t now;
isc_boolean_t exiting = ISC_FALSE;
@@ -9390,19 +9391,32 @@ stub_callback(isc_task_t *task, isc_even
ZONEDB_LOCK(zone-dblock, isc_rwlocktype_write);
if (zone-db == NULL)
zone_attachdb(zone, stub-db);
+ result = zone_get_from_db(zone, zone-db, NULL, NULL, NULL, refresh,
+ retry, expire, NULL, NULL);
+ if (result == ISC_R_SUCCESS) {
+ zone-refresh = RANGE(refresh, zone-minrefresh,
+ zone-maxrefresh);
+ zone-retry = RANGE(retry, zone-minretry, zone-maxretry);
+ zone-expire = RANGE(expire, zone-refresh + zone-retry,
+DNS_MAX_EXPIRE);
+ DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_HAVETIMERS);
+ }
ZONEDB_UNLOCK(zone-dblock, isc_rwlocktype_write);
dns_db_detach(stub-db);
- if (zone-masterfile != NULL)
-
svn commit: r238747 - in vendor/bind9/dist-9.6: . lib/dns lib/isc
Author: dougb
Date: Tue Jul 24 19:00:36 2012
New Revision: 238747
URL: http://svn.freebsd.org/changeset/base/238747
Log:
Vendor import of BIND 9.6-ESV-R7-P2
Modified:
vendor/bind9/dist-9.6/CHANGES
vendor/bind9/dist-9.6/lib/dns/resolver.c
vendor/bind9/dist-9.6/lib/dns/zone.c
vendor/bind9/dist-9.6/lib/isc/random.c
vendor/bind9/dist-9.6/version
Modified: vendor/bind9/dist-9.6/CHANGES
==
--- vendor/bind9/dist-9.6/CHANGES Tue Jul 24 18:53:28 2012
(r238746)
+++ vendor/bind9/dist-9.6/CHANGES Tue Jul 24 19:00:36 2012
(r238747)
@@ -1,3 +1,14 @@
+ --- 9.6-ESV-R7-P2 released ---
+
+3346. [security] Bad-cache data could be used before it was
+ initialized, causing an assert. [RT #30025]
+
+3343. [bug] Relax isc_random_jitter() REQUIRE tests. [RT #29821]
+
+3342. [bug] Change #3314 broke saving of stub zones to disk
+ resulting in excessive cpu usage in some cases.
+ [RT #29952]
+
--- 9.6-ESV-R7-P1 released ---
3331. [security] dns_rdataslab_fromrdataset could produce bad
Modified: vendor/bind9/dist-9.6/lib/dns/resolver.c
==
--- vendor/bind9/dist-9.6/lib/dns/resolver.cTue Jul 24 18:53:28 2012
(r238746)
+++ vendor/bind9/dist-9.6/lib/dns/resolver.cTue Jul 24 19:00:36 2012
(r238747)
@@ -8124,6 +8124,7 @@ dns_resolver_addbadcache(dns_resolver_t
goto cleanup;
bad-type = type;
bad-hashval = hashval;
+ bad-expire = *expire;
isc_buffer_init(buffer, bad + 1, name-length);
dns_name_init(bad-name, NULL);
dns_name_copy(name, bad-name, buffer);
@@ -8135,8 +8136,8 @@ dns_resolver_addbadcache(dns_resolver_t
if (resolver-badcount resolver-badhash * 2
resolver-badhash DNS_BADCACHE_SIZE)
resizehash(resolver, now, ISC_FALSE);
- }
- bad-expire = *expire;
+ } else
+ bad-expire = *expire;
cleanup:
UNLOCK(resolver-lock);
}
Modified: vendor/bind9/dist-9.6/lib/dns/zone.c
==
--- vendor/bind9/dist-9.6/lib/dns/zone.cTue Jul 24 18:53:28 2012
(r238746)
+++ vendor/bind9/dist-9.6/lib/dns/zone.cTue Jul 24 19:00:36 2012
(r238747)
@@ -6054,6 +6054,7 @@ zone_maintenance(dns_zone_t *zone) {
switch (zone-type) {
case dns_zone_master:
case dns_zone_slave:
+ case dns_zone_stub:
LOCK_ZONE(zone);
if (zone-masterfile != NULL
isc_time_compare(now, zone-dumptime) = 0
@@ -6395,7 +6396,7 @@ zone_dump(dns_zone_t *zone, isc_boolean_
goto fail;
}
- if (compact) {
+ if (compact zone-type != dns_zone_stub) {
dns_zone_t *dummy = NULL;
LOCK_ZONE(zone);
zone_iattach(zone, dummy);
@@ -7251,7 +7252,7 @@ stub_callback(isc_task_t *task, isc_even
dns_zone_t *zone = NULL;
char master[ISC_SOCKADDR_FORMATSIZE];
char source[ISC_SOCKADDR_FORMATSIZE];
- isc_uint32_t nscnt, cnamecnt;
+ isc_uint32_t nscnt, cnamecnt, refresh, retry, expire;
isc_result_t result;
isc_time_t now;
isc_boolean_t exiting = ISC_FALSE;
@@ -7399,19 +7400,32 @@ stub_callback(isc_task_t *task, isc_even
ZONEDB_LOCK(zone-dblock, isc_rwlocktype_write);
if (zone-db == NULL)
zone_attachdb(zone, stub-db);
+ result = zone_get_from_db(zone, zone-db, NULL, NULL, NULL, refresh,
+ retry, expire, NULL, NULL);
+ if (result == ISC_R_SUCCESS) {
+ zone-refresh = RANGE(refresh, zone-minrefresh,
+ zone-maxrefresh);
+ zone-retry = RANGE(retry, zone-minretry, zone-maxretry);
+ zone-expire = RANGE(expire, zone-refresh + zone-retry,
+DNS_MAX_EXPIRE);
+ DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_HAVETIMERS);
+ }
ZONEDB_UNLOCK(zone-dblock, isc_rwlocktype_write);
dns_db_detach(stub-db);
- if (zone-masterfile != NULL)
- zone_needdump(zone, 0);
-
dns_message_destroy(msg);
isc_event_free(event);
dns_request_destroy(zone-request);
+
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_REFRESH);
+ DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_LOADED);
DNS_ZONE_JITTER_ADD(now, zone-refresh, zone-refreshtime);
isc_interval_set(i, zone-expire, 0);
DNS_ZONE_TIME_ADD(now, zone-expire, zone-expiretime);
+
+ if (zone-masterfile != NULL)
+ zone_needdump(zone, 0);
+
svn commit: r238748 - vendor/bind9/9.6-ESV-R7-P2
Author: dougb Date: Tue Jul 24 19:00:56 2012 New Revision: 238748 URL: http://svn.freebsd.org/changeset/base/238748 Log: Tag the 9.6-ESV-R7-P2 release Added: vendor/bind9/9.6-ESV-R7-P2/ - copied from r238747, vendor/bind9/dist-9.6/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r238749 - in stable/8/contrib/bind9: . lib/dns lib/isc
Author: dougb
Date: Tue Jul 24 19:04:35 2012
New Revision: 238749
URL: http://svn.freebsd.org/changeset/base/238749
Log:
Heavy DNSSEC Validation Load Can Cause a Bad Cache Assertion Failure
in BIND9
High numbers of queries with DNSSEC validation enabled can cause an
assertion failure in named, caused by using a bad cache data structure
before it has been initialized.
CVE: CVE-2012-3817
Posting date: 24 July, 2012
Modified:
stable/8/contrib/bind9/CHANGES
stable/8/contrib/bind9/lib/dns/resolver.c
stable/8/contrib/bind9/lib/dns/zone.c
stable/8/contrib/bind9/lib/isc/random.c
stable/8/contrib/bind9/version
Directory Properties:
stable/8/contrib/bind9/ (props changed)
Modified: stable/8/contrib/bind9/CHANGES
==
--- stable/8/contrib/bind9/CHANGES Tue Jul 24 19:00:56 2012
(r238748)
+++ stable/8/contrib/bind9/CHANGES Tue Jul 24 19:04:35 2012
(r238749)
@@ -1,3 +1,14 @@
+ --- 9.6-ESV-R7-P2 released ---
+
+3346. [security] Bad-cache data could be used before it was
+ initialized, causing an assert. [RT #30025]
+
+3343. [bug] Relax isc_random_jitter() REQUIRE tests. [RT #29821]
+
+3342. [bug] Change #3314 broke saving of stub zones to disk
+ resulting in excessive cpu usage in some cases.
+ [RT #29952]
+
--- 9.6-ESV-R7-P1 released ---
3331. [security] dns_rdataslab_fromrdataset could produce bad
Modified: stable/8/contrib/bind9/lib/dns/resolver.c
==
--- stable/8/contrib/bind9/lib/dns/resolver.c Tue Jul 24 19:00:56 2012
(r238748)
+++ stable/8/contrib/bind9/lib/dns/resolver.c Tue Jul 24 19:04:35 2012
(r238749)
@@ -8124,6 +8124,7 @@ dns_resolver_addbadcache(dns_resolver_t
goto cleanup;
bad-type = type;
bad-hashval = hashval;
+ bad-expire = *expire;
isc_buffer_init(buffer, bad + 1, name-length);
dns_name_init(bad-name, NULL);
dns_name_copy(name, bad-name, buffer);
@@ -8135,8 +8136,8 @@ dns_resolver_addbadcache(dns_resolver_t
if (resolver-badcount resolver-badhash * 2
resolver-badhash DNS_BADCACHE_SIZE)
resizehash(resolver, now, ISC_FALSE);
- }
- bad-expire = *expire;
+ } else
+ bad-expire = *expire;
cleanup:
UNLOCK(resolver-lock);
}
Modified: stable/8/contrib/bind9/lib/dns/zone.c
==
--- stable/8/contrib/bind9/lib/dns/zone.c Tue Jul 24 19:00:56 2012
(r238748)
+++ stable/8/contrib/bind9/lib/dns/zone.c Tue Jul 24 19:04:35 2012
(r238749)
@@ -6054,6 +6054,7 @@ zone_maintenance(dns_zone_t *zone) {
switch (zone-type) {
case dns_zone_master:
case dns_zone_slave:
+ case dns_zone_stub:
LOCK_ZONE(zone);
if (zone-masterfile != NULL
isc_time_compare(now, zone-dumptime) = 0
@@ -6395,7 +6396,7 @@ zone_dump(dns_zone_t *zone, isc_boolean_
goto fail;
}
- if (compact) {
+ if (compact zone-type != dns_zone_stub) {
dns_zone_t *dummy = NULL;
LOCK_ZONE(zone);
zone_iattach(zone, dummy);
@@ -7251,7 +7252,7 @@ stub_callback(isc_task_t *task, isc_even
dns_zone_t *zone = NULL;
char master[ISC_SOCKADDR_FORMATSIZE];
char source[ISC_SOCKADDR_FORMATSIZE];
- isc_uint32_t nscnt, cnamecnt;
+ isc_uint32_t nscnt, cnamecnt, refresh, retry, expire;
isc_result_t result;
isc_time_t now;
isc_boolean_t exiting = ISC_FALSE;
@@ -7399,19 +7400,32 @@ stub_callback(isc_task_t *task, isc_even
ZONEDB_LOCK(zone-dblock, isc_rwlocktype_write);
if (zone-db == NULL)
zone_attachdb(zone, stub-db);
+ result = zone_get_from_db(zone, zone-db, NULL, NULL, NULL, refresh,
+ retry, expire, NULL, NULL);
+ if (result == ISC_R_SUCCESS) {
+ zone-refresh = RANGE(refresh, zone-minrefresh,
+ zone-maxrefresh);
+ zone-retry = RANGE(retry, zone-minretry, zone-maxretry);
+ zone-expire = RANGE(expire, zone-refresh + zone-retry,
+DNS_MAX_EXPIRE);
+ DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_HAVETIMERS);
+ }
ZONEDB_UNLOCK(zone-dblock, isc_rwlocktype_write);
dns_db_detach(stub-db);
- if (zone-masterfile != NULL)
- zone_needdump(zone, 0);
-
dns_message_destroy(msg);
isc_event_free(event);
dns_request_destroy(zone-request);
+
svn commit: r238750 - in vendor/bind9: dist dist-9.6
Author: dougb
Date: Tue Jul 24 19:08:12 2012
New Revision: 238750
URL: http://svn.freebsd.org/changeset/base/238750
Log:
Update to reflect new svn realities
Modified:
vendor/bind9/dist-9.6/FREEBSD-Upgrade
vendor/bind9/dist/FREEBSD-Upgrade
Modified: vendor/bind9/dist-9.6/FREEBSD-Upgrade
==
--- vendor/bind9/dist-9.6/FREEBSD-Upgrade Tue Jul 24 19:04:35 2012
(r238749)
+++ vendor/bind9/dist-9.6/FREEBSD-Upgrade Tue Jul 24 19:08:12 2012
(r238750)
@@ -7,7 +7,8 @@
2) Check out the head of the subversion vendor branch
- svn co $REPO/vendor/bind9/dist-9.6
+ REPO=svn+ssh://svn.freebsd.org/
+ svn co $REPO/base/vendor/bind9/dist-9.6
3) Unpack the tarball in a suitable directory:
@@ -32,21 +33,21 @@
7) Commit the update to the vendor files:
cd dist-9.6 ; svn ci -m Vendor import of BIND 9.X.Y
- svn cp $REPO/vendor/bind9/dist-9.6 $REPO/vendor/bind9/${version}
+ svn cp $REPO/base/vendor/bind9/dist-9.6
$REPO/base/vendor/bind9/${version}
(this is a server-side operation, you dont have to check it out)
8) Update the files in src/contrib/bind9:
- cd head/contrib/bind9
+ cd stable/8/contrib/bind9
Make sure you are up to date:
svn update ; svn status
- svn merge $REPO/vendor/bind9/dist-9.6 .
+ svn merge $REPO/base/vendor/bind9/dist-9.6 .
Resolve conflicts (if any)
Carefully check the output of 'svn status' and 'svn diff'
- NOTE: You may need 2 copies of head/contrib/bind9 at this point,
+ NOTE: You may need 2 copies of stable/8/contrib/bind9 at this point,
one to do the work in steps 9 and 10 below, and a clean
version to commit in step 16.
Modified: vendor/bind9/dist/FREEBSD-Upgrade
==
--- vendor/bind9/dist/FREEBSD-Upgrade Tue Jul 24 19:04:35 2012
(r238749)
+++ vendor/bind9/dist/FREEBSD-Upgrade Tue Jul 24 19:08:12 2012
(r238750)
@@ -7,7 +7,8 @@
2) Check out the head of the subversion vendor branch
- svn co $REPO/vendor/bind9/dist
+ REPO=svn+ssh://svn.freebsd.org/
+ svn co $REPO/base/vendor/bind9/dist
3) Unpack the tarball in a suitable directory:
@@ -32,7 +33,7 @@
7) Commit the update to the vendor files:
cd dist ; svn ci -m Vendor import of BIND 9.X.Y
- svn cp $REPO/vendor/bind9/dist $REPO/vendor/bind9/${version}
+ svn cp $REPO/base/vendor/bind9/dist $REPO/base/vendor/bind9/${version}
(this is a server-side operation, you dont have to check it out)
8) Update the files in src/contrib/bind9:
@@ -42,7 +43,7 @@
Make sure you are up to date:
svn update ; svn status
- svn merge $REPO/vendor/bind9/dist .
+ svn merge $REPO/base/vendor/bind9/dist .
Resolve conflicts (if any)
Carefully check the output of 'svn status' and 'svn diff'
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238722 - in head/lib/msun: . ld128 ld80 man src
On 7/24/2012 1:53 PM, Steve Kargl wrote: So, I have no idea were the most current source lives. All 3 parts of the project are in svn now. There is a primer for doc svn on the wiki. -- If you're never wrong, you're not trying hard enough ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r238756 - in stable/9/contrib/bind9: . lib/dns
Author: dougb
Date: Tue Jul 24 22:32:03 2012
New Revision: 238756
URL: http://svn.freebsd.org/changeset/base/238756
Log:
MFV r238744:
Heavy DNSSEC Validation Load Can Cause a Bad Cache Assertion Failure
in BIND9
High numbers of queries with DNSSEC validation enabled can cause an
assertion failure in named, caused by using a bad cache data structure
before it has been initialized.
CVE: CVE-2012-3817
Posting date: 24 July, 2012
Approved by: re (kib)
Modified:
stable/9/contrib/bind9/CHANGES
stable/9/contrib/bind9/lib/dns/resolver.c
stable/9/contrib/bind9/lib/dns/zone.c
stable/9/contrib/bind9/version
Directory Properties:
stable/9/contrib/bind9/ (props changed)
Modified: stable/9/contrib/bind9/CHANGES
==
--- stable/9/contrib/bind9/CHANGES Tue Jul 24 22:10:11 2012
(r238755)
+++ stable/9/contrib/bind9/CHANGES Tue Jul 24 22:32:03 2012
(r238756)
@@ -1,3 +1,12 @@
+ --- 9.8.3-P2 released ---
+
+3346. [security] Bad-cache data could be used before it was
+ initialized, causing an assert. [RT #30025]
+
+3342. [bug] Change #3314 broke saving of stub zones to disk
+ resulting in excessive cpu usage in some cases.
+ [RT #29952]
+
--- 9.8.3-P1 released ---
3331. [security] dns_rdataslab_fromrdataset could produce bad
Modified: stable/9/contrib/bind9/lib/dns/resolver.c
==
--- stable/9/contrib/bind9/lib/dns/resolver.c Tue Jul 24 22:10:11 2012
(r238755)
+++ stable/9/contrib/bind9/lib/dns/resolver.c Tue Jul 24 22:32:03 2012
(r238756)
@@ -8448,6 +8448,7 @@ dns_resolver_addbadcache(dns_resolver_t
goto cleanup;
bad-type = type;
bad-hashval = hashval;
+ bad-expire = *expire;
isc_buffer_init(buffer, bad + 1, name-length);
dns_name_init(bad-name, NULL);
dns_name_copy(name, bad-name, buffer);
@@ -8459,8 +8460,8 @@ dns_resolver_addbadcache(dns_resolver_t
if (resolver-badcount resolver-badhash * 2
resolver-badhash DNS_BADCACHE_SIZE)
resizehash(resolver, now, ISC_FALSE);
- }
- bad-expire = *expire;
+ } else
+ bad-expire = *expire;
cleanup:
UNLOCK(resolver-lock);
}
Modified: stable/9/contrib/bind9/lib/dns/zone.c
==
--- stable/9/contrib/bind9/lib/dns/zone.c Tue Jul 24 22:10:11 2012
(r238755)
+++ stable/9/contrib/bind9/lib/dns/zone.c Tue Jul 24 22:32:03 2012
(r238756)
@@ -8027,13 +8027,14 @@ zone_maintenance(dns_zone_t *zone) {
case dns_zone_master:
case dns_zone_slave:
case dns_zone_key:
+ case dns_zone_stub:
LOCK_ZONE(zone);
if (zone-masterfile != NULL
isc_time_compare(now, zone-dumptime) = 0
DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)
DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP)) {
dumping = was_dumping(zone);
- } else
+ } else
dumping = ISC_TRUE;
UNLOCK_ZONE(zone);
if (!dumping) {
@@ -8386,7 +8387,7 @@ zone_dump(dns_zone_t *zone, isc_boolean_
goto fail;
}
- if (compact) {
+ if (compact zone-type != dns_zone_stub) {
dns_zone_t *dummy = NULL;
LOCK_ZONE(zone);
zone_iattach(zone, dummy);
@@ -9242,7 +9243,7 @@ stub_callback(isc_task_t *task, isc_even
dns_zone_t *zone = NULL;
char master[ISC_SOCKADDR_FORMATSIZE];
char source[ISC_SOCKADDR_FORMATSIZE];
- isc_uint32_t nscnt, cnamecnt;
+ isc_uint32_t nscnt, cnamecnt, refresh, retry, expire;
isc_result_t result;
isc_time_t now;
isc_boolean_t exiting = ISC_FALSE;
@@ -9390,19 +9391,32 @@ stub_callback(isc_task_t *task, isc_even
ZONEDB_LOCK(zone-dblock, isc_rwlocktype_write);
if (zone-db == NULL)
zone_attachdb(zone, stub-db);
+ result = zone_get_from_db(zone, zone-db, NULL, NULL, NULL, refresh,
+ retry, expire, NULL, NULL);
+ if (result == ISC_R_SUCCESS) {
+ zone-refresh = RANGE(refresh, zone-minrefresh,
+ zone-maxrefresh);
+ zone-retry = RANGE(retry, zone-minretry, zone-maxretry);
+ zone-expire = RANGE(expire, zone-refresh + zone-retry,
+DNS_MAX_EXPIRE);
+ DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_HAVETIMERS);
+ }
ZONEDB_UNLOCK(zone-dblock,
Re: svn commit: r238620 - stable/8/usr.sbin/flowctl
On 07/19/2012 06:00, Alexander V. Chernikov wrote: Author: melifaro Date: Thu Jul 19 13:00:31 2012 New Revision: 238620 URL: http://svn.freebsd.org/changeset/base/238620 Log: MFC r223788, r223790, r223824 236808 Merge netflow v9 support (user side) Seems to have broken the build. Did you 'make universe' these changes? Doug -- Change is hard. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238620 - stable/8/usr.sbin/flowctl
On 07/19/2012 06:54, Alexander V. Chernikov wrote: On 19.07.2012 17:44, Doug Barton wrote: On 07/19/2012 06:00, Alexander V. Chernikov wrote: Author: melifaro Date: Thu Jul 19 13:00:31 2012 New Revision: 238620 URL: http://svn.freebsd.org/changeset/base/238620 Log: MFC r223788, r223790, r223824 236808 Merge netflow v9 support (user side) Seems to have broken the build. Did you 'make universe' these changes? New flowctl requires updated netflow headers introduced in r238619. 'cp -p /usr/src/sys/netgraph/netflow/*.h /usr/include/netgraph/netflow' should help. So it sounds like the answer to my question is, No, you did not do a 'make universe'? If so, can you please start one? Can you please show exact error messages and arch ? You can see for yourself in the freebsd-stable archives, as the tinderboxes have been failing ever since your commit. Doug -- Change is hard. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238620 - stable/8/usr.sbin/flowctl
On 07/19/2012 08:54, Alexander V. Chernikov wrote: You can see for yourself in the freebsd-stable archives, as the tinderboxes have been failing ever since your commit. This is the result of 1+ hour gap between r238619 and r238620. Tinderbox tries to build old flowctl binary. Indeed, this does seem to be the case. Thanks for looking into it. :) -- Change is hard. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238514 - head/usr.bin/netstat
Is it my imagination or did this break the build?
On 07/15/2012 23:43, Michael Tuexen wrote:
Author: tuexen
Date: Mon Jul 16 06:43:04 2012
New Revision: 238514
URL: http://svn.freebsd.org/changeset/base/238514
Log:
Allow netstat to be build if INET is not defined in the kernel.
Thanks to Garrett Cooper for reporting the issue.
MFC after: 3 days
X-MFC: 238501
Modified:
head/usr.bin/netstat/Makefile
head/usr.bin/netstat/sctp.c
Modified: head/usr.bin/netstat/Makefile
==
--- head/usr.bin/netstat/Makefile Mon Jul 16 02:10:26 2012
(r238513)
+++ head/usr.bin/netstat/Makefile Mon Jul 16 06:43:04 2012
(r238514)
@@ -13,6 +13,10 @@ CFLAGS+=-fno-strict-aliasing
CFLAGS+=-DIPSEC
CFLAGS+=-DSCTP
+.if ${MK_INET_SUPPORT} != no
+CFLAGS+=-DINET
+.endif
+
.if ${MK_INET6_SUPPORT} != no
SRCS+= inet6.c
CFLAGS+=-DINET6
Modified: head/usr.bin/netstat/sctp.c
==
--- head/usr.bin/netstat/sctp.c Mon Jul 16 02:10:26 2012
(r238513)
+++ head/usr.bin/netstat/sctp.c Mon Jul 16 06:43:04 2012
(r238514)
@@ -107,6 +107,7 @@ struct xraddr_entry {
* If numeric_addr has been supplied, give
* numeric value, otherwise try for symbolic name.
*/
+#ifdef INET
static char *
inetname(struct in_addr *inp)
{
@@ -146,6 +147,7 @@ inetname(struct in_addr *inp)
}
return (line);
}
+#endif
#ifdef INET6
static char ntop_buf[INET6_ADDRSTRLEN];
@@ -197,9 +199,11 @@ sctp_print_address(union sctp_sockstore
int width;
switch (address-sa.sa_family) {
+#ifdef INET
case AF_INET:
sprintf(line, %.*s., Wflag ? 39 : 16,
inetname(address-sin.sin_addr));
break;
+#endif
#ifdef INET6
case AF_INET6:
sprintf(line, %.*s., Wflag ? 39 : 16,
inet6name(address-sin6.sin6_addr));
--
Change is hard.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238514 - head/usr.bin/netstat
On 07/16/2012 09:49, Michael Tuexen wrote: On Jul 16, 2012, at 5:56 PM, Garrett Cooper wrote: On Mon, Jul 16, 2012 at 2:17 AM, Doug Barton do...@freebsd.org wrote: Is it my imagination or did this break the build? Don't think so, but I'm running a buildworld with -DWITHOUT_INET -DWITHOUT_INET6 and -DWITHOUT_INET -DWITH_INET6, just to be sure. Please let me know if there are still any issues. I think it should be fixed now (meaning that it compiles (which I broke) and meaning that it actually works (which I fixed). I waited a while after your change and the tinderbox was still failing. Not too long after your first mail (responding to me) it stopped failing, so it was probably just a timing issue. Sorry for the noise. Doug -- Change is hard. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238405 - in head: . crypto/openssl crypto/openssl/apps crypto/openssl/apps/demoCA crypto/openssl/bugs crypto/openssl/certs/demo crypto/openssl/crypto crypto/openssl/crypto/aes crypto/
On 07/12/2012 12:30 PM, Jung-uk Kim wrote: Log: Merge OpenSSL 1.0.1c. Can you describe how you did the merge? There are numerous red flags in the log. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238118 - head/lib/libc/gen
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 07/04/2012 13:32, Andrey Chernov wrote: 1) /dev/urandom may not exist in jails/sandboxes That would be a pretty serious configuration error. - -- This .signature sanitized for your protection -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBCAAGBQJP9Kw9AAoJEFzGhvEaGryEATEH/RbxtNiNYy+Ki/DL0JWVTTwq f+kEK8bASCfJGmA+Vb+1cjEGcMT64QOvV3n4ow0xjn9xctmWVtoA8Y4Q4dRomOh6 vOlJfu5aRsZsAxsf9sV3k1psuO5IXuYBfAeGVtGBjgNMnDG46PiNBE+4q5rVntHw sUsuyupxgRbYrCvTVbeET2wAZ+G9j8ceK56nA63KN3azAIpCktCDzSm3FlDrVWYh zk+LpIHdpE4pbpH8znxDQoRqF+V9n6pryGiFNzkzLODvtoiL7qgrJtNEdfu3GCQI J7tolXvMmxljYW+V3PUP5abO6RS1uCMiZi3wvo+HaZqhPVUVTw98tx+qRwBJ7zs= =1MvW -END PGP SIGNATURE- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r237958 - head/sys/conf
Author: dougb
Date: Mon Jul 2 06:22:20 2012
New Revision: 237958
URL: http://svn.freebsd.org/changeset/base/237958
Log:
For the ports modules building code, clean WRKDIR before building. This is
important for those that use -DNO_CLEAN routinely, since it will prevent
installing stale stuff, and even more important when the port is upgraded
to a newer version. When the user doesn't use -DNO_CLEAN, this will create
an infinitesimal amount of extra work, but won't hurt anything.
This is necessary because the ports tree has flags that prevent the ususal
'update the build if newer source files exist' logic from doing what it
would do in the base.
Modified:
head/sys/conf/kern.post.mk
Modified: head/sys/conf/kern.post.mk
==
--- head/sys/conf/kern.post.mk Mon Jul 2 06:07:46 2012(r237957)
+++ head/sys/conf/kern.post.mk Mon Jul 2 06:22:20 2012(r237958)
@@ -64,7 +64,7 @@ PORTSMODULESENV=\
${__target}: ports-${__target}
ports-${__target}:
.for __i in ${PORTS_MODULES}
- cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/install/deinstall reinstall/:C/reinstall/deinstall reinstall/}
+ cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/all/clean all/:C/install/deinstall
reinstall/:C/reinstall/deinstall reinstall/}
.endfor
.endfor
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r237962 - stable/9/sys/conf
Author: dougb
Date: Mon Jul 2 06:51:49 2012
New Revision: 237962
URL: http://svn.freebsd.org/changeset/base/237962
Log:
MFC r237958:
For the ports modules building code, clean WRKDIR before building. This is
important for those that use -DNO_CLEAN routinely, since it will prevent
installing stale stuff, and even more important when the port is upgraded
to a newer version. When the user doesn't use -DNO_CLEAN, this will create
an infinitesimal amount of extra work, but won't hurt anything.
This is necessary because the ports tree has flags that prevent the ususal
'update the build if newer source files exist' logic from doing what it
would do in the base.
Modified:
stable/9/sys/conf/kern.post.mk
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/conf/ (props changed)
Modified: stable/9/sys/conf/kern.post.mk
==
--- stable/9/sys/conf/kern.post.mk Mon Jul 2 06:40:11 2012
(r237961)
+++ stable/9/sys/conf/kern.post.mk Mon Jul 2 06:51:49 2012
(r237962)
@@ -64,7 +64,7 @@ PORTSMODULESENV=\
${__target}: ports-${__target}
ports-${__target}:
.for __i in ${PORTS_MODULES}
- cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/install/deinstall reinstall/:C/reinstall/deinstall reinstall/}
+ cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/all/clean all/:C/install/deinstall
reinstall/:C/reinstall/deinstall reinstall/}
.endfor
.endfor
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r237964 - stable/7/sys/conf
Author: dougb
Date: Mon Jul 2 06:52:25 2012
New Revision: 237964
URL: http://svn.freebsd.org/changeset/base/237964
Log:
MFC r237958:
For the ports modules building code, clean WRKDIR before building. This is
important for those that use -DNO_CLEAN routinely, since it will prevent
installing stale stuff, and even more important when the port is upgraded
to a newer version. When the user doesn't use -DNO_CLEAN, this will create
an infinitesimal amount of extra work, but won't hurt anything.
This is necessary because the ports tree has flags that prevent the ususal
'update the build if newer source files exist' logic from doing what it
would do in the base.
Modified:
stable/7/sys/conf/kern.post.mk
Directory Properties:
stable/7/sys/ (props changed)
Modified: stable/7/sys/conf/kern.post.mk
==
--- stable/7/sys/conf/kern.post.mk Mon Jul 2 06:52:07 2012
(r237963)
+++ stable/7/sys/conf/kern.post.mk Mon Jul 2 06:52:25 2012
(r237964)
@@ -56,7 +56,7 @@ PORTSMODULESENV=\
${__target}: ports-${__target}
ports-${__target}:
.for __i in ${PORTS_MODULES}
- cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/install/deinstall reinstall/:C/reinstall/deinstall reinstall/}
+ cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/all/clean all/:C/install/deinstall
reinstall/:C/reinstall/deinstall reinstall/}
.endfor
.endfor
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r237963 - stable/8/sys/conf
Author: dougb
Date: Mon Jul 2 06:52:07 2012
New Revision: 237963
URL: http://svn.freebsd.org/changeset/base/237963
Log:
MFC r237958:
For the ports modules building code, clean WRKDIR before building. This is
important for those that use -DNO_CLEAN routinely, since it will prevent
installing stale stuff, and even more important when the port is upgraded
to a newer version. When the user doesn't use -DNO_CLEAN, this will create
an infinitesimal amount of extra work, but won't hurt anything.
This is necessary because the ports tree has flags that prevent the ususal
'update the build if newer source files exist' logic from doing what it
would do in the base.
Modified:
stable/8/sys/conf/kern.post.mk
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/conf/kern.post.mk
==
--- stable/8/sys/conf/kern.post.mk Mon Jul 2 06:51:49 2012
(r237962)
+++ stable/8/sys/conf/kern.post.mk Mon Jul 2 06:52:07 2012
(r237963)
@@ -56,7 +56,7 @@ PORTSMODULESENV=\
${__target}: ports-${__target}
ports-${__target}:
.for __i in ${PORTS_MODULES}
- cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/install/deinstall reinstall/:C/reinstall/deinstall reinstall/}
+ cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/all/clean all/:C/install/deinstall
reinstall/:C/reinstall/deinstall reinstall/}
.endfor
.endfor
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r237748 - in head/sys/cddl/dev/dtrace: amd64 i386
On 06/29/2012 00:42, Andriy Gapon wrote: I haven't studied at all what the newer code brings in, but it must be some fixes and improvements, I guess :-) Seriously? -- This .signature sanitized for your protection ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r237234 - head/share/man/man4
FYI, you didn't change the substance of the text, so there is no reason to bump .Dd. Doug On 06/18/2012 12:11, Marius Strobl wrote: Author: marius Date: Mon Jun 18 19:11:07 2012 New Revision: 237234 URL: http://svn.freebsd.org/changeset/base/237234 Log: Avoid hard sentence break. MFC after: 3 days Modified: head/share/man/man4/ahci.4 Modified: head/share/man/man4/ahci.4 == --- head/share/man/man4/ahci.4Mon Jun 18 18:25:57 2012 (r237233) +++ head/share/man/man4/ahci.4Mon Jun 18 19:11:07 2012 (r237234) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd December 6, 2011 +.Dd June 18, 2012 .Dt AHCI 4 .Os .Sh NAME @@ -101,7 +101,8 @@ setting to nonzero value limits maximum Values 1, 2 and 3 are respectively 1.5, 3 and 6Gbps. .It Va hw.ahci.force setting to nonzero value forces driver attach to some known AHCI-capable -chips even if they are configured for legacy IDE emulation. Default is 1. +chips even if they are configured for legacy IDE emulation. +Default is 1. .El .Sh DESCRIPTION This driver provides the -- This .signature sanitized for your protection ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r237748 - in head/sys/cddl/dev/dtrace: amd64 i386
On 07/02/2012 01:00, Andriy Gapon wrote: on 02/07/2012 10:55 Doug Barton said the following: On 06/29/2012 00:42, Andriy Gapon wrote: I haven't studied at all what the newer code brings in, but it must be some fixes and improvements, I guess :-) Seriously? I expected to hear from you :-) So let me get this straight ... you intentionally inserted an inflammatory comment that seems to indicate that you didn't actually review the code you committed in an attempt to bait me into saying something? -- This .signature sanitized for your protection ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r238038 - head/sys/conf
Author: dougb
Date: Mon Jul 2 22:14:58 2012
New Revision: 238038
URL: http://svn.freebsd.org/changeset/base/238038
Log:
Unfortunately the change in r237958 resulted in s/install/instclean/ due to
the aggressive pattern matching of the :C modifier. I tested build and
install in 2 phases, however with different solutions, resulting in the
breakage. Mea culpa.
The solution is to break out the all: target. This causes a few lines of
code duplication, but now the all: target works as it should, and the
other targets continue to work as they did before.
While I'm here, add a === header line to the start of each port build
to make it easier to find/more clear in the logs.
Modified:
head/sys/conf/kern.post.mk
Modified: head/sys/conf/kern.post.mk
==
--- head/sys/conf/kern.post.mk Mon Jul 2 22:04:09 2012(r238037)
+++ head/sys/conf/kern.post.mk Mon Jul 2 22:14:58 2012(r238038)
@@ -60,11 +60,21 @@ PORTSMODULESENV=\
SRC_BASE=${SRC_BASE} \
OSVERSION=${OSRELDATE} \
WRKDIRPREFIX=${WRKDIRPREFIX}
-.for __target in all install reinstall clean
+
+# The WRKDIR needs to be cleaned before building, and trying to change the
target
+# with a :C pattern below results in install - instclean
+all:
+.for __i in ${PORTS_MODULES}
+ @${ECHO} === Ports module ${__i} (all)
+ cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean
all
+.endfor
+
+.for __target in install reinstall clean
${__target}: ports-${__target}
ports-${__target}:
.for __i in ${PORTS_MODULES}
- cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/all/clean all/:C/install/deinstall
reinstall/:C/reinstall/deinstall reinstall/}
+ @${ECHO} === Ports module ${__i} (${__target})
+ cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/install/deinstall reinstall/:C/reinstall/deinstall reinstall/}
.endfor
.endfor
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r238041 - stable/7/sys/conf
Author: dougb
Date: Mon Jul 2 22:19:02 2012
New Revision: 238041
URL: http://svn.freebsd.org/changeset/base/238041
Log:
MFC r238038:
Unfortunately the change in r237958 resulted in s/install/instclean/ due to
the aggressive pattern matching of the :C modifier. I tested build and
install in 2 phases, however with different solutions, resulting in the
breakage. Mea culpa.
The solution is to break out the all: target. This causes a few lines of
code duplication, but now the all: target works as it should, and the
other targets continue to work as they did before.
While I'm here, add a === header line to the start of each port build
to make it easier to find/more clear in the logs.
Modified:
stable/7/sys/conf/kern.post.mk
Directory Properties:
stable/7/sys/ (props changed)
Modified: stable/7/sys/conf/kern.post.mk
==
--- stable/7/sys/conf/kern.post.mk Mon Jul 2 22:18:49 2012
(r238040)
+++ stable/7/sys/conf/kern.post.mk Mon Jul 2 22:19:02 2012
(r238041)
@@ -52,11 +52,21 @@ PORTSMODULESENV=\
SRC_BASE=${SRC_BASE} \
OSVERSION=${OSRELDATE} \
WRKDIRPREFIX=${WRKDIRPREFIX}
-.for __target in all install reinstall clean
+
+# The WRKDIR needs to be cleaned before building, and trying to change the
target
+# with a :C pattern below results in install - instclean
+all:
+.for __i in ${PORTS_MODULES}
+ @${ECHO} === Ports module ${__i} (all)
+ cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean
all
+.endfor
+
+.for __target in install reinstall clean
${__target}: ports-${__target}
ports-${__target}:
.for __i in ${PORTS_MODULES}
- cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/all/clean all/:C/install/deinstall
reinstall/:C/reinstall/deinstall reinstall/}
+ @${ECHO} === Ports module ${__i} (${__target})
+ cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/install/deinstall reinstall/:C/reinstall/deinstall reinstall/}
.endfor
.endfor
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r238039 - stable/9/sys/conf
Author: dougb
Date: Mon Jul 2 22:18:29 2012
New Revision: 238039
URL: http://svn.freebsd.org/changeset/base/238039
Log:
MFC r238038:
Unfortunately the change in r237958 resulted in s/install/instclean/ due to
the aggressive pattern matching of the :C modifier. I tested build and
install in 2 phases, however with different solutions, resulting in the
breakage. Mea culpa.
The solution is to break out the all: target. This causes a few lines of
code duplication, but now the all: target works as it should, and the
other targets continue to work as they did before.
While I'm here, add a === header line to the start of each port build
to make it easier to find/more clear in the logs.
Modified:
stable/9/sys/conf/kern.post.mk
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/conf/ (props changed)
Modified: stable/9/sys/conf/kern.post.mk
==
--- stable/9/sys/conf/kern.post.mk Mon Jul 2 22:14:58 2012
(r238038)
+++ stable/9/sys/conf/kern.post.mk Mon Jul 2 22:18:29 2012
(r238039)
@@ -60,11 +60,21 @@ PORTSMODULESENV=\
SRC_BASE=${SRC_BASE} \
OSVERSION=${OSRELDATE} \
WRKDIRPREFIX=${WRKDIRPREFIX}
-.for __target in all install reinstall clean
+
+# The WRKDIR needs to be cleaned before building, and trying to change the
target
+# with a :C pattern below results in install - instclean
+all:
+.for __i in ${PORTS_MODULES}
+ @${ECHO} === Ports module ${__i} (all)
+ cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean
all
+.endfor
+
+.for __target in install reinstall clean
${__target}: ports-${__target}
ports-${__target}:
.for __i in ${PORTS_MODULES}
- cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/all/clean all/:C/install/deinstall
reinstall/:C/reinstall/deinstall reinstall/}
+ @${ECHO} === Ports module ${__i} (${__target})
+ cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/install/deinstall reinstall/:C/reinstall/deinstall reinstall/}
.endfor
.endfor
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r238040 - stable/8/sys/conf
Author: dougb
Date: Mon Jul 2 22:18:49 2012
New Revision: 238040
URL: http://svn.freebsd.org/changeset/base/238040
Log:
MFC r238038:
Unfortunately the change in r237958 resulted in s/install/instclean/ due to
the aggressive pattern matching of the :C modifier. I tested build and
install in 2 phases, however with different solutions, resulting in the
breakage. Mea culpa.
The solution is to break out the all: target. This causes a few lines of
code duplication, but now the all: target works as it should, and the
other targets continue to work as they did before.
While I'm here, add a === header line to the start of each port build
to make it easier to find/more clear in the logs.
Modified:
stable/8/sys/conf/kern.post.mk
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/conf/kern.post.mk
==
--- stable/8/sys/conf/kern.post.mk Mon Jul 2 22:18:29 2012
(r238039)
+++ stable/8/sys/conf/kern.post.mk Mon Jul 2 22:18:49 2012
(r238040)
@@ -52,11 +52,21 @@ PORTSMODULESENV=\
SRC_BASE=${SRC_BASE} \
OSVERSION=${OSRELDATE} \
WRKDIRPREFIX=${WRKDIRPREFIX}
-.for __target in all install reinstall clean
+
+# The WRKDIR needs to be cleaned before building, and trying to change the
target
+# with a :C pattern below results in install - instclean
+all:
+.for __i in ${PORTS_MODULES}
+ @${ECHO} === Ports module ${__i} (all)
+ cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean
all
+.endfor
+
+.for __target in install reinstall clean
${__target}: ports-${__target}
ports-${__target}:
.for __i in ${PORTS_MODULES}
- cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/all/clean all/:C/install/deinstall
reinstall/:C/reinstall/deinstall reinstall/}
+ @${ECHO} === Ports module ${__i} (${__target})
+ cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B
${__target:C/install/deinstall reinstall/:C/reinstall/deinstall reinstall/}
.endfor
.endfor
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r237624 - in head: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize cddl/contrib/opensolaris/lib/libdtrace/common sys/cddl/contrib/opensolaris/uts/common/dtrace sys/cddl/
On 06/29/2012 10:58, Pedro Giffuni wrote: Now .. David pointed out I am not respecting the code provenance since I didn't add them to the opensolaris vendor area, but these files are copyrighted Joyent Inc (not even Illumos) so I cannot put them there unless we create a new vendor for Joyent Creating a new vendor area would be the right solution, yes. Doug -- This .signature sanitized for your protection ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r237860 - head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize
On 07/01/2012 03:05, Simon L. B. Nielsen wrote: Don't replace files, and even worse directories, and it breaks svn2cvs. Isn't it possible to write a pre-commit hook to avoid this issue? -- This .signature sanitized for your protection ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r237448 - head/lib/libedit
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 As a general rule, please trim out replies. This list is worse than most in the sense that people often reply to hundreds of lines only to add a line or 2 at the bottom. By trimming your reply you both save electrons, and make it easier for people to see what you have to say. Doug -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBCAAGBQJP5NWTAAoJEFzGhvEaGryEpVsH/3I60AiJ6JODDA9mx+ufW9LG SAr/p13YGlswZxL5LOLCLOvwjNrvK6CJieb42XI+70PYkGAGH8syKunTy9s4EPuQ 2wXWHw4jlJaUfMTOFsXOvoZIFTrH0YPRt3qZic4TdfuxWlEkqrk4G37+lVNMhdsW 0MLJD/eJC5rV3Ve/YMKB2OSPK47mukOmY0spFXG/N2NQRryOuV8N3D6ycbWGDn7q YJwpO98YxbbyxLEV394rGwVCK8T6taJXRBOLMu9VFR0L7321TPuayPc3cLg+0hQC owr6vN2ga0uD7vjhoKbApBTTHzWAGYVWN1LU+rpE0/b5QGZByq2Muiz5SARBncI= =cYw2 -END PGP SIGNATURE- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r237205 - stable/9/sys/conf
Author: dougb
Date: Sun Jun 17 21:06:36 2012
New Revision: 237205
URL: http://svn.freebsd.org/changeset/base/237205
Log:
Improve the functionality of the PORTS_MODULES knob by adding
LOCALBASE/bin and sbin to PATH, which allows dependencies to be found;
adding SRC_BASE and OSVERSION to match the new kernel, and putting the
related builds under MAKEOBJDIRPREFIX so that they only need to be built
once per kernel.
In addition to the PR this includes ideas/contributions from crees
and matthew.
PR: ports/161452
Submitted by: Garrett Cooper yaneg...@gmail.com
Modified:
stable/9/sys/conf/kern.post.mk
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/conf/ (props changed)
Modified: stable/9/sys/conf/kern.post.mk
==
--- stable/9/sys/conf/kern.post.mk Sun Jun 17 21:04:22 2012
(r237204)
+++ stable/9/sys/conf/kern.post.mk Sun Jun 17 21:06:36 2012
(r237205)
@@ -36,9 +36,30 @@ modules-${target}:
.endif
.endfor
-# Handle out of tree ports
+# Handle ports (as defined by the user) that build kernel modules
.if !defined(NO_MODULES) defined(PORTS_MODULES)
-PORTSMODULESENV=SYSDIR=${SYSDIR}
+#
+# The ports tree needs some environment variables defined to match the new
kernel
+#
+# Ports search for some dependencies in PATH, so add the location of the
installed files
+LOCALBASE?=/usr/local
+# SRC_BASE is how the ports tree refers to the location of the base source
files
+.if !defined(SRC_BASE)
+SRC_BASE!= realpath ${SYSDIR:H}/
+.endif
+# OSVERSION is used by some ports to determine build options
+.if !defined(OSRELDATE)
+# Definition copied from src/Makefile.inc1
+OSRELDATE!=awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
+ ${MAKEOBJDIRPREFIX}${SRC_BASE}/include/osreldate.h
+.endif
+# Keep the related ports builds in the obj directory so that they are only
rebuilt once per kernel build
+WRKDIRPREFIX?= ${MAKEOBJDIRPREFIX}${SRC_BASE}/sys/${KERNCONF}
+PORTSMODULESENV=\
+ PATH=${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin \
+ SRC_BASE=${SRC_BASE} \
+ OSVERSION=${OSRELDATE} \
+ WRKDIRPREFIX=${WRKDIRPREFIX}
.for __target in all install reinstall clean
${__target}: ports-${__target}
ports-${__target}:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r237206 - stable/8/sys/conf
Author: dougb
Date: Sun Jun 17 21:07:00 2012
New Revision: 237206
URL: http://svn.freebsd.org/changeset/base/237206
Log:
Improve the functionality of the PORTS_MODULES knob by adding
LOCALBASE/bin and sbin to PATH, which allows dependencies to be found;
adding SRC_BASE and OSVERSION to match the new kernel, and putting the
related builds under MAKEOBJDIRPREFIX so that they only need to be built
once per kernel.
In addition to the PR this includes ideas/contributions from crees
and matthew.
PR: ports/161452
Submitted by: Garrett Cooper yaneg...@gmail.com
Modified:
stable/8/sys/conf/kern.post.mk
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/conf/kern.post.mk
==
--- stable/8/sys/conf/kern.post.mk Sun Jun 17 21:06:36 2012
(r237205)
+++ stable/8/sys/conf/kern.post.mk Sun Jun 17 21:07:00 2012
(r237206)
@@ -28,9 +28,30 @@ modules-${target}:
.endif
.endfor
-# Handle out of tree ports
+# Handle ports (as defined by the user) that build kernel modules
.if !defined(NO_MODULES) defined(PORTS_MODULES)
-PORTSMODULESENV=SYSDIR=${SYSDIR}
+#
+# The ports tree needs some environment variables defined to match the new
kernel
+#
+# Ports search for some dependencies in PATH, so add the location of the
installed files
+LOCALBASE?=/usr/local
+# SRC_BASE is how the ports tree refers to the location of the base source
files
+.if !defined(SRC_BASE)
+SRC_BASE!= realpath ${SYSDIR:H}/
+.endif
+# OSVERSION is used by some ports to determine build options
+.if !defined(OSRELDATE)
+# Definition copied from src/Makefile.inc1
+OSRELDATE!=awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
+ ${MAKEOBJDIRPREFIX}${SRC_BASE}/include/osreldate.h
+.endif
+# Keep the related ports builds in the obj directory so that they are only
rebuilt once per kernel build
+WRKDIRPREFIX?= ${MAKEOBJDIRPREFIX}${SRC_BASE}/sys/${KERNCONF}
+PORTSMODULESENV=\
+ PATH=${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin \
+ SRC_BASE=${SRC_BASE} \
+ OSVERSION=${OSRELDATE} \
+ WRKDIRPREFIX=${WRKDIRPREFIX}
.for __target in all install reinstall clean
${__target}: ports-${__target}
ports-${__target}:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r237207 - stable/7/sys/conf
Author: dougb
Date: Sun Jun 17 21:07:27 2012
New Revision: 237207
URL: http://svn.freebsd.org/changeset/base/237207
Log:
Improve the functionality of the PORTS_MODULES knob by adding
LOCALBASE/bin and sbin to PATH, which allows dependencies to be found;
adding SRC_BASE and OSVERSION to match the new kernel, and putting the
related builds under MAKEOBJDIRPREFIX so that they only need to be built
once per kernel.
In addition to the PR this includes ideas/contributions from crees
and matthew.
PR: ports/161452
Submitted by: Garrett Cooper yaneg...@gmail.com
Modified:
stable/7/sys/conf/kern.post.mk
Directory Properties:
stable/7/sys/ (props changed)
Modified: stable/7/sys/conf/kern.post.mk
==
--- stable/7/sys/conf/kern.post.mk Sun Jun 17 21:07:00 2012
(r237206)
+++ stable/7/sys/conf/kern.post.mk Sun Jun 17 21:07:27 2012
(r237207)
@@ -28,9 +28,30 @@ modules-${target}:
.endif
.endfor
-# Handle out of tree ports
+# Handle ports (as defined by the user) that build kernel modules
.if !defined(NO_MODULES) defined(PORTS_MODULES)
-PORTSMODULESENV=SYSDIR=${SYSDIR}
+#
+# The ports tree needs some environment variables defined to match the new
kernel
+#
+# Ports search for some dependencies in PATH, so add the location of the
installed files
+LOCALBASE?=/usr/local
+# SRC_BASE is how the ports tree refers to the location of the base source
files
+.if !defined(SRC_BASE)
+SRC_BASE!= realpath ${SYSDIR:H}/
+.endif
+# OSVERSION is used by some ports to determine build options
+.if !defined(OSRELDATE)
+# Definition copied from src/Makefile.inc1
+OSRELDATE!=awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
+ ${MAKEOBJDIRPREFIX}${SRC_BASE}/include/osreldate.h
+.endif
+# Keep the related ports builds in the obj directory so that they are only
rebuilt once per kernel build
+WRKDIRPREFIX?= ${MAKEOBJDIRPREFIX}${SRC_BASE}/sys/${KERNCONF}
+PORTSMODULESENV=\
+ PATH=${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin \
+ SRC_BASE=${SRC_BASE} \
+ OSVERSION=${OSRELDATE} \
+ WRKDIRPREFIX=${WRKDIRPREFIX}
.for __target in all install reinstall clean
${__target}: ports-${__target}
ports-${__target}:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r237205 - stable/9/sys/conf
On 06/17/2012 14:06, Doug Barton wrote: stable/9/sys/conf/ (props changed) There is what looks like a really large amount of crufty mergeinfo on stable/9/sys/conf. The diff was large and hairy enough that I didn't feel comfortable tackling it in the time I have allotted today. Given that 9 is still a fairly new branch, it would probably be good if someone with the knowledge and time were to see about cleaning it up. ... which leads to the gentle reminder, always do merges for files under sys/ IN sys/. Doug -- This .signature sanitized for your protection ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r237090 - head/sys/conf
Author: dougb
Date: Thu Jun 14 19:30:31 2012
New Revision: 237090
URL: http://svn.freebsd.org/changeset/base/237090
Log:
Improve the functionality of the PORTS_MODULES knob by adding
LOCALBASE/bin and sbin to PATH, allowing dependencies to be found;
adding SRC_BASE and OSVERSION to match the new kernel, and putting
the related builds under MAKEOBJDIRPREFIX so that they only need
to be built once per kernel.
In addition to the PR this includes ideas/contributions from crees
and matthew.
PR: ports/161452
Submitted by: Garrett Cooper yaneg...@gmail.com
Modified:
head/sys/conf/kern.post.mk
Modified: head/sys/conf/kern.post.mk
==
--- head/sys/conf/kern.post.mk Thu Jun 14 18:37:00 2012(r237089)
+++ head/sys/conf/kern.post.mk Thu Jun 14 19:30:31 2012(r237090)
@@ -36,9 +36,30 @@ modules-${target}:
.endif
.endfor
-# Handle out of tree ports
+# Handle ports (as defined by the user) that build kernel modules
.if !defined(NO_MODULES) defined(PORTS_MODULES)
-PORTSMODULESENV=SYSDIR=${SYSDIR}
+#
+# The ports tree needs some environment variables defined to match the new
kernel
+#
+# Ports search for some dependencies in PATH, so add the location of the
installed files
+LOCALBASE?=/usr/local
+# SRC_BASE is how the ports tree refers to the location of the base source
files
+.if !defined(SRC_BASE)
+SRC_BASE!= realpath ${SYSDIR:H}/
+.endif
+# OSVERSION is used by some ports to determine build options
+.if !defined(OSRELDATE)
+# Definition copied from src/Makefile.inc1
+OSRELDATE!=awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
+ ${MAKEOBJDIRPREFIX}${SRC_BASE}/include/osreldate.h
+.endif
+# Keep the related ports builds in the obj directory so that they are only
rebuilt once per kernel build
+WRKDIRPREFIX?= ${MAKEOBJDIRPREFIX}${SRC_BASE}/sys/${KERNCONF}
+PORTSMODULESENV=\
+ PATH=${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin \
+ SRC_BASE=${SRC_BASE} \
+ OSVERSION=${OSRELDATE} \
+ WRKDIRPREFIX=${WRKDIRPREFIX}
.for __target in all install reinstall clean
${__target}: ports-${__target}
ports-${__target}:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r236822 - head/sys/kern
According to the tinderbox these commits seem to have broken the build. I built r236818 successfully earlier today ... Doug -- This .signature sanitized for your protection ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r236584 - in vendor/bind9/dist: . lib/dns
Author: dougb
Date: Mon Jun 4 22:06:29 2012
New Revision: 236584
URL: http://svn.freebsd.org/changeset/base/236584
Log:
Vendor import of BIND 9.8.3-P1
Modified:
vendor/bind9/dist/CHANGES
vendor/bind9/dist/lib/dns/rdata.c
vendor/bind9/dist/lib/dns/rdataslab.c
vendor/bind9/dist/version
Modified: vendor/bind9/dist/CHANGES
==
--- vendor/bind9/dist/CHANGES Mon Jun 4 22:01:12 2012(r236583)
+++ vendor/bind9/dist/CHANGES Mon Jun 4 22:06:29 2012(r236584)
@@ -1,3 +1,8 @@
+ --- 9.8.3-P1 released ---
+
+3331. [security] dns_rdataslab_fromrdataset could produce bad
+ rdataslabs. [RT #29644]
+
--- 9.8.3 released ---
3318. [tuning]Reduce the amount of work performed while holding a
Modified: vendor/bind9/dist/lib/dns/rdata.c
==
--- vendor/bind9/dist/lib/dns/rdata.c Mon Jun 4 22:01:12 2012
(r236583)
+++ vendor/bind9/dist/lib/dns/rdata.c Mon Jun 4 22:06:29 2012
(r236584)
@@ -329,8 +329,8 @@ dns_rdata_compare(const dns_rdata_t *rda
REQUIRE(rdata1 != NULL);
REQUIRE(rdata2 != NULL);
- REQUIRE(rdata1-data != NULL);
- REQUIRE(rdata2-data != NULL);
+ REQUIRE(rdata1-length == 0 || rdata1-data != NULL);
+ REQUIRE(rdata2-length == 0 || rdata2-data != NULL);
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata1));
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata2));
@@ -360,8 +360,8 @@ dns_rdata_casecompare(const dns_rdata_t
REQUIRE(rdata1 != NULL);
REQUIRE(rdata2 != NULL);
- REQUIRE(rdata1-data != NULL);
- REQUIRE(rdata2-data != NULL);
+ REQUIRE(rdata1-length == 0 || rdata1-data != NULL);
+ REQUIRE(rdata2-length == 0 || rdata2-data != NULL);
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata1));
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata2));
Modified: vendor/bind9/dist/lib/dns/rdataslab.c
==
--- vendor/bind9/dist/lib/dns/rdataslab.c Mon Jun 4 22:01:12 2012
(r236583)
+++ vendor/bind9/dist/lib/dns/rdataslab.c Mon Jun 4 22:06:29 2012
(r236584)
@@ -126,6 +126,11 @@ isc_result_t
dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
isc_region_t *region, unsigned int reservelen)
{
+ /*
+* Use removed as a sentinal pointer for duplicate
+* rdata as rdata.data == NULL is valid.
+*/
+ static unsigned char removed;
struct xrdata *x;
unsigned char *rawbuf;
#if DNS_RDATASET_FIXED
@@ -169,6 +174,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
INSIST(result == ISC_R_SUCCESS);
dns_rdata_init(x[i].rdata);
dns_rdataset_current(rdataset, x[i].rdata);
+ INSIST(x[i].rdata.data != removed);
#if DNS_RDATASET_FIXED
x[i].order = i;
#endif
@@ -201,8 +207,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
*/
for (i = 1; i nalloc; i++) {
if (compare_rdata(x[i-1].rdata, x[i].rdata) == 0) {
- x[i-1].rdata.data = NULL;
- x[i-1].rdata.length = 0;
+ x[i-1].rdata.data = removed;
#if DNS_RDATASET_FIXED
/*
* Preserve the least order so A, B, A - A, B
@@ -292,7 +297,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
#endif
for (i = 0; i nalloc; i++) {
- if (x[i].rdata.data == NULL)
+ if (x[i].rdata.data == removed)
continue;
#if DNS_RDATASET_FIXED
offsettable[x[i].order] = rawbuf - offsetbase;
Modified: vendor/bind9/dist/version
==
--- vendor/bind9/dist/version Mon Jun 4 22:01:12 2012(r236583)
+++ vendor/bind9/dist/version Mon Jun 4 22:06:29 2012(r236584)
@@ -6,5 +6,5 @@
MAJORVER=9
MINORVER=8
PATCHVER=3
-RELEASETYPE=
-RELEASEVER=
+RELEASETYPE=-P
+RELEASEVER=1
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r236585 - vendor/bind9/9.8.3-P1
Author: dougb Date: Mon Jun 4 22:07:05 2012 New Revision: 236585 URL: http://svn.freebsd.org/changeset/base/236585 Log: Tag the 9.8.3-P1 release Added: vendor/bind9/9.8.3-P1/ - copied from r236584, vendor/bind9/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r236586 - in head/contrib/bind9: . lib/dns
Author: dougb
Date: Mon Jun 4 22:11:20 2012
New Revision: 236586
URL: http://svn.freebsd.org/changeset/base/236586
Log:
Upgrade to 9.8.3-P1, the latest from ISC. This version contains
a critical bugfix:
Processing of DNS resource records where the rdata field is zero length
may cause various issues for the servers handling them.
Processing of these records may lead to unexpected outcomes. Recursive
servers may crash or disclose some portion of memory to the client.
Secondary servers may crash on restart after transferring a zone
containing these records. Master servers may corrupt zone data if the
zone option auto-dnssec is set to maintain. Other unexpected
problems that are not listed here may also be encountered.
All BIND users are strongly encouraged to upgrade.
Modified:
head/contrib/bind9/CHANGES
head/contrib/bind9/lib/dns/rdata.c
head/contrib/bind9/lib/dns/rdataslab.c
head/contrib/bind9/version
Directory Properties:
head/contrib/bind9/ (props changed)
Modified: head/contrib/bind9/CHANGES
==
--- head/contrib/bind9/CHANGES Mon Jun 4 22:07:05 2012(r236585)
+++ head/contrib/bind9/CHANGES Mon Jun 4 22:11:20 2012(r236586)
@@ -1,3 +1,8 @@
+ --- 9.8.3-P1 released ---
+
+3331. [security] dns_rdataslab_fromrdataset could produce bad
+ rdataslabs. [RT #29644]
+
--- 9.8.3 released ---
3318. [tuning]Reduce the amount of work performed while holding a
Modified: head/contrib/bind9/lib/dns/rdata.c
==
--- head/contrib/bind9/lib/dns/rdata.c Mon Jun 4 22:07:05 2012
(r236585)
+++ head/contrib/bind9/lib/dns/rdata.c Mon Jun 4 22:11:20 2012
(r236586)
@@ -329,8 +329,8 @@ dns_rdata_compare(const dns_rdata_t *rda
REQUIRE(rdata1 != NULL);
REQUIRE(rdata2 != NULL);
- REQUIRE(rdata1-data != NULL);
- REQUIRE(rdata2-data != NULL);
+ REQUIRE(rdata1-length == 0 || rdata1-data != NULL);
+ REQUIRE(rdata2-length == 0 || rdata2-data != NULL);
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata1));
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata2));
@@ -360,8 +360,8 @@ dns_rdata_casecompare(const dns_rdata_t
REQUIRE(rdata1 != NULL);
REQUIRE(rdata2 != NULL);
- REQUIRE(rdata1-data != NULL);
- REQUIRE(rdata2-data != NULL);
+ REQUIRE(rdata1-length == 0 || rdata1-data != NULL);
+ REQUIRE(rdata2-length == 0 || rdata2-data != NULL);
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata1));
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata2));
Modified: head/contrib/bind9/lib/dns/rdataslab.c
==
--- head/contrib/bind9/lib/dns/rdataslab.c Mon Jun 4 22:07:05 2012
(r236585)
+++ head/contrib/bind9/lib/dns/rdataslab.c Mon Jun 4 22:11:20 2012
(r236586)
@@ -126,6 +126,11 @@ isc_result_t
dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
isc_region_t *region, unsigned int reservelen)
{
+ /*
+* Use removed as a sentinal pointer for duplicate
+* rdata as rdata.data == NULL is valid.
+*/
+ static unsigned char removed;
struct xrdata *x;
unsigned char *rawbuf;
#if DNS_RDATASET_FIXED
@@ -169,6 +174,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
INSIST(result == ISC_R_SUCCESS);
dns_rdata_init(x[i].rdata);
dns_rdataset_current(rdataset, x[i].rdata);
+ INSIST(x[i].rdata.data != removed);
#if DNS_RDATASET_FIXED
x[i].order = i;
#endif
@@ -201,8 +207,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
*/
for (i = 1; i nalloc; i++) {
if (compare_rdata(x[i-1].rdata, x[i].rdata) == 0) {
- x[i-1].rdata.data = NULL;
- x[i-1].rdata.length = 0;
+ x[i-1].rdata.data = removed;
#if DNS_RDATASET_FIXED
/*
* Preserve the least order so A, B, A - A, B
@@ -292,7 +297,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
#endif
for (i = 0; i nalloc; i++) {
- if (x[i].rdata.data == NULL)
+ if (x[i].rdata.data == removed)
continue;
#if DNS_RDATASET_FIXED
offsettable[x[i].order] = rawbuf - offsetbase;
Modified: head/contrib/bind9/version
==
--- head/contrib/bind9/version Mon Jun 4 22:07:05 2012(r236585)
+++ head/contrib/bind9/version Mon Jun 4 22:11:20 2012(r236586)
@@ -6,5 +6,5 @@
MAJORVER=9
MINORVER=8
PATCHVER=3
-RELEASETYPE=
-RELEASEVER=
+RELEASETYPE=-P
+RELEASEVER=1
svn commit: r236587 - in stable/9/contrib/bind9: . lib/dns
Author: dougb
Date: Mon Jun 4 22:14:33 2012
New Revision: 236587
URL: http://svn.freebsd.org/changeset/base/236587
Log:
Upgrade to 9.8.3-P1, the latest from ISC. This version contains
a critical bugfix:
Processing of DNS resource records where the rdata field is zero length
may cause various issues for the servers handling them.
Processing of these records may lead to unexpected outcomes. Recursive
servers may crash or disclose some portion of memory to the client.
Secondary servers may crash on restart after transferring a zone
containing these records. Master servers may corrupt zone data if the
zone option auto-dnssec is set to maintain. Other unexpected
problems that are not listed here may also be encountered.
All BIND users are strongly encouraged to upgrade.
Modified:
stable/9/contrib/bind9/CHANGES
stable/9/contrib/bind9/lib/dns/rdata.c
stable/9/contrib/bind9/lib/dns/rdataslab.c
stable/9/contrib/bind9/version
Directory Properties:
stable/9/contrib/bind9/ (props changed)
Modified: stable/9/contrib/bind9/CHANGES
==
--- stable/9/contrib/bind9/CHANGES Mon Jun 4 22:11:20 2012
(r236586)
+++ stable/9/contrib/bind9/CHANGES Mon Jun 4 22:14:33 2012
(r236587)
@@ -1,3 +1,8 @@
+ --- 9.8.3-P1 released ---
+
+3331. [security] dns_rdataslab_fromrdataset could produce bad
+ rdataslabs. [RT #29644]
+
--- 9.8.3 released ---
3318. [tuning]Reduce the amount of work performed while holding a
Modified: stable/9/contrib/bind9/lib/dns/rdata.c
==
--- stable/9/contrib/bind9/lib/dns/rdata.c Mon Jun 4 22:11:20 2012
(r236586)
+++ stable/9/contrib/bind9/lib/dns/rdata.c Mon Jun 4 22:14:33 2012
(r236587)
@@ -329,8 +329,8 @@ dns_rdata_compare(const dns_rdata_t *rda
REQUIRE(rdata1 != NULL);
REQUIRE(rdata2 != NULL);
- REQUIRE(rdata1-data != NULL);
- REQUIRE(rdata2-data != NULL);
+ REQUIRE(rdata1-length == 0 || rdata1-data != NULL);
+ REQUIRE(rdata2-length == 0 || rdata2-data != NULL);
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata1));
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata2));
@@ -360,8 +360,8 @@ dns_rdata_casecompare(const dns_rdata_t
REQUIRE(rdata1 != NULL);
REQUIRE(rdata2 != NULL);
- REQUIRE(rdata1-data != NULL);
- REQUIRE(rdata2-data != NULL);
+ REQUIRE(rdata1-length == 0 || rdata1-data != NULL);
+ REQUIRE(rdata2-length == 0 || rdata2-data != NULL);
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata1));
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata2));
Modified: stable/9/contrib/bind9/lib/dns/rdataslab.c
==
--- stable/9/contrib/bind9/lib/dns/rdataslab.c Mon Jun 4 22:11:20 2012
(r236586)
+++ stable/9/contrib/bind9/lib/dns/rdataslab.c Mon Jun 4 22:14:33 2012
(r236587)
@@ -126,6 +126,11 @@ isc_result_t
dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
isc_region_t *region, unsigned int reservelen)
{
+ /*
+* Use removed as a sentinal pointer for duplicate
+* rdata as rdata.data == NULL is valid.
+*/
+ static unsigned char removed;
struct xrdata *x;
unsigned char *rawbuf;
#if DNS_RDATASET_FIXED
@@ -169,6 +174,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
INSIST(result == ISC_R_SUCCESS);
dns_rdata_init(x[i].rdata);
dns_rdataset_current(rdataset, x[i].rdata);
+ INSIST(x[i].rdata.data != removed);
#if DNS_RDATASET_FIXED
x[i].order = i;
#endif
@@ -201,8 +207,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
*/
for (i = 1; i nalloc; i++) {
if (compare_rdata(x[i-1].rdata, x[i].rdata) == 0) {
- x[i-1].rdata.data = NULL;
- x[i-1].rdata.length = 0;
+ x[i-1].rdata.data = removed;
#if DNS_RDATASET_FIXED
/*
* Preserve the least order so A, B, A - A, B
@@ -292,7 +297,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
#endif
for (i = 0; i nalloc; i++) {
- if (x[i].rdata.data == NULL)
+ if (x[i].rdata.data == removed)
continue;
#if DNS_RDATASET_FIXED
offsettable[x[i].order] = rawbuf - offsetbase;
Modified: stable/9/contrib/bind9/version
==
--- stable/9/contrib/bind9/version Mon Jun 4 22:11:20 2012
(r236586)
+++ stable/9/contrib/bind9/version Mon Jun 4 22:14:33 2012
(r236587)
@@ -6,5 +6,5 @@
MAJORVER=9
MINORVER=8
svn commit: r236588 - in vendor/bind9/dist-9.6: . lib/dns
Author: dougb
Date: Mon Jun 4 22:19:09 2012
New Revision: 236588
URL: http://svn.freebsd.org/changeset/base/236588
Log:
Vendor import of BIND 9.6-ESV-R7-P1
Modified:
vendor/bind9/dist-9.6/CHANGES
vendor/bind9/dist-9.6/lib/dns/rdata.c
vendor/bind9/dist-9.6/lib/dns/rdataslab.c
vendor/bind9/dist-9.6/version
Modified: vendor/bind9/dist-9.6/CHANGES
==
--- vendor/bind9/dist-9.6/CHANGES Mon Jun 4 22:14:33 2012
(r236587)
+++ vendor/bind9/dist-9.6/CHANGES Mon Jun 4 22:19:09 2012
(r236588)
@@ -1,3 +1,8 @@
+ --- 9.6-ESV-R7-P1 released ---
+
+3331. [security] dns_rdataslab_fromrdataset could produce bad
+ rdataslabs. [RT #29644]
+
--- 9.6-ESV-R7 released ---
3318. [tuning]Reduce the amount of work performed while holding a
Modified: vendor/bind9/dist-9.6/lib/dns/rdata.c
==
--- vendor/bind9/dist-9.6/lib/dns/rdata.c Mon Jun 4 22:14:33 2012
(r236587)
+++ vendor/bind9/dist-9.6/lib/dns/rdata.c Mon Jun 4 22:19:09 2012
(r236588)
@@ -345,8 +345,8 @@ dns_rdata_compare(const dns_rdata_t *rda
REQUIRE(rdata1 != NULL);
REQUIRE(rdata2 != NULL);
- REQUIRE(rdata1-data != NULL);
- REQUIRE(rdata2-data != NULL);
+ REQUIRE(rdata1-length == 0 || rdata1-data != NULL);
+ REQUIRE(rdata2-length == 0 || rdata2-data != NULL);
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata1));
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata2));
Modified: vendor/bind9/dist-9.6/lib/dns/rdataslab.c
==
--- vendor/bind9/dist-9.6/lib/dns/rdataslab.c Mon Jun 4 22:14:33 2012
(r236587)
+++ vendor/bind9/dist-9.6/lib/dns/rdataslab.c Mon Jun 4 22:19:09 2012
(r236588)
@@ -126,6 +126,11 @@ isc_result_t
dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
isc_region_t *region, unsigned int reservelen)
{
+ /*
+* Use removed as a sentinal pointer for duplicate
+* rdata as rdata.data == NULL is valid.
+*/
+ static unsigned char removed;
struct xrdata *x;
unsigned char *rawbuf;
#if DNS_RDATASET_FIXED
@@ -165,6 +170,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
INSIST(result == ISC_R_SUCCESS);
dns_rdata_init(x[i].rdata);
dns_rdataset_current(rdataset, x[i].rdata);
+ INSIST(x[i].rdata.data != removed);
#if DNS_RDATASET_FIXED
x[i].order = i;
#endif
@@ -197,8 +203,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
*/
for (i = 1; i nalloc; i++) {
if (compare_rdata(x[i-1].rdata, x[i].rdata) == 0) {
- x[i-1].rdata.data = NULL;
- x[i-1].rdata.length = 0;
+ x[i-1].rdata.data = removed;
#if DNS_RDATASET_FIXED
/*
* Preserve the least order so A, B, A - A, B
@@ -285,7 +290,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
#endif
for (i = 0; i nalloc; i++) {
- if (x[i].rdata.data == NULL)
+ if (x[i].rdata.data == removed)
continue;
#if DNS_RDATASET_FIXED
offsettable[x[i].order] = rawbuf - offsetbase;
Modified: vendor/bind9/dist-9.6/version
==
--- vendor/bind9/dist-9.6/version Mon Jun 4 22:14:33 2012
(r236587)
+++ vendor/bind9/dist-9.6/version Mon Jun 4 22:19:09 2012
(r236588)
@@ -7,4 +7,4 @@ MAJORVER=9
MINORVER=6
PATCHVER=
RELEASETYPE=-ESV
-RELEASEVER=-R7
+RELEASEVER=-R7-P1
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r236589 - vendor/bind9/9.6-ESV-R7-P1
Author: dougb Date: Mon Jun 4 22:19:32 2012 New Revision: 236589 URL: http://svn.freebsd.org/changeset/base/236589 Log: Tag the 9.6-ESV-R7-P1 release Added: vendor/bind9/9.6-ESV-R7-P1/ - copied from r236588, vendor/bind9/dist-9.6/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r236590 - in stable/8/contrib/bind9: . lib/dns
Author: dougb
Date: Mon Jun 4 22:21:55 2012
New Revision: 236590
URL: http://svn.freebsd.org/changeset/base/236590
Log:
Upgrade to 9.6-ESV-R7-P1, the latest from ISC. This version contains
a critical bugfix:
Processing of DNS resource records where the rdata field is zero length
may cause various issues for the servers handling them.
Processing of these records may lead to unexpected outcomes. Recursive
servers may crash or disclose some portion of memory to the client.
Secondary servers may crash on restart after transferring a zone
containing these records. Master servers may corrupt zone data if the
zone option auto-dnssec is set to maintain. Other unexpected
problems that are not listed here may also be encountered.
All BIND users are strongly encouraged to upgrade.
Modified:
stable/8/contrib/bind9/CHANGES
stable/8/contrib/bind9/lib/dns/rdata.c
stable/8/contrib/bind9/lib/dns/rdataslab.c
stable/8/contrib/bind9/version
Directory Properties:
stable/8/contrib/bind9/ (props changed)
Modified: stable/8/contrib/bind9/CHANGES
==
--- stable/8/contrib/bind9/CHANGES Mon Jun 4 22:19:32 2012
(r236589)
+++ stable/8/contrib/bind9/CHANGES Mon Jun 4 22:21:55 2012
(r236590)
@@ -1,3 +1,8 @@
+ --- 9.6-ESV-R7-P1 released ---
+
+3331. [security] dns_rdataslab_fromrdataset could produce bad
+ rdataslabs. [RT #29644]
+
--- 9.6-ESV-R7 released ---
3318. [tuning]Reduce the amount of work performed while holding a
Modified: stable/8/contrib/bind9/lib/dns/rdata.c
==
--- stable/8/contrib/bind9/lib/dns/rdata.c Mon Jun 4 22:19:32 2012
(r236589)
+++ stable/8/contrib/bind9/lib/dns/rdata.c Mon Jun 4 22:21:55 2012
(r236590)
@@ -345,8 +345,8 @@ dns_rdata_compare(const dns_rdata_t *rda
REQUIRE(rdata1 != NULL);
REQUIRE(rdata2 != NULL);
- REQUIRE(rdata1-data != NULL);
- REQUIRE(rdata2-data != NULL);
+ REQUIRE(rdata1-length == 0 || rdata1-data != NULL);
+ REQUIRE(rdata2-length == 0 || rdata2-data != NULL);
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata1));
REQUIRE(DNS_RDATA_VALIDFLAGS(rdata2));
Modified: stable/8/contrib/bind9/lib/dns/rdataslab.c
==
--- stable/8/contrib/bind9/lib/dns/rdataslab.c Mon Jun 4 22:19:32 2012
(r236589)
+++ stable/8/contrib/bind9/lib/dns/rdataslab.c Mon Jun 4 22:21:55 2012
(r236590)
@@ -126,6 +126,11 @@ isc_result_t
dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
isc_region_t *region, unsigned int reservelen)
{
+ /*
+* Use removed as a sentinal pointer for duplicate
+* rdata as rdata.data == NULL is valid.
+*/
+ static unsigned char removed;
struct xrdata *x;
unsigned char *rawbuf;
#if DNS_RDATASET_FIXED
@@ -165,6 +170,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
INSIST(result == ISC_R_SUCCESS);
dns_rdata_init(x[i].rdata);
dns_rdataset_current(rdataset, x[i].rdata);
+ INSIST(x[i].rdata.data != removed);
#if DNS_RDATASET_FIXED
x[i].order = i;
#endif
@@ -197,8 +203,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
*/
for (i = 1; i nalloc; i++) {
if (compare_rdata(x[i-1].rdata, x[i].rdata) == 0) {
- x[i-1].rdata.data = NULL;
- x[i-1].rdata.length = 0;
+ x[i-1].rdata.data = removed;
#if DNS_RDATASET_FIXED
/*
* Preserve the least order so A, B, A - A, B
@@ -285,7 +290,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_
#endif
for (i = 0; i nalloc; i++) {
- if (x[i].rdata.data == NULL)
+ if (x[i].rdata.data == removed)
continue;
#if DNS_RDATASET_FIXED
offsettable[x[i].order] = rawbuf - offsetbase;
Modified: stable/8/contrib/bind9/version
==
--- stable/8/contrib/bind9/version Mon Jun 4 22:19:32 2012
(r236589)
+++ stable/8/contrib/bind9/version Mon Jun 4 22:21:55 2012
(r236590)
@@ -7,4 +7,4 @@ MAJORVER=9
MINORVER=6
PATCHVER=
RELEASETYPE=-ESV
-RELEASEVER=-R7
+RELEASEVER=-R7-P1
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r236362 - head/share/misc
On 5/31/2012 12:33 PM, Tom Judge wrote: - Sort the node list while I'm here. This falls under the category of a whitespace change, which should have been done as a separate commit (usually first, then substantive changes second). This is a tiny bit more work for you, but down the road when someone who is !tj is reviewing the logs, diffs, etc. it really helps to make the substantive changes stand out. Doug -- This .signature sanitized for your protection ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r236362 - head/share/misc
On 5/31/2012 6:59 PM, Eitan Adler wrote: On 31 May 2012 18:29, Doug Barton do...@freebsd.org wrote: On 5/31/2012 12:33 PM, Tom Judge wrote: - Sort the node list while I'm here. This falls under the category of a whitespace change, which should have been done as a separate commit (usually first, then substantive changes second). I figured none of the changes were really substantive so it was okay to sort and fix the \n at the same time. These were the changes: Log: - Fix my botched merge and correct mentor ordering. (Spotted by flo) - Fix missing new line in node block. (Spotted by gavin) - Sort the node list while I'm here. The last is definitely WS, the second probably is, the first definitely isn't. hth, Doug -- This .signature sanitized for your protection ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r236374 - in stable/9: contrib/bind9 contrib/bind9/bin/named contrib/bind9/bin/named/unix contrib/bind9/lib/bind9 contrib/bind9/lib/dns contrib/bind9/lib/dns/include/dns contrib/bind9/l...
Author: dougb Date: Fri Jun 1 03:46:28 2012 New Revision: 236374 URL: http://svn.freebsd.org/changeset/base/236374 Log: MFV r236171, MFC r236196: Upgrade to BIND version 9.8.3, the latest from ISC. Feature Change * BIND now recognizes the TLSA resource record type, created to support IETF DANE (DNS-based Authentication of Named Entities) Bug Fix * The locking strategy around the handling of iterative queries has been tuned to reduce unnecessary contention in a multi- threaded environment. Other critical bug fixes are included. All BIND users are encouraged to upgrade. Added: stable/9/contrib/bind9/lib/dns/rdata/generic/tlsa_52.c - copied unchanged from r236373, vendor/bind9/dist/lib/dns/rdata/generic/tlsa_52.c stable/9/contrib/bind9/lib/dns/rdata/generic/tlsa_52.h - copied unchanged from r236373, vendor/bind9/dist/lib/dns/rdata/generic/tlsa_52.h Modified: stable/9/contrib/bind9/CHANGES stable/9/contrib/bind9/README stable/9/contrib/bind9/bin/named/builtin.c stable/9/contrib/bind9/bin/named/query.c stable/9/contrib/bind9/bin/named/server.c stable/9/contrib/bind9/bin/named/unix/dlz_dlopen_driver.c stable/9/contrib/bind9/lib/bind9/api stable/9/contrib/bind9/lib/bind9/check.c stable/9/contrib/bind9/lib/dns/api stable/9/contrib/bind9/lib/dns/dnssec.c stable/9/contrib/bind9/lib/dns/include/dns/ecdb.h stable/9/contrib/bind9/lib/dns/include/dns/rpz.h stable/9/contrib/bind9/lib/dns/include/dns/sdb.h stable/9/contrib/bind9/lib/dns/include/dns/stats.h stable/9/contrib/bind9/lib/dns/include/dns/tsec.h stable/9/contrib/bind9/lib/dns/include/dns/view.h stable/9/contrib/bind9/lib/dns/rbtdb.c stable/9/contrib/bind9/lib/dns/resolver.c stable/9/contrib/bind9/lib/dns/sdb.c stable/9/contrib/bind9/lib/dns/tkey.c stable/9/contrib/bind9/lib/dns/zone.c stable/9/contrib/bind9/lib/isc/pthreads/mutex.c stable/9/contrib/bind9/lib/isccfg/api stable/9/contrib/bind9/lib/isccfg/parser.c stable/9/contrib/bind9/version stable/9/lib/bind/dns/code.h stable/9/lib/bind/dns/dns/enumtype.h stable/9/lib/bind/dns/dns/rdatastruct.h Directory Properties: stable/9/contrib/bind9/ (props changed) stable/9/lib/bind/ (props changed) Modified: stable/9/contrib/bind9/CHANGES == --- stable/9/contrib/bind9/CHANGES Fri Jun 1 03:00:36 2012 (r236373) +++ stable/9/contrib/bind9/CHANGES Fri Jun 1 03:46:28 2012 (r236374) @@ -1,3 +1,56 @@ + --- 9.8.3 released --- + +3318. [tuning]Reduce the amount of work performed while holding a + bucket lock when finshed with a fetch context. + [RT #29239] + +3314. [bug] The masters list could be updated while refesh_callback + and stub_callback were using it. [RT #26732] + +3313. [protocol] Add TLSA record type. [RT #28989] + +3312. [bug] named-checkconf didn't detect a bad dns64 clients acl. + [RT #27631] + +3311. [bug] Abort the zone dump if zone-db is NULL in + zone.c:zone_gotwritehandle. [RT #29028] + +3310. [test] Increase table size for mutex profiling. [RT #28809] + +3309. [bug] resolver.c:fctx_finddone() was not threadsafe. + [RT #27995] + +3307. [bug] Add missing ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS. + [RT #28956] + +3306. [bug] Improve DNS64 reverse zone performance. [RT #28563] + +3305. [func] Add wire format lookup method to sdb. [RT #28563] + +3304. [bug] Use hmctx, not mctx when freeing rbtdb-heaps. + [RT #28571] + +3302. [bug] dns_dnssec_findmatchingkeys could fail to find + keys if the zone name contained character that + required special mappings. [RT #28600] + +3301. [contrib] Update queryperf to build on darwin. Add -R flag + for non-recursive queries. [RT #28565] + +3300. [bug] Named could die if gssapi was enabled in named.conf + but was not compiled in. [RT #28338] + +3299. [bug] Make SDB handle errors from database drivers better. + [RT #28534] + +3232. [bug] Zero zone-curmaster before return in + dns_zone_setmasterswithkeys(). [RT #26732] + +3183. [bug] Added RTLD_GLOBAL flag to dlopen call. [RT #26301] + +3197. [bug] Don't try to log the filename and line number when + the config parser can't open a file. [RT #22263] + --- 9.8.2 released --- 3298. [bug] Named could dereference a NULL pointer in @@ -58,9 +111,9 @@ 3274. [bug] Log when a zone is not reusable. Only set loadtime on successful
Re: svn commit: r236255 - head/contrib/groff/tmac
On 05/30/2012 20:07, David O'Brien wrote: On Wed, May 30, 2012 at 07:34:33AM +0400, Sergey Kandaurov wrote: On 29 May 2012 23:49, David E. O'Brien obr...@freebsd.org wrote: ... Modified: head/contrib/groff/tmac/doc-common ... +.ds doc-operating-system-FreeBSD-8.3 � � 8.3 +.ds doc-operating-system-FreeBSD-9.1 � � 9.1 +.ds doc-operating-system-FreeBSD-10.0 � �10.0 This should be imported from savannah.gnu.org repository, and not changed directly. Unfortunately we cannot do that per r217595: This is a direct commit to contrib/ as we will no longer import any newer groff snapshots, due to licensing issues. For local changes not found in the (latest) contrib doc-common you should use gnu/usr.bin/groff/tmac/mdoc.local I followed r217595, was that commit the wrong approach? TMK all our local changes have always been made to mdoc.local. The history on both files seems to support this as well. Doug -- This .signature sanitized for your protection ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r236171 - in vendor/bind9/dist: . bin/named bin/named/unix lib/bind9 lib/dns lib/dns/include/dns lib/dns/rdata/generic lib/isc/pthreads lib/isccfg
Author: dougb Date: Mon May 28 09:49:28 2012 New Revision: 236171 URL: http://svn.freebsd.org/changeset/base/236171 Log: Vendor import of BIND 9.8.3 Added: vendor/bind9/dist/lib/dns/rdata/generic/tlsa_52.c (contents, props changed) vendor/bind9/dist/lib/dns/rdata/generic/tlsa_52.h (contents, props changed) Modified: vendor/bind9/dist/CHANGES vendor/bind9/dist/README vendor/bind9/dist/bin/named/builtin.c vendor/bind9/dist/bin/named/query.c vendor/bind9/dist/bin/named/server.c vendor/bind9/dist/bin/named/unix/dlz_dlopen_driver.c vendor/bind9/dist/lib/bind9/api vendor/bind9/dist/lib/bind9/check.c vendor/bind9/dist/lib/dns/api vendor/bind9/dist/lib/dns/dnssec.c vendor/bind9/dist/lib/dns/include/dns/ecdb.h vendor/bind9/dist/lib/dns/include/dns/rpz.h vendor/bind9/dist/lib/dns/include/dns/sdb.h vendor/bind9/dist/lib/dns/include/dns/stats.h vendor/bind9/dist/lib/dns/include/dns/tsec.h vendor/bind9/dist/lib/dns/include/dns/view.h vendor/bind9/dist/lib/dns/rbtdb.c vendor/bind9/dist/lib/dns/resolver.c vendor/bind9/dist/lib/dns/sdb.c vendor/bind9/dist/lib/dns/tkey.c vendor/bind9/dist/lib/dns/zone.c vendor/bind9/dist/lib/isc/pthreads/mutex.c vendor/bind9/dist/lib/isccfg/api vendor/bind9/dist/lib/isccfg/parser.c vendor/bind9/dist/version Modified: vendor/bind9/dist/CHANGES == --- vendor/bind9/dist/CHANGES Mon May 28 09:30:13 2012(r236170) +++ vendor/bind9/dist/CHANGES Mon May 28 09:49:28 2012(r236171) @@ -1,3 +1,56 @@ + --- 9.8.3 released --- + +3318. [tuning]Reduce the amount of work performed while holding a + bucket lock when finshed with a fetch context. + [RT #29239] + +3314. [bug] The masters list could be updated while refesh_callback + and stub_callback were using it. [RT #26732] + +3313. [protocol] Add TLSA record type. [RT #28989] + +3312. [bug] named-checkconf didn't detect a bad dns64 clients acl. + [RT #27631] + +3311. [bug] Abort the zone dump if zone-db is NULL in + zone.c:zone_gotwritehandle. [RT #29028] + +3310. [test] Increase table size for mutex profiling. [RT #28809] + +3309. [bug] resolver.c:fctx_finddone() was not threadsafe. + [RT #27995] + +3307. [bug] Add missing ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS. + [RT #28956] + +3306. [bug] Improve DNS64 reverse zone performance. [RT #28563] + +3305. [func] Add wire format lookup method to sdb. [RT #28563] + +3304. [bug] Use hmctx, not mctx when freeing rbtdb-heaps. + [RT #28571] + +3302. [bug] dns_dnssec_findmatchingkeys could fail to find + keys if the zone name contained character that + required special mappings. [RT #28600] + +3301. [contrib] Update queryperf to build on darwin. Add -R flag + for non-recursive queries. [RT #28565] + +3300. [bug] Named could die if gssapi was enabled in named.conf + but was not compiled in. [RT #28338] + +3299. [bug] Make SDB handle errors from database drivers better. + [RT #28534] + +3232. [bug] Zero zone-curmaster before return in + dns_zone_setmasterswithkeys(). [RT #26732] + +3183. [bug] Added RTLD_GLOBAL flag to dlopen call. [RT #26301] + +3197. [bug] Don't try to log the filename and line number when + the config parser can't open a file. [RT #22263] + --- 9.8.2 released --- 3298. [bug] Named could dereference a NULL pointer in @@ -58,9 +111,9 @@ 3274. [bug] Log when a zone is not reusable. Only set loadtime on successful loads. [RT #27650] -3273. [bug] responses could be returned in the additional -section even when filter--on-v4 was in use. -[RT #27292] +3273. [bug] responses could be returned in the additional + section even when filter--on-v4 was in use. + [RT #27292] 3271. [port] darwin: mksymtbl is not always stable, loop several times before giving up. mksymtbl was using non Modified: vendor/bind9/dist/README == --- vendor/bind9/dist/READMEMon May 28 09:30:13 2012(r236170) +++ vendor/bind9/dist/READMEMon May 28 09:49:28 2012(r236171) @@ -51,6 +51,10 @@ BIND 9 For up-to-date release notes and errata, see http://www.isc.org/software/bind9/releasenotes +BIND 9.8.3 + + BIND 9.8.3 is
svn commit: r236174 - in vendor/bind9/dist-9.6: . bin/named lib/dns lib/dns/include/dns lib/dns/rdata/generic lib/isc/pthreads lib/isccfg
Author: dougb Date: Mon May 28 10:21:54 2012 New Revision: 236174 URL: http://svn.freebsd.org/changeset/base/236174 Log: Vendor import of BIND 9.6-ESV-R7 Added: vendor/bind9/dist-9.6/lib/dns/rdata/generic/tlsa_52.c (contents, props changed) vendor/bind9/dist-9.6/lib/dns/rdata/generic/tlsa_52.h (contents, props changed) Deleted: vendor/bind9/dist-9.6/release-notes.css Modified: vendor/bind9/dist-9.6/CHANGES vendor/bind9/dist-9.6/README vendor/bind9/dist-9.6/bin/named/query.c vendor/bind9/dist-9.6/lib/dns/api vendor/bind9/dist-9.6/lib/dns/include/dns/stats.h vendor/bind9/dist-9.6/lib/dns/include/dns/view.h vendor/bind9/dist-9.6/lib/dns/rbtdb.c vendor/bind9/dist-9.6/lib/dns/resolver.c vendor/bind9/dist-9.6/lib/dns/sdb.c vendor/bind9/dist-9.6/lib/dns/tkey.c vendor/bind9/dist-9.6/lib/dns/zone.c vendor/bind9/dist-9.6/lib/isc/pthreads/mutex.c vendor/bind9/dist-9.6/lib/isccfg/api vendor/bind9/dist-9.6/lib/isccfg/parser.c vendor/bind9/dist-9.6/version Modified: vendor/bind9/dist-9.6/CHANGES == --- vendor/bind9/dist-9.6/CHANGES Mon May 28 09:51:10 2012 (r236173) +++ vendor/bind9/dist-9.6/CHANGES Mon May 28 10:21:54 2012 (r236174) @@ -1,3 +1,43 @@ + --- 9.6-ESV-R7 released --- + +3318. [tuning]Reduce the amount of work performed while holding a + bucket lock when finshed with a fetch context. + [RT #29239] + +3314. [bug] The masters list could be updated while refesh_callback + and stub_callback were using it. [RT #26732] + +3313. [protocol] Add TLSA record type. [RT #28989] + +3311. [bug] Abort the zone dump if zone-db is NULL in + zone.c:zone_gotwritehandle. [RT #29028] + +3310. [test] Increase table size for mutex profiling. [RT #28809] + +3309. [bug] resolver.c:fctx_finddone() was not threadsafe. + [RT #27995] + +3307. [bug] Add missing ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS. + [RT #28956] + +3304. [bug] Use hmctx, not mctx when freeing rbtdb-heaps. + [RT #28571] + +3301. [contrib] Update queryperf to build on darwin. Add -R flag + for non-recursive queries. [RT #28565] + +3300. [bug] Named could die if gssapi was enabled in named.conf + but was not compiled in. [RT #28338] + +3299. [bug] Make SDB handle errors from database drivers better. + [RT #28534] + +3232. [bug] Zero zone-curmaster before return in + dns_zone_setmasterswithkeys(). [RT #26732] + +3197. [bug] Don't try to log the filename and line number when + the config parser can't open a file. [RT #22263] + --- 9.6-ESV-R6 released --- 3298. [bug] Named could dereference a NULL pointer in @@ -168,7 +208,7 @@ 3189. [test] Added a summary report after system tests. [RT #25517] -3187. [port] win32: support for Visual Studio 2008. [RT #26356] +3187. [port] win32: support for Visual Studio 2008. [RT #26356] 3179. [port] kfreebsd: build issues. [RT #26273] @@ -201,7 +241,7 @@ an assert. [RT #25452] 3151. [bug] Queries for type RRSIG or SIG could be handled -incorrectly. [RT #21050] + incorrectly. [RT #21050] 3149. [tuning]Improve scalability by allocating one zone task per 100 zones at startup time. (The @@ -213,7 +253,7 @@ 3148. [bug] Processing of normal queries could be stalled when forwarding a UPDATE message. [RT #24711] -3146. [test] Fixed gcc4.6.0 errors in ATF. [RT #25598] +3146. [test] Fixed gcc4.6.0 errors in ATF. [RT #25598] 3145. [test] Capture output of ATF unit tests in ./atf.out if there were any errors while running them. [RT #25527] @@ -273,10 +313,10 @@ dns_rdataset_totext() that could cause named to crash with an assertion failure. [RT #24777] -3121. [security] An authoritative name server sending a negative -response containing a very large RRset could -trigger an off-by-one error in the ncache code -and crash named. [RT #24650] +3121. [security] An authoritative name server sending a negative + response containing a very large RRset could + trigger an off-by-one error in the ncache code + and crash named. [RT #24650] 3120. [bug] Named could fail to validate zones listed in a DLV
svn commit: r236175 - vendor/bind9/9.6-ESV-R7
Author: dougb Date: Mon May 28 10:22:46 2012 New Revision: 236175 URL: http://svn.freebsd.org/changeset/base/236175 Log: Tag the 9.6-ESV-R7 release Added: vendor/bind9/9.6-ESV-R7/ - copied from r236174, vendor/bind9/dist-9.6/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r236196 - in head: contrib/bind9 contrib/bind9/bin/named contrib/bind9/bin/named/unix contrib/bind9/lib/bind9 contrib/bind9/lib/dns contrib/bind9/lib/dns/include/dns contrib/bind9/lib/d...
Author: dougb Date: Mon May 28 19:47:56 2012 New Revision: 236196 URL: http://svn.freebsd.org/changeset/base/236196 Log: Upgrade to BIND version 9.8.3, the latest from ISC. Feature Change * BIND now recognizes the TLSA resource record type, created to support IETF DANE (DNS-based Authentication of Named Entities) Bug Fix * The locking strategy around the handling of iterative queries has been tuned to reduce unnecessary contention in a multi- threaded environment. Other critical bug fixes are included. All BIND users are encouraged to upgrade. Added: head/contrib/bind9/lib/dns/rdata/generic/tlsa_52.c - copied unchanged from r236173, vendor/bind9/dist/lib/dns/rdata/generic/tlsa_52.c head/contrib/bind9/lib/dns/rdata/generic/tlsa_52.h - copied unchanged from r236173, vendor/bind9/dist/lib/dns/rdata/generic/tlsa_52.h Modified: head/contrib/bind9/CHANGES head/contrib/bind9/README head/contrib/bind9/bin/named/builtin.c head/contrib/bind9/bin/named/query.c head/contrib/bind9/bin/named/server.c head/contrib/bind9/bin/named/unix/dlz_dlopen_driver.c head/contrib/bind9/lib/bind9/api head/contrib/bind9/lib/bind9/check.c head/contrib/bind9/lib/dns/api head/contrib/bind9/lib/dns/dnssec.c head/contrib/bind9/lib/dns/include/dns/ecdb.h head/contrib/bind9/lib/dns/include/dns/rpz.h head/contrib/bind9/lib/dns/include/dns/sdb.h head/contrib/bind9/lib/dns/include/dns/stats.h head/contrib/bind9/lib/dns/include/dns/tsec.h head/contrib/bind9/lib/dns/include/dns/view.h head/contrib/bind9/lib/dns/rbtdb.c head/contrib/bind9/lib/dns/resolver.c head/contrib/bind9/lib/dns/sdb.c head/contrib/bind9/lib/dns/tkey.c head/contrib/bind9/lib/dns/zone.c head/contrib/bind9/lib/isc/pthreads/mutex.c head/contrib/bind9/lib/isccfg/api head/contrib/bind9/lib/isccfg/parser.c head/contrib/bind9/version head/lib/bind/dns/code.h head/lib/bind/dns/dns/enumtype.h head/lib/bind/dns/dns/rdatastruct.h Directory Properties: head/contrib/bind9/ (props changed) Modified: head/contrib/bind9/CHANGES == --- head/contrib/bind9/CHANGES Mon May 28 19:44:35 2012(r236195) +++ head/contrib/bind9/CHANGES Mon May 28 19:47:56 2012(r236196) @@ -1,3 +1,56 @@ + --- 9.8.3 released --- + +3318. [tuning]Reduce the amount of work performed while holding a + bucket lock when finshed with a fetch context. + [RT #29239] + +3314. [bug] The masters list could be updated while refesh_callback + and stub_callback were using it. [RT #26732] + +3313. [protocol] Add TLSA record type. [RT #28989] + +3312. [bug] named-checkconf didn't detect a bad dns64 clients acl. + [RT #27631] + +3311. [bug] Abort the zone dump if zone-db is NULL in + zone.c:zone_gotwritehandle. [RT #29028] + +3310. [test] Increase table size for mutex profiling. [RT #28809] + +3309. [bug] resolver.c:fctx_finddone() was not threadsafe. + [RT #27995] + +3307. [bug] Add missing ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS. + [RT #28956] + +3306. [bug] Improve DNS64 reverse zone performance. [RT #28563] + +3305. [func] Add wire format lookup method to sdb. [RT #28563] + +3304. [bug] Use hmctx, not mctx when freeing rbtdb-heaps. + [RT #28571] + +3302. [bug] dns_dnssec_findmatchingkeys could fail to find + keys if the zone name contained character that + required special mappings. [RT #28600] + +3301. [contrib] Update queryperf to build on darwin. Add -R flag + for non-recursive queries. [RT #28565] + +3300. [bug] Named could die if gssapi was enabled in named.conf + but was not compiled in. [RT #28338] + +3299. [bug] Make SDB handle errors from database drivers better. + [RT #28534] + +3232. [bug] Zero zone-curmaster before return in + dns_zone_setmasterswithkeys(). [RT #26732] + +3183. [bug] Added RTLD_GLOBAL flag to dlopen call. [RT #26301] + +3197. [bug] Don't try to log the filename and line number when + the config parser can't open a file. [RT #22263] + --- 9.8.2 released --- 3298. [bug] Named could dereference a NULL pointer in @@ -58,9 +111,9 @@ 3274. [bug] Log when a zone is not reusable. Only set loadtime on successful loads. [RT #27650] -3273. [bug] responses could be returned in the additional -section even when filter--on-v4 was in use. -[RT #27292] +3273.
svn commit: r236197 - in stable/8: contrib/bind9 contrib/bind9/bin/named contrib/bind9/lib/dns contrib/bind9/lib/dns/include/dns contrib/bind9/lib/dns/rdata/generic contrib/bind9/lib/isc/pthreads c...
Author: dougb Date: Mon May 28 19:48:37 2012 New Revision: 236197 URL: http://svn.freebsd.org/changeset/base/236197 Log: Upgrade to BIND version 9.6-ESV-R7, the latest from ISC. Feature Change * BIND now recognizes the TLSA resource record type, created to support IETF DANE (DNS-based Authentication of Named Entities) Bug Fix * The locking strategy around the handling of iterative queries has been tuned to reduce unnecessary contention in a multi- threaded environment. Other critical bug fixes are included. All BIND users are encouraged to upgrade. Added: stable/8/contrib/bind9/lib/dns/rdata/generic/tlsa_52.c - copied unchanged from r236175, vendor/bind9/dist-9.6/lib/dns/rdata/generic/tlsa_52.c stable/8/contrib/bind9/lib/dns/rdata/generic/tlsa_52.h - copied unchanged from r236175, vendor/bind9/dist-9.6/lib/dns/rdata/generic/tlsa_52.h Deleted: stable/8/contrib/bind9/release-notes.css Modified: stable/8/contrib/bind9/CHANGES stable/8/contrib/bind9/README stable/8/contrib/bind9/bin/named/query.c stable/8/contrib/bind9/lib/dns/api stable/8/contrib/bind9/lib/dns/include/dns/stats.h stable/8/contrib/bind9/lib/dns/include/dns/view.h stable/8/contrib/bind9/lib/dns/rbtdb.c stable/8/contrib/bind9/lib/dns/resolver.c stable/8/contrib/bind9/lib/dns/sdb.c stable/8/contrib/bind9/lib/dns/tkey.c stable/8/contrib/bind9/lib/dns/zone.c stable/8/contrib/bind9/lib/isc/pthreads/mutex.c stable/8/contrib/bind9/lib/isccfg/api stable/8/contrib/bind9/lib/isccfg/parser.c stable/8/contrib/bind9/version stable/8/lib/bind/dns/code.h stable/8/lib/bind/dns/dns/enumtype.h stable/8/lib/bind/dns/dns/rdatastruct.h Directory Properties: stable/8/contrib/bind9/ (props changed) Modified: stable/8/contrib/bind9/CHANGES == --- stable/8/contrib/bind9/CHANGES Mon May 28 19:47:56 2012 (r236196) +++ stable/8/contrib/bind9/CHANGES Mon May 28 19:48:37 2012 (r236197) @@ -1,3 +1,43 @@ + --- 9.6-ESV-R7 released --- + +3318. [tuning]Reduce the amount of work performed while holding a + bucket lock when finshed with a fetch context. + [RT #29239] + +3314. [bug] The masters list could be updated while refesh_callback + and stub_callback were using it. [RT #26732] + +3313. [protocol] Add TLSA record type. [RT #28989] + +3311. [bug] Abort the zone dump if zone-db is NULL in + zone.c:zone_gotwritehandle. [RT #29028] + +3310. [test] Increase table size for mutex profiling. [RT #28809] + +3309. [bug] resolver.c:fctx_finddone() was not threadsafe. + [RT #27995] + +3307. [bug] Add missing ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS. + [RT #28956] + +3304. [bug] Use hmctx, not mctx when freeing rbtdb-heaps. + [RT #28571] + +3301. [contrib] Update queryperf to build on darwin. Add -R flag + for non-recursive queries. [RT #28565] + +3300. [bug] Named could die if gssapi was enabled in named.conf + but was not compiled in. [RT #28338] + +3299. [bug] Make SDB handle errors from database drivers better. + [RT #28534] + +3232. [bug] Zero zone-curmaster before return in + dns_zone_setmasterswithkeys(). [RT #26732] + +3197. [bug] Don't try to log the filename and line number when + the config parser can't open a file. [RT #22263] + --- 9.6-ESV-R6 released --- 3298. [bug] Named could dereference a NULL pointer in @@ -168,7 +208,7 @@ 3189. [test] Added a summary report after system tests. [RT #25517] -3187. [port] win32: support for Visual Studio 2008. [RT #26356] +3187. [port] win32: support for Visual Studio 2008. [RT #26356] 3179. [port] kfreebsd: build issues. [RT #26273] @@ -201,7 +241,7 @@ an assert. [RT #25452] 3151. [bug] Queries for type RRSIG or SIG could be handled -incorrectly. [RT #21050] + incorrectly. [RT #21050] 3149. [tuning]Improve scalability by allocating one zone task per 100 zones at startup time. (The @@ -213,7 +253,7 @@ 3148. [bug] Processing of normal queries could be stalled when forwarding a UPDATE message. [RT #24711] -3146. [test] Fixed gcc4.6.0 errors in ATF. [RT #25598] +3146. [test] Fixed gcc4.6.0 errors in ATF. [RT #25598] 3145. [test] Capture output of ATF unit tests in ./atf.out if there were any errors while running them. [RT #25527] @@ -273,10 +313,10 @@
Re: svn commit: r235560 - head/sys/boot/forth
On 05/17/2012 13:00, Devin Teske wrote: Author: dteske Date: Thu May 17 20:00:34 2012 New Revision: 235560 URL: http://svn.freebsd.org/changeset/base/235560 Log: Update contact info. PR: N/A (mentor approved) Submitted by: dteske Reviewed by:dteske (mentor approved) All of the above is wrong. Your mentor should be helping you understand how to properly do commit messages. +.An Devin Teske Aq dte...@freebsd.org . In formal contex' we write @FreeBSD.org, FYI. hth, Doug ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r235107 - in head/etc: defaults rc.d
On 05/06/2012 01:46 PM, Stanislav Sedov wrote: Author: stas Date: Sun May 6 20:46:04 2012 New Revision: 235107 URL: http://svn.freebsd.org/changeset/base/235107 Log: - Change kfd rc script to be more conformant with rcNG conventions: o change rcname to kfd; o move mandatory options to command_args; o add missing shutdown keyword; o fix require line. Kfd doesn't really need to be started before daemons. Suggested by: dougb Modified: head/etc/defaults/rc.conf head/etc/rc.d/kfd Thanks! :) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r235074 - stable/8/sys/geom/part
Author: dougb
Date: Sun May 6 08:31:57 2012
New Revision: 235074
URL: http://svn.freebsd.org/changeset/base/235074
Log:
MFC r231929:
If nested scheme allows dump kernel to its partition, we may allow
dump for the parent partition too.
Modified:
stable/8/sys/geom/part/g_part.c
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/geom/part/g_part.c
==
--- stable/8/sys/geom/part/g_part.c Sun May 6 08:28:08 2012
(r235073)
+++ stable/8/sys/geom/part/g_part.c Sun May 6 08:31:57 2012
(r235074)
@@ -2048,9 +2048,12 @@ g_part_start(struct bio *bp)
/*
* Check that the partition is suitable for kernel
* dumps. Typically only swap partitions should be
-* used.
+* used. If the request comes from the nested scheme
+* we allow dumping there as well.
*/
- if (!G_PART_DUMPTO(table, entry)) {
+ if ((bp-bio_from == NULL ||
+ bp-bio_from-geom-class != g_part_class)
+ G_PART_DUMPTO(table, entry) == 0) {
g_io_deliver(bp, ENODEV);
printf(GEOM_PART: Partition '%s' not suitable
for kernel dumps (wrong type?)\n,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r235005 - head/usr.sbin/pc-sysinstall/backend
On Sat, 5 May 2012, Bruce Evans wrote:
On Fri, 4 May 2012, Doug Barton wrote:
On 05/04/2012 11:22 AM, Baptiste Daroussin wrote:
fetch -s ${FETCHFILE} ${SIZEFILE}
SIZE=`cat ${SIZEFILE}`
- SIZE=`expr ${SIZE} / 1024`
+ SIZE=$((SIZE/1024))
Bug; should be '$SIZE/'
No this is perfectly valid
Yes, that works, but it's not our usual style. However, the point is
moot as that whole block should be reduced down to:
SIZE=$(( `fetch -s ${FETCHFILE}` / 1024 ))
The KNF rule that there shall be spaces around binary operators should
probably apply in shell expressions too, but I don't like the spaces
on 1 side of (( and )). Shell syntax doesn't even allow spaces between
'$' ((.
The extra spaces there are a personal style thing. I do it for 2
reasons, readability primarily, but also to distinguish arithmetic
operations from $(command) style.
The rc.d style seems to be to use backquotes and not use $(cmd), but I
prefer the opposite except possibly in shell expressions like the above
so that it is easier to separate the commands from the shell expressions.
Yeah, backticks over $() is also a personal style issue, for no
particular good reason other than looks better to me. :)
Doug
--
It's always a long day; 86400 doesn't fit into a short.
Breadth of IT experience, and depth of knowledge in the DNS.
Yours for the right price. :) http://SupersetSolutions.com/
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r235005 - head/usr.sbin/pc-sysinstall/backend
On 05/04/2012 11:22 AM, Baptiste Daroussin wrote:
fetch -s ${FETCHFILE} ${SIZEFILE}
SIZE=`cat ${SIZEFILE}`
- SIZE=`expr ${SIZE} / 1024`
+ SIZE=$((SIZE/1024))
Bug; should be '$SIZE/'
No this is perfectly valid
Yes, that works, but it's not our usual style. However, the point is
moot as that whole block should be reduced down to:
SIZE=$(( `fetch -s ${FETCHFILE}` / 1024 ))
If SIZEFILE is needed elsewhere that's a different matter, but as it is
that's a hot mess.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r234927 - in head: etc/rc.d sys/kern
On 5/2/2012 7:25 AM, John Baldwin wrote: - Simplify accounting log rotation a bit. There is no need to re-run accton(8) after renaming the new log file to it's real name. Have you thoroughly tested this change? I remember adding that on purpose, but I couldn't tell you for sure at this point exactly why. -- This .signature sanitized for your protection ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r234468 - in stable/9: contrib/bind9 share/doc/bind9
Author: dougb
Date: Thu Apr 19 20:44:40 2012
New Revision: 234468
URL: http://svn.freebsd.org/changeset/base/234468
Log:
MFV r234164/MFC r234165:
The BIND 9.8.2 tarball was re-rolled to remove 9.8.1 release notes.
This change was noticed by ISC at:
https://lists.isc.org/pipermail/bind-users/2012-April/087345.html
and verified by me both by comparing the contents of the old and new
distfiles and by verifying the PGP signature on the new distfile.
Deleted:
stable/9/contrib/bind9/RELEASE-NOTES-BIND-9.8.1.html
stable/9/contrib/bind9/RELEASE-NOTES-BIND-9.8.1.pdf
stable/9/contrib/bind9/RELEASE-NOTES-BIND-9.8.1.txt
stable/9/contrib/bind9/release-notes.css
Modified:
stable/9/share/doc/bind9/Makefile
Directory Properties:
stable/9/contrib/bind9/ (props changed)
stable/9/share/doc/bind9/ (props changed)
Modified: stable/9/share/doc/bind9/Makefile
==
--- stable/9/share/doc/bind9/Makefile Thu Apr 19 20:11:43 2012
(r234467)
+++ stable/9/share/doc/bind9/Makefile Thu Apr 19 20:44:40 2012
(r234468)
@@ -8,9 +8,7 @@ SRCDIR= ${BIND_DIR}/doc
NO_OBJ=
FILESGROUPS= TOP ARM MISC
-TOP= CHANGES COPYRIGHT FAQ HISTORY README \
- RELEASE-NOTES-BIND-9.8.1.pdf RELEASE-NOTES-BIND-9.8.1.txt \
- RELEASE-NOTES-BIND-9.8.1.html release-notes.css
+TOP= CHANGES COPYRIGHT FAQ HISTORY README
TOPDIR=${DOCDIR}/bind9
ARM= Bv9ARM.ch01.html Bv9ARM.ch02.html Bv9ARM.ch03.html \
Bv9ARM.ch04.html Bv9ARM.ch05.html Bv9ARM.ch06.html \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r234370 - in head: contrib/jemalloc contrib/jemalloc/doc contrib/jemalloc/include contrib/jemalloc/include/jemalloc contrib/jemalloc/include/jemalloc/internal contrib/jemalloc/src incl
On 04/17/2012 00:22, Jason Evans wrote: Import jemalloc 9ef7f5dc34ff02f50d401e41c8d9a4a928e7c2aa (dev branch, prior to 3.0.0 release) as contrib/jemalloc Isn't stuff in src/contrib supposed to have a vendor/ branch? I think obrien mentioned this to you ... See vendor/bind9/dist/FREEBSD-Upgrade for an example if necessary. Doug -- This .signature sanitized for your protection ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r234164 - vendor/bind9/dist
Author: dougb Date: Thu Apr 12 01:14:03 2012 New Revision: 234164 URL: http://svn.freebsd.org/changeset/base/234164 Log: The BIND 9.8.2 tarball was re-rolled to remove 9.8.1 release notes. This change was noticed by ISC at: https://lists.isc.org/pipermail/bind-users/2012-April/087345.html and verified by me both by comparing the contents of the old and new distfiles and by verifying the PGP signature on the new distfile. Deleted: vendor/bind9/dist/RELEASE-NOTES-BIND-9.8.1.html vendor/bind9/dist/RELEASE-NOTES-BIND-9.8.1.pdf vendor/bind9/dist/RELEASE-NOTES-BIND-9.8.1.txt vendor/bind9/dist/release-notes.css ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r234093 - in head/etc: defaults rc.d
This script has many problems. First, new scripts in the base should
never use BEFORE since this makes debugging rcorder issues harder.
Please instead add this to the REQUIRE line in DAEMON. You can use
'service -r' to get an idea of where it will be included at boot time.
Second, for new scripts the name of the file, $name, and PROVIDE should
all the the same, in this case kfd. That implies that the rcvar should
be kfd_enable unless there is a very good reason for it to be
different, which in this case there is not one that I can see. (FYI,
the d in kfd implies server.)
Scripts that start persistent services should always include KEYWORD:
shutdown so that they get started cleanly. It's not clear to me if this
script should also include the nojail keyword. It's also generally a
good idea to add a REQUIRE line unless it truly doesn't matter. I
guessed at REQUIRE: kerberos ala the kadamind script, if that's wrong
please let me know.
Next, the arguments in the script, and the script generally, don't
follow the default format. It's very helpful when doing mass
reviews/updates if the script looks the same as other similar scripts
unless there is a good reason for it to be different. The reference at
http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/rc-scripts.html
should help.
It's also unclear why you are unset'ing start_cmd, but not supplying
your own start method. The way that you're using kfd_server is also
totally wrong, as is hard-coding kfd_flags in the script. If the -i
argument is always needed, it should be included in command_args. If
it's not always needed, but is generally recommended, you should include
it in /etc/defaults/rc.conf so that the user can easily override it.
I've assumed the latter, if it should always be included please let me
know.
Finally, you neglected to update rc.conf.5.
The attached patch fixes the problems mentioned above, modulo the
rc.conf.5 update which I'll leave to you. In order to avoid
inconvenience to those tracking HEAD who want to use this new feature I
plan to commit this in the next couple of days if I don't hear from you.
In the future it would probably be a good idea to submit patches to
freebsd-rc@ for review.
hth,
Doug
On Tue, 10 Apr 2012, Stanislav Sedov wrote:
Author: stas
Date: Tue Apr 10 09:27:41 2012
New Revision: 234093
URL: http://svn.freebsd.org/changeset/base/234093
Log:
- Add rc.d script for kfd, kerberos forwarded tickets daemon.
Added:
head/etc/rc.d/kfd (contents, props changed)
Modified:
head/etc/defaults/rc.conf
head/etc/rc.d/Makefile
Modified: head/etc/defaults/rc.conf
==
--- head/etc/defaults/rc.conf Tue Apr 10 07:38:58 2012(r234092)
+++ head/etc/defaults/rc.conf Tue Apr 10 09:27:41 2012(r234093)
@@ -297,6 +297,8 @@ kadmind5_server_enable=NO # Run kadmin
kadmind5_server=/usr/libexec/kadmind# path to kerberos 5 admin daemon
kpasswdd_server_enable=NO # Run kpasswdd (or NO)
kpasswdd_server=/usr/libexec/kpasswdd # path to kerberos 5 passwd daemon
+kfd_server_enable=NO # Run kfd (or NO)
+kfd_server=/usr/libexec/kfd# path to kerberos 5 kfd daemon
gssd_enable=NO # Run the gssd daemon (or NO).
gssd_flags= # Flags for gssd.
Modified: head/etc/rc.d/Makefile
==
--- head/etc/rc.d/Makefile Tue Apr 10 07:38:58 2012(r234092)
+++ head/etc/rc.d/Makefile Tue Apr 10 09:27:41 2012(r234093)
@@ -66,6 +66,7 @@ FILES=DAEMON \
kadmind \
kerberos \
keyserv \
+ kfd \
kld \
kldxref \
kpasswdd \
Added: head/etc/rc.d/kfd
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/etc/rc.d/kfd Tue Apr 10 09:27:41 2012(r234093)
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: kfd
+# BEFORE: DAEMON
+
+. /etc/rc.subr
+
+name=kfd
+load_rc_config $name
+rcvar=kfd_server_enable
+unset start_cmd
+command=${kfd_server}
+kfd_flags=-i
+command_args=
+
+run_rc_command $1
--
It's always a long day; 86400 doesn't fit into a short.
Breadth of IT experience, and depth of knowledge in the DNS.
Yours for the right price. :) http://SupersetSolutions.com/
Index: defaults/rc.conf
===
--- defaults/rc.conf(revision 234164)
+++ defaults/rc.conf(working copy)
@@ -297,8 +297,9 @@
kadmind5_server=/usr/libexec/kadmind # path to kerberos 5 admin daemon
kpasswdd_server_enable=NO# Run kpasswdd (or NO)
kpasswdd_server=/usr/libexec/kpasswdd# path to kerberos 5 passwd
daemon
-kfd_server_enable=NO # Run kfd (or NO)
-kfd_server=/usr/libexec/kfd # path to kerberos 5
svn commit: r234165 - in head: contrib/bind9 share/doc/bind9
Author: dougb
Date: Thu Apr 12 01:53:33 2012
New Revision: 234165
URL: http://svn.freebsd.org/changeset/base/234165
Log:
The BIND 9.8.2 tarball was re-rolled to remove 9.8.1 release notes.
This change was noticed by ISC at:
https://lists.isc.org/pipermail/bind-users/2012-April/087345.html
and verified by me both by comparing the contents of the old and new
distfiles and by verifying the PGP signature on the new distfile.
Deleted:
head/contrib/bind9/RELEASE-NOTES-BIND-9.8.1.html
head/contrib/bind9/RELEASE-NOTES-BIND-9.8.1.pdf
head/contrib/bind9/RELEASE-NOTES-BIND-9.8.1.txt
head/contrib/bind9/release-notes.css
Modified:
head/share/doc/bind9/Makefile
Directory Properties:
head/contrib/bind9/ (props changed)
Modified: head/share/doc/bind9/Makefile
==
--- head/share/doc/bind9/Makefile Thu Apr 12 01:14:03 2012
(r234164)
+++ head/share/doc/bind9/Makefile Thu Apr 12 01:53:33 2012
(r234165)
@@ -8,9 +8,7 @@ SRCDIR= ${BIND_DIR}/doc
NO_OBJ=
FILESGROUPS= TOP ARM MISC
-TOP= CHANGES COPYRIGHT FAQ HISTORY README \
- RELEASE-NOTES-BIND-9.8.1.pdf RELEASE-NOTES-BIND-9.8.1.txt \
- RELEASE-NOTES-BIND-9.8.1.html release-notes.css
+TOP= CHANGES COPYRIGHT FAQ HISTORY README
TOPDIR=${DOCDIR}/bind9
ARM= Bv9ARM.ch01.html Bv9ARM.ch02.html Bv9ARM.ch03.html \
Bv9ARM.ch04.html Bv9ARM.ch05.html Bv9ARM.ch06.html \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
