CVS commit: src/share/mk
Module Name:src
Committed By: jmmv
Date: Fri Jun 18 10:10:57 UTC 2010
Modified Files:
src/share/mk: bsd.test.mk
Log Message:
Add a experimental make test target
make test may yield misleading results but should work in many cases. This
target is supposed to simplify the execution of tests but does not preclude
developers from running the installed versions.
Addresses PR misc/38326.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/share/mk/bsd.test.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.test.mk
diff -u src/share/mk/bsd.test.mk:1.8 src/share/mk/bsd.test.mk:1.9
--- src/share/mk/bsd.test.mk:1.8 Fri Jun 4 08:35:09 2010
+++ src/share/mk/bsd.test.mk Fri Jun 18 10:10:57 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.test.mk,v 1.8 2010/06/04 08:35:09 jmmv Exp $
+# $NetBSD: bsd.test.mk,v 1.9 2010/06/18 10:10:57 jmmv Exp $
#
.include bsd.init.mk
@@ -55,3 +55,55 @@
.if !empty(SCRIPTS) || !empty(PROGS) || !empty(PROGS_CXX)
. include bsd.prog.mk
.endif
+
+#
+# Definition of the make test target and supporting variables.
+#
+# This target, by necessity, can only work for native builds (i.e. a NetBSD
+# host building a release for the same system). The target runs ATF, which is
+# not in the toolchain, and the tests execute code built for the target host.
+#
+# Due to the dependencies of the binaries built by the source tree and how they
+# are used by tests, it is highly possible for a execution of make test to
+# report bogus results unless the new binaries are put in place.
+#
+
+TESTS_PATH += ${DESTDIR}/bin ${DESTDIR}/sbin ${DESTDIR}/usr/bin ${DESTDIR}/usr/sbin
+TESTS_LD_LIBRARY_PATH += ${DESTDIR}/lib ${DESTDIR}/usr/lib
+
+TESTS_ENV += LD_LIBRARY_PATH=${TESTS_LD_LIBRARY_PATH:tW:S/ /:/g}
+TESTS_ENV += PATH=${TESTS_PATH:tW:S/ /:/g}
+
+_TESTS_FIFO = ${.OBJDIR}/atf-run.fifo
+_TESTS_LOG = ${.OBJDIR}/atf-run.log
+CLEANFILES += ${_TESTS_FIFO} ${_TESTS_LOG}
+
+.PHONY: test
+.if ${TESTSDIR} == ${TESTSBASE}
+# Forbid this case. It is likely to cause false positives/negatives and it
+# does not cover all the tests (e.g. it misses testing software in external).
+test:
+ @echo *** Sorry, you cannot use make test from src/tests. Install the
+ @echo *** tests into their final location and run them from /usr/tests
+ @false
+.else
+test:
+ @echo *** WARNING: make test is experimental
+ @echo ***
+ @echo *** Using this test does not preclude you from running the tests
+ @echo *** installed in /usr/tests. This test run may raise false
+ @echo *** positives and/or false negatives.
+ @echo
+ @cd ${DESTDIR}${TESTSDIR}; \
+ mkfifo ${_TESTS_FIFO}; \
+ cat ${_TESTS_FIFO} | tee ${_TESTS_LOG} | \
+ ${TESTS_ENV} ${DESTDIR}/usr/bin/atf-report \
+ ${TESTS_ENV} ${DESTDIR}/usr/bin/atf-run ${_TESTS_FIFO}; \
+ result=$${?}; \
+ wait; \
+ rm -f ${_TESTS_FIFO}; \
+ echo; \
+ echo *** The verbatim output of atf-run has been saved to ${_TESTS_LOG}; \
+ echo *** Once again, note that make test is unsupported.; \
+ test $${result} -eq 0
+.endif
CVS commit: src/share/mk
Module Name:src
Committed By: jmmv
Date: Fri Jun 18 13:14:21 UTC 2010
Modified Files:
src/share/mk: bsd.test.mk
Log Message:
Prevent build breakage if TESTSDIR is not defined (as in
tests/modules/k_helper).
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/mk/bsd.test.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.test.mk
diff -u src/share/mk/bsd.test.mk:1.9 src/share/mk/bsd.test.mk:1.10
--- src/share/mk/bsd.test.mk:1.9 Fri Jun 18 10:10:57 2010
+++ src/share/mk/bsd.test.mk Fri Jun 18 13:14:21 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.test.mk,v 1.9 2010/06/18 10:10:57 jmmv Exp $
+# $NetBSD: bsd.test.mk,v 1.10 2010/06/18 13:14:21 jmmv Exp $
#
.include bsd.init.mk
@@ -79,14 +79,15 @@
CLEANFILES += ${_TESTS_FIFO} ${_TESTS_LOG}
.PHONY: test
-.if ${TESTSDIR} == ${TESTSBASE}
+.if defined(TESTSDIR)
+. if ${TESTSDIR} == ${TESTSBASE}
# Forbid this case. It is likely to cause false positives/negatives and it
# does not cover all the tests (e.g. it misses testing software in external).
test:
@echo *** Sorry, you cannot use make test from src/tests. Install the
@echo *** tests into their final location and run them from /usr/tests
@false
-.else
+. else
test:
@echo *** WARNING: make test is experimental
@echo ***
@@ -94,7 +95,8 @@
@echo *** installed in /usr/tests. This test run may raise false
@echo *** positives and/or false negatives.
@echo
- @cd ${DESTDIR}${TESTSDIR}; \
+ @set -e; \
+ cd ${DESTDIR}${TESTSDIR}; \
mkfifo ${_TESTS_FIFO}; \
cat ${_TESTS_FIFO} | tee ${_TESTS_LOG} | \
${TESTS_ENV} ${DESTDIR}/usr/bin/atf-report \
@@ -106,4 +108,8 @@
echo *** The verbatim output of atf-run has been saved to ${_TESTS_LOG}; \
echo *** Once again, note that make test is unsupported.; \
test $${result} -eq 0
+. endif
+.else
+test:
+ @echo *** No TESTSDIR defined; nothing to do.
.endif
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Fri Jun 18 15:39:17 UTC 2010
Added Files:
src/external/bsd/atf: prepare-import.sh
Log Message:
Add a script to help with the import of new atf releases: it extracts a
distfile, places it in dist and cleans up any unnecessary files.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/prepare-import.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/bsd/atf/prepare-import.sh
diff -u /dev/null src/external/bsd/atf/prepare-import.sh:1.1
--- /dev/null Fri Jun 18 15:39:17 2010
+++ src/external/bsd/atf/prepare-import.sh Fri Jun 18 15:39:17 2010
@@ -0,0 +1,108 @@
+#!/bin/sh
+# $NetBSD: prepare-import.sh,v 1.1 2010/06/18 15:39:17 jmmv Exp $
+#
+# Use this script to recreate the 'dist' subdirectory from a newly released
+# distfile. The script takes care of unpacking the distfile, removing any
+# files that are not relevant to NetBSD and checking if there are any new
+# files in the new release that need to be addressed.
+#
+
+set -e
+
+ProgName=${0##*/}
+
+CLEAN_PATTERNS=
+CLEAN_PATTERNS=${CLEAN_PATTERNS} *.m4
+CLEAN_PATTERNS=${CLEAN_PATTERNS} INSTALL
+CLEAN_PATTERNS=${CLEAN_PATTERNS} Makefile*
+CLEAN_PATTERNS=${CLEAN_PATTERNS} admin/[a-qsz]*
+CLEAN_PATTERNS=${CLEAN_PATTERNS} bconfig.h.in
+CLEAN_PATTERNS=${CLEAN_PATTERNS} configure*
+CLEAN_PATTERNS=${CLEAN_PATTERNS} doc/*.sh
+CLEAN_PATTERNS=${CLEAN_PATTERNS} doc/*.xml
+CLEAN_PATTERNS=${CLEAN_PATTERNS} doc/standalone
+CLEAN_PATTERNS=${CLEAN_PATTERNS} doc/text
+CLEAN_PATTERNS=${CLEAN_PATTERNS} m4
+
+err() {
+ echo ${ProgName}: $...@} 12
+ exit 1
+}
+
+log() {
+ echo ${ProgName}: $...@}
+}
+
+backup_dist() {
+ if [ -d dist.old ]; then
+ log Removing dist; dist.old exists
+ rm -rf dist
+ else
+ log Backing up dist as dist.old
+ mv dist dist.old
+ fi
+}
+
+extract_distfile() {
+ local distfile=${1}; shift
+ local distname=${1}; shift
+
+ log Extracting ${distfile}
+ tar -xzf ${distfile}
+ [ -d ${distname} ] || err Distfile did not create ${distname}
+ log Renaming ${distname} to dist
+ mv ${distname} dist
+}
+
+get_distname() {
+ local distfile=${1}; shift
+ basename ${distfile} | sed -e 's,\.tar.*,,'
+}
+
+cleanup_dist() {
+ log Removing unnecessary files from dist
+ ( cd dist rm -rf ${CLEAN_PATTERNS} )
+}
+
+diff_dirs() {
+ local old_dir=${1}; shift
+ local new_dir=${1}; shift
+
+ local old_list=$(mktemp -t atf-import.XX)
+ local new_list=$(mktemp -t atf-import.XX)
+ local diff=$(mktemp -t atf-import.XX)
+ trap rm -f '${old_list}' '${new_list}' '${diff}'; exit 1 \
+ HUP INT QUIT TERM
+
+ ( cd ${old_dir} find . | sort ${old_list} )
+ ( cd ${new_dir} find . | sort ${new_list} )
+
+ diff -u ${old_list} ${new_list} | grep '^+\.' ${diff} || true
+ if [ -s ${diff} ]; then
+ log New files found
+ diff -u ${old_list} ${new_list} | grep '^+\.'
+ log Check if any files have to be cleaned up and update \
+ the prepare-import.sh script accordingly
+ else
+ log No new files; all good!
+ fi
+
+ rm -f ${old_list} ${new_list} ${diff}
+}
+
+main() {
+ [ ${#} -eq 1 ] || err Must provide a distfile name
+ local distfile=${1}; shift
+
+ [ -f Makefile -a -f prepare-import.sh ] || \
+ err Must be run from the src/external/bsd/atf subdirectory
+
+ local distname=$(get_distname ${distfile})
+
+ backup_dist
+ extract_distfile ${distfile} ${distname}
+ cleanup_dist
+ diff_dirs dist.old dist
+}
+
+main $...@}
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Fri Jun 18 15:41:22 UTC 2010 Removed Files: src/external/bsd/atf/dist: INSTALL Makefile.am Makefile.am.m4 Makefile.in aclocal.m4 bconfig.h.in configure configure.ac src/external/bsd/atf/dist/admin: check-install.sh check-style-c.awk check-style-common.awk check-style-cpp.awk check-style-man.awk check-style-shell.awk check-style.sh choose-revision.sh compile config.guess config.sub depcomp generate-makefile.sh generate-revision-dist.sh generate-revision.sh install-sh ltmain.sh missing src/external/bsd/atf/dist/doc: authors.xml build-xml.sh copying.xml install.xml news.xml readme.xml specification.xml src/external/bsd/atf/dist/doc/standalone: authors.html copying.html install.html news.html readme.html sdocbook.xsl specification.html standalone.css src/external/bsd/atf/dist/doc/text: authors.txt copying.txt install.txt news.txt readme.txt specification.txt src/external/bsd/atf/dist/m4: compiler-flags.m4 cxx-std-funcs.m4 developer-mode.m4 doc-build.m4 libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 module-application.m4 module-defs.m4 module-env.m4 module-fs.m4 module-sanity.m4 module-signals.m4 runtime-tool.m4 Log Message: Remove unnecessary files The just-commited prepare-import.sh script will take care of spotting extra files that may be unnecessary during a future import. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/atf/dist/INSTALL \ src/external/bsd/atf/dist/Makefile.am.m4 \ src/external/bsd/atf/dist/bconfig.h.in cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/atf/dist/Makefile.am \ src/external/bsd/atf/dist/Makefile.in src/external/bsd/atf/dist/configure \ src/external/bsd/atf/dist/configure.ac cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/aclocal.m4 cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/admin/check-install.sh \ src/external/bsd/atf/dist/admin/check-style-common.awk \ src/external/bsd/atf/dist/admin/check-style-cpp.awk \ src/external/bsd/atf/dist/admin/check-style.sh \ src/external/bsd/atf/dist/admin/compile \ src/external/bsd/atf/dist/admin/depcomp \ src/external/bsd/atf/dist/admin/generate-revision.sh \ src/external/bsd/atf/dist/admin/ltmain.sh \ src/external/bsd/atf/dist/admin/missing cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/admin/check-style-c.awk \ src/external/bsd/atf/dist/admin/check-style-man.awk \ src/external/bsd/atf/dist/admin/choose-revision.sh \ src/external/bsd/atf/dist/admin/generate-makefile.sh \ src/external/bsd/atf/dist/admin/generate-revision-dist.sh \ src/external/bsd/atf/dist/admin/install-sh cvs rdiff -u -r1.1.1.3 -r0 \ src/external/bsd/atf/dist/admin/check-style-shell.awk \ src/external/bsd/atf/dist/admin/config.guess \ src/external/bsd/atf/dist/admin/config.sub cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/doc/authors.xml \ src/external/bsd/atf/dist/doc/build-xml.sh \ src/external/bsd/atf/dist/doc/readme.xml \ src/external/bsd/atf/dist/doc/specification.xml cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/doc/copying.xml \ src/external/bsd/atf/dist/doc/install.xml cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/atf/dist/doc/news.xml cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/atf/dist/doc/standalone/authors.html \ src/external/bsd/atf/dist/doc/standalone/readme.html \ src/external/bsd/atf/dist/doc/standalone/sdocbook.xsl \ src/external/bsd/atf/dist/doc/standalone/specification.html \ src/external/bsd/atf/dist/doc/standalone/standalone.css cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/atf/dist/doc/standalone/copying.html \ src/external/bsd/atf/dist/doc/standalone/install.html cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/atf/dist/doc/standalone/news.html cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/doc/text/authors.txt \ src/external/bsd/atf/dist/doc/text/readme.txt \ src/external/bsd/atf/dist/doc/text/specification.txt cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/doc/text/copying.txt \ src/external/bsd/atf/dist/doc/text/install.txt cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/atf/dist/doc/text/news.txt cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/m4/compiler-flags.m4 \ src/external/bsd/atf/dist/m4/cxx-std-funcs.m4 \ src/external/bsd/atf/dist/m4/doc-build.m4 \ src/external/bsd/atf/dist/m4/libtool.m4 \ src/external/bsd/atf/dist/m4/ltoptions.m4 \ src/external/bsd/atf/dist/m4/ltsugar.m4 \ src/external/bsd/atf/dist/m4/ltversion.m4 \ src/external/bsd/atf/dist/m4/lt~obsolete.m4 \ src/external/bsd/atf/dist/m4/module-application.m4 \ src/external/bsd/atf/dist/m4/module-env.m4 \ src/external/bsd/atf/dist/m4/module-sanity.m4 \
CVS commit: src/external/bsd/atf/dist
Module Name:src
Committed By: jmmv
Date: Thu Jun 10 15:27:03 UTC 2010
Modified Files:
src/external/bsd/atf/dist/atf-run: atf-run.cpp test-program.cpp
test-program.hpp
src/external/bsd/atf/dist/tests/atf/atf-run: t_integration.sh
Log Message:
Pull up revision 2f7a426c0f4149d59a7f3717ebedd6c55998e8bc from upstream:
--
Fix detection of crashed test cases
Prevent cross-test-case contamination that occured when a first test case
passed and the second crashed. The second could pick up the result of the
first test case and not be reported as failed.
Similarly, change the way timed out test cases are reported back to the
caller. The creation of a temporary results file was just a really stupid
way of passing information around and introduced false positives if the
test case creates a results file before timing out.
Fixes ticket #35.
--
Problem originally reported by po...@.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/atf/dist/atf-run/atf-run.cpp \
src/external/bsd/atf/dist/atf-run/test-program.cpp
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/atf/dist/atf-run/test-program.hpp
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/atf/dist/tests/atf/atf-run/t_integration.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-run/atf-run.cpp
diff -u src/external/bsd/atf/dist/atf-run/atf-run.cpp:1.1.1.2 src/external/bsd/atf/dist/atf-run/atf-run.cpp:1.2
--- src/external/bsd/atf/dist/atf-run/atf-run.cpp:1.1.1.2 Fri Jun 4 08:23:45 2010
+++ src/external/bsd/atf/dist/atf-run/atf-run.cpp Thu Jun 10 15:27:02 2010
@@ -97,7 +97,7 @@
const atf::tests::vars_map,
const atf::fs::path);
-atf::tests::tcr get_tcr(const atf::process::status,
+atf::tests::tcr get_tcr(const std::string, const atf::process::status,
const atf::fs::path) const;
public:
@@ -212,12 +212,16 @@
}
atf::tests::tcr
-atf_run::get_tcr(const atf::process::status s,
+atf_run::get_tcr(const std::string broken_reason,
+ const atf::process::status s,
const atf::fs::path resfile)
const
{
using atf::tests::tcr;
+if (!broken_reason.empty())
+return tcr(tcr::failed_state, broken_reason);
+
if (s.exited()) {
try {
const tcr ret = tcr::read(resfile);
@@ -244,14 +248,10 @@
std::string(e.what()));
}
} else if (s.signaled()) {
-try {
-return tcr::read(resfile);
-} catch (...) {
-return tcr(tcr::failed_state,
- Test program received signal +
- atf::text::to_string(s.termsig()) +
- (s.coredump() ? (core dumped) : ));
-}
+return tcr(tcr::failed_state,
+ Test program received signal +
+ atf::text::to_string(s.termsig()) +
+ (s.coredump() ? (core dumped) : ));
} else {
UNREACHABLE;
throw std::runtime_error(Unknown exit status);
@@ -311,6 +311,7 @@
}
const atf::fs::path resfile = resdir.get_path() / tcr;
+INV(!atf::fs::exists(resfile));
try {
const bool use_fs = atf::text::to_bool(
(*tcmd.find(use.fs)).second);
@@ -321,34 +322,35 @@
atf::fs::temp_dir workdir(atf::fs::path(atf::config::get(
atf_workdir)) / atf-run.XX);
-const atf::process::status body_status =
+std::pair std::string, const atf::process::status s =
impl::run_test_case(tp, tcname, body, tcmd, config,
resfile, workdir.get_path(), w);
-const atf::process::status cleanup_status =
-impl::run_test_case(tp, tcname, cleanup, tcmd, config,
-resfile, workdir.get_path(), w);
+(void)impl::run_test_case(tp, tcname, cleanup, tcmd, config,
+ resfile, workdir.get_path(), w);
// TODO: Force deletion of workdir.
-tcr = get_tcr(body_status, resfile);
+tcr = get_tcr(s.first, s.second, resfile);
} else {
-const atf::process::status body_status =
+std::pair std::string, const atf::process::status s =
impl::run_test_case(tp, tcname, body, tcmd, config,
resfile, ro_workdir, w);
-const atf::process::status cleanup_status =
-impl::run_test_case(tp, tcname, cleanup,
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Fri Jun 4 08:24:03 UTC 2010 Update of /cvsroot/src/external/bsd/atf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8120 Log Message: Import atf 0.9: * Added atf-sh, an interpreter to process test programs written using the shell API. This is not really a shell interpreter by itself though: it is just a wrapper around the system shell that eases the loading of the necessary ATF libraries. * Removed atf-compile in favour of atf-sh. * Added the use.fs metadata property to test case, which is used to specify which test cases require file system access. This is to highlight dependencies on external resources more clearly and to speed up the execution of test suites by skipping the creation of many unnecessary work directories. * Fixed test programs to get a sane default value for their source directory. This means that it should not be necessary any more to pass -s when running test programs that do not live in the current directory. * Defining test case headers became optional. This is trivial to achieve in shell-based tests but a bit ugly in C and C++. In C, use the new ATF_TC_WITHOUT_HEAD macro to define the test case, and in C++ use ATF_TEST_CASE_WITHOUT_HEAD. Status: Vendor Tag: TNF Release Tags: atf-0-9 U src/external/bsd/atf/dist/configure.ac U src/external/bsd/atf/dist/README U src/external/bsd/atf/dist/Makefile.am.m4 U src/external/bsd/atf/dist/aclocal.m4 U src/external/bsd/atf/dist/atf-c.h U src/external/bsd/atf/dist/atf-c++.hpp U src/external/bsd/atf/dist/Makefile.am U src/external/bsd/atf/dist/Makefile.in U src/external/bsd/atf/dist/bconfig.h.in U src/external/bsd/atf/dist/configure U src/external/bsd/atf/dist/AUTHORS U src/external/bsd/atf/dist/COPYING U src/external/bsd/atf/dist/INSTALL U src/external/bsd/atf/dist/NEWS U src/external/bsd/atf/dist/admin/config.guess U src/external/bsd/atf/dist/admin/compile U src/external/bsd/atf/dist/admin/check-install.sh U src/external/bsd/atf/dist/admin/config.sub U src/external/bsd/atf/dist/admin/depcomp U src/external/bsd/atf/dist/admin/install-sh U src/external/bsd/atf/dist/admin/ltmain.sh U src/external/bsd/atf/dist/admin/missing U src/external/bsd/atf/dist/admin/check-style-common.awk U src/external/bsd/atf/dist/admin/check-style-c.awk U src/external/bsd/atf/dist/admin/check-style-cpp.awk U src/external/bsd/atf/dist/admin/check-style-man.awk U src/external/bsd/atf/dist/admin/check-style-shell.awk U src/external/bsd/atf/dist/admin/check-style.sh U src/external/bsd/atf/dist/admin/choose-revision.sh U src/external/bsd/atf/dist/admin/generate-makefile.sh U src/external/bsd/atf/dist/admin/generate-revision.sh U src/external/bsd/atf/dist/admin/revision-dist.h U src/external/bsd/atf/dist/admin/generate-revision-dist.sh U src/external/bsd/atf/dist/atf-c/error_fwd.h U src/external/bsd/atf/dist/atf-c/build.h U src/external/bsd/atf/dist/atf-c/check.h U src/external/bsd/atf/dist/atf-c/config.h U src/external/bsd/atf/dist/atf-c/dynstr.h U src/external/bsd/atf/dist/atf-c/env.h U src/external/bsd/atf/dist/atf-c/error.h U src/external/bsd/atf/dist/atf-c/list.h U src/external/bsd/atf/dist/atf-c/fs.h U src/external/bsd/atf/dist/atf-c/io.h U src/external/bsd/atf/dist/atf-c/process.h U src/external/bsd/atf/dist/atf-c/macros.h U src/external/bsd/atf/dist/atf-c/map.h U src/external/bsd/atf/dist/atf-c/atf-c-api.3 U src/external/bsd/atf/dist/atf-c/sanity.h U src/external/bsd/atf/dist/atf-c/tc.h U src/external/bsd/atf/dist/atf-c/tcr.h U src/external/bsd/atf/dist/atf-c/text.h U src/external/bsd/atf/dist/atf-c/tp.h U src/external/bsd/atf/dist/atf-c/ui.h U src/external/bsd/atf/dist/atf-c/user.h U src/external/bsd/atf/dist/atf-c/process.c C src/external/bsd/atf/dist/atf-c/dynstr.c U src/external/bsd/atf/dist/atf-c/defs.h.in U src/external/bsd/atf/dist/atf-c/build.c U src/external/bsd/atf/dist/atf-c/check.c U src/external/bsd/atf/dist/atf-c/config.c U src/external/bsd/atf/dist/atf-c/env.c U src/external/bsd/atf/dist/atf-c/error.c C src/external/bsd/atf/dist/atf-c/fs.c U src/external/bsd/atf/dist/atf-c/io.c U src/external/bsd/atf/dist/atf-c/list.c U src/external/bsd/atf/dist/atf-c/map.c U src/external/bsd/atf/dist/atf-c/tp_main.c U src/external/bsd/atf/dist/atf-c/sanity.c U src/external/bsd/atf/dist/atf-c/text.c U src/external/bsd/atf/dist/atf-c/ui.c U src/external/bsd/atf/dist/atf-c/user.c C src/external/bsd/atf/dist/atf-c/tc.c U src/external/bsd/atf/dist/atf-c/tcr.c U src/external/bsd/atf/dist/atf-c/tp.c N src/external/bsd/atf/dist/atf-c/atf-c.pc.in U src/external/bsd/atf/dist/atf-c++/application.hpp U src/external/bsd/atf/dist/atf-c++/atffile.hpp U src/external/bsd/atf/dist/atf-c++/build.hpp U src/external/bsd/atf/dist/atf-c++/check.hpp U src/external/bsd/atf/dist/atf-c++/config.hpp U src/external/bsd/atf/dist/atf-c++/env.hpp U src/external/bsd/atf/dist/atf-c++/exceptions.hpp U src/external/bsd/atf/dist/atf-c++/expand.hpp U
CVS commit: src/external/bsd/atf/dist
Module Name:src
Committed By: jmmv
Date: Fri Jun 4 08:32:15 UTC 2010
Modified Files:
src/external/bsd/atf/dist/atf-c: dynstr.c fs.c tc.c
src/external/bsd/atf/dist/atf-version: atf-version.cpp
Removed Files:
src/external/bsd/atf/dist/atf-c: object.c object.h
src/external/bsd/atf/dist/atf-compile: atf-compile.1 atf-compile.cpp
atf-host-compile.sh
src/external/bsd/atf/dist/atf-run: atf-run.hooks
src/external/bsd/atf/dist/atf-sh: atf.footer.subr atf.header.subr
atf.init.subr
src/external/bsd/atf/dist/data: atf-c++.pc.in atf-c.pc.in atf-run.hooks
tests-results.css tests-results.dtd tests-results.xsl
src/external/bsd/atf/dist/doc: roadmap.xml
src/external/bsd/atf/dist/doc/standalone: roadmap.html
src/external/bsd/atf/dist/doc/text: roadmap.txt
src/external/bsd/atf/dist/tests/atf/atf-c: d_include_object_h.c
src/external/bsd/atf/dist/tests/atf/atf-compile: Atffile h_mode.cpp
t_integration.sh
src/external/bsd/atf/dist/tests/atf/data: Atffile t_pkg_config.sh
Log Message:
Fix import conflicts for atf 0.9.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-c/dynstr.c \
src/external/bsd/atf/dist/atf-c/fs.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-c/object.c \
src/external/bsd/atf/dist/atf-c/object.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-c/tc.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/atf/dist/atf-compile/atf-compile.1 \
src/external/bsd/atf/dist/atf-compile/atf-compile.cpp \
src/external/bsd/atf/dist/atf-compile/atf-host-compile.sh
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/atf-run/atf-run.hooks
cvs rdiff -u -r1.2 -r0 src/external/bsd/atf/dist/atf-sh/atf.footer.subr
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/atf-sh/atf.header.subr \
src/external/bsd/atf/dist/atf-sh/atf.init.subr
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/atf/dist/atf-version/atf-version.cpp
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/data/atf-c++.pc.in \
src/external/bsd/atf/dist/data/atf-c.pc.in \
src/external/bsd/atf/dist/data/atf-run.hooks \
src/external/bsd/atf/dist/data/tests-results.css \
src/external/bsd/atf/dist/data/tests-results.dtd \
src/external/bsd/atf/dist/data/tests-results.xsl
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/doc/roadmap.xml
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/atf/dist/doc/standalone/roadmap.html
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/doc/text/roadmap.txt
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/atf/dist/tests/atf/atf-c/d_include_object_h.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/atf/dist/tests/atf/atf-compile/Atffile \
src/external/bsd/atf/dist/tests/atf/atf-compile/h_mode.cpp \
src/external/bsd/atf/dist/tests/atf/atf-compile/t_integration.sh
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/tests/atf/data/Atffile
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/atf/dist/tests/atf/data/t_pkg_config.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c/dynstr.c
diff -u src/external/bsd/atf/dist/atf-c/dynstr.c:1.3 src/external/bsd/atf/dist/atf-c/dynstr.c:1.4
--- src/external/bsd/atf/dist/atf-c/dynstr.c:1.3 Tue Dec 22 13:36:56 2009
+++ src/external/bsd/atf/dist/atf-c/dynstr.c Fri Jun 4 08:32:14 2010
@@ -1,7 +1,7 @@
/*
* Automated Testing Framework (atf)
*
- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -29,6 +29,7 @@
#include errno.h
#include stdarg.h
+#include stdint.h
#include stdio.h
#include stdlib.h
#include string.h
@@ -121,22 +122,17 @@
{
atf_error_t err;
-atf_object_init(ad-m_object);
-
ad-m_data = (char *)malloc(sizeof(char));
if (ad-m_data == NULL) {
err = atf_no_memory_error();
-goto err_object;
+goto out;
}
ad-m_data[0] = '\0';
ad-m_datasize = 1;
ad-m_length = 0;
err = atf_no_error();
-goto out;
-err_object:
-atf_object_fini(ad-m_object);
out:
return err;
}
@@ -146,8 +142,6 @@
{
atf_error_t err;
-atf_object_init(ad-m_object);
-
ad-m_datasize = strlen(fmt) + 1;
ad-m_length = 0;
@@ -159,7 +153,7 @@
ad-m_data = (char *)malloc(ad-m_datasize);
if (ad-m_data == NULL) {
err = atf_no_memory_error();
-goto err_object;
+goto out;
}
va_copy(ap2, ap);
@@ -168,7 +162,7 @@
if (ret 0) {
free(ad-m_data);
err = atf_libc_error(errno, Cannot format string);
-goto err_object;
+goto out;
}
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Fri Jun 4 08:33:42 UTC 2010
Modified Files:
src/external/bsd/atf/etc/atf: Makefile
src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/share: Makefile
src/external/bsd/atf/share/doc/atf: Makefile
src/external/bsd/atf/share/examples/atf: Makefile
src/external/bsd/atf/share/xml/atf: Makefile
src/external/bsd/atf/share/xsl/atf: Makefile
src/external/bsd/atf/tests/atf: Makefile
src/external/bsd/atf/tests/atf/atf-c: Makefile
src/external/bsd/atf/tests/atf/atf-c++: Makefile
src/external/bsd/atf/tests/atf/atf-run: Makefile
src/external/bsd/atf/tests/atf/atf-sh: Makefile
src/external/bsd/atf/usr.bin: Makefile
src/external/bsd/atf/usr.bin/atf-run: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile
Added Files:
src/external/bsd/atf/usr.bin/atf-sh: Makefile
Removed Files:
src/external/bsd/atf/share/atf: Makefile
src/external/bsd/atf/tests/atf/atf-compile: Makefile
src/external/bsd/atf/tests/atf/data: Makefile
src/external/bsd/atf/usr.bin/atf-compile: Makefile
Log Message:
Adjust reachover makefiles for atf 0.9.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/etc/atf/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/share/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/share/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/share/doc/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/share/examples/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/share/xml/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/share/xsl/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/tests/atf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/tests/atf/atf-c/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/tests/atf/atf-c++/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/tests/atf/atf-compile/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/atf-run/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/atf-sh/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/tests/atf/data/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/Makefile
cvs rdiff -u -r1.2 -r0 src/external/bsd/atf/usr.bin/atf-compile/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/usr.bin/atf-run/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/usr.bin/atf-sh/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/usr.bin/atf-version/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/etc/atf/Makefile
diff -u src/external/bsd/atf/etc/atf/Makefile:1.1 src/external/bsd/atf/etc/atf/Makefile:1.2
--- src/external/bsd/atf/etc/atf/Makefile:1.1 Mon Jan 19 07:13:03 2009
+++ src/external/bsd/atf/etc/atf/Makefile Fri Jun 4 08:33:40 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:40 jmmv Exp $
.include bsd.own.mk
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/data
+.PATH: ${SRCDIR}/atf-run/sample
CONFIGFILES= NetBSD.conf atf-run.hooks
FILESDIR= /etc/atf
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.4 src/external/bsd/atf/lib/libatf-c/Makefile:1.5
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.4 Sat May 8 08:12:33 2010
+++ src/external/bsd/atf/lib/libatf-c/Makefile Fri Jun 4 08:33:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/05/08 08:12:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/04 08:33:41 jmmv Exp $
NOLINT= # defined
@@ -44,7 +44,6 @@
io.c \
list.c \
map.c \
- object.c \
process.c \
sanity.c \
text.c \
@@ -68,7 +67,6 @@
list.h \
macros.h \
map.h \
- object.h \
process.h \
sanity.h \
tc.h \
@@ -82,7 +80,7 @@
INCS+= atf-c.h
INCSDIR_atf-c.h=/usr/include
-MAN= # empty
+MAN= atf-c-api.3
CLEANFILES+= defs.h
@@ -92,4 +90,18 @@
${.ALLSRC} ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
+.if ${MKSHARE} != no
+FILES+= atf-c.pc
+FILESDIR= /usr/lib/pkgconfig
+
+realall: atf-c.pc
+atf-c.pc: Makefile atf-c.pc.in
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.9,g' \
+ -e 's,__CC__,gcc,g' \
+ -e 's,__INCLUDEDIR__,/usr/include,g' \
+ -e 's,__LIBDIR__,/usr/lib,g' \
+ ${SRCDIR}/atf-c/atf-c.pc.in atf-c.pc
+CLEANFILES+= atf-c.pc
+.endif
+
.include bsd.lib.mk
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.3
CVS commit: src/tools
Module Name:src
Committed By: jmmv
Date: Fri Jun 4 08:34:35 UTC 2010
Modified Files:
src/tools: Makefile
Removed Files:
src/tools/atf-compile: Makefile
Log Message:
Bye bye atf-compile, you won't be missed.
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/tools/Makefile
cvs rdiff -u -r1.7 -r0 src/tools/atf-compile/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.137 src/tools/Makefile:1.138
--- src/tools/Makefile:1.137 Tue Mar 2 20:47:01 2010
+++ src/tools/Makefile Fri Jun 4 08:34:35 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2010/03/02 20:47:01 darran Exp $
+# $NetBSD: Makefile,v 1.138 2010/06/04 08:34:35 jmmv Exp $
.include bsd.own.mk
@@ -54,7 +54,7 @@
.WAIT pax \
.WAIT ${TOOLCHAIN_BITS} \
${DTRACE_BITS} \
- asn1_compile atf-compile cat cksum compile_et config db \
+ asn1_compile cat cksum compile_et config db \
file lint1 \
makefs menuc mkcsmapper mkesdb mklocale mknod msgc \
.WAIT disklabel \
CVS commit: src/share/mk
Module Name:src
Committed By: jmmv
Date: Fri Jun 4 08:35:09 UTC 2010
Modified Files:
src/share/mk: bsd.README bsd.own.mk bsd.test.mk
Log Message:
Simplify build of shell-based test cases: atf-compile is gone.
To generate a diff of this commit:
cvs rdiff -u -r1.268 -r1.269 src/share/mk/bsd.README
cvs rdiff -u -r1.627 -r1.628 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.7 -r1.8 src/share/mk/bsd.test.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.268 src/share/mk/bsd.README:1.269
--- src/share/mk/bsd.README:1.268 Wed May 26 14:52:10 2010
+++ src/share/mk/bsd.README Fri Jun 4 08:35:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.268 2010/05/26 14:52:10 njoly Exp $
+# $NetBSD: bsd.README,v 1.269 2010/06/04 08:35:09 jmmv Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make include files for the NetBSD
@@ -655,8 +655,6 @@
TOOL_ASN1_COMPILE ASN1 compiler. [asn1_compile]
-TOOL_ATF_COMPILE Generate POSIX shell test programs. [atf-compile]
-
TOOL_AWK Pattern-directed scanning/processing language. [awk]
TOOL_CAP_MKDB Create capability database. [cap_mkdb]
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.627 src/share/mk/bsd.own.mk:1.628
--- src/share/mk/bsd.own.mk:1.627 Tue Jun 1 23:29:10 2010
+++ src/share/mk/bsd.own.mk Fri Jun 4 08:35:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.627 2010/06/01 23:29:10 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.628 2010/06/04 08:35:09 jmmv Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -227,7 +227,6 @@
TOOL_AMIGAELF2BB= ${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-elf2bb
TOOL_AMIGATXLT= ${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-txlt
TOOL_ASN1_COMPILE= ${TOOLDIR}/bin/${_TOOL_PREFIX}asn1_compile
-TOOL_ATF_COMPILE= ${TOOLDIR}/bin/${_TOOL_PREFIX}atf-compile
TOOL_AWK= ${TOOLDIR}/bin/${_TOOL_PREFIX}awk
TOOL_CAP_MKDB= ${TOOLDIR}/bin/${_TOOL_PREFIX}cap_mkdb
TOOL_CAT= ${TOOLDIR}/bin/${_TOOL_PREFIX}cat
@@ -304,7 +303,6 @@
TOOL_AMIGAELF2BB= amiga-elf2bb
TOOL_AMIGATXLT= amiga-txlt
TOOL_ASN1_COMPILE= asn1_compile
-TOOL_ATF_COMPILE= atf-compile
TOOL_AWK= awk
TOOL_CAP_MKDB= cap_mkdb
TOOL_CAT= cat
Index: src/share/mk/bsd.test.mk
diff -u src/share/mk/bsd.test.mk:1.7 src/share/mk/bsd.test.mk:1.8
--- src/share/mk/bsd.test.mk:1.7 Thu May 1 15:36:36 2008
+++ src/share/mk/bsd.test.mk Fri Jun 4 08:35:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.test.mk,v 1.7 2008/05/01 15:36:36 jmmv Exp $
+# $NetBSD: bsd.test.mk,v 1.8 2010/06/04 08:35:09 jmmv Exp $
#
.include bsd.init.mk
@@ -37,22 +37,15 @@
CLEANFILES+= ${_T} ${_T}.tmp
TESTS_SH_SRC_${_T}?= ${_T}.sh
-${_T}: ${TESTS_SH_SRC_${_T}} atf-compile-cookie
+${_T}: ${TESTS_SH_SRC_${_T}}
${_MKTARGET_BUILD}
- ${TOOL_ATF_COMPILE} -o ${.TARGET}.tmp ${.ALLSRC}
+ echo '#! /usr/bin/atf-sh' ${.TARGET}.tmp
+ cat ${.ALLSRC} ${.TARGET}.tmp
+ chmod +x ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
. endfor
.endif
-CLEANFILES+= atf-compile-cookie
-.if ${USETOOLS} == yes
-atf-compile-cookie: ${TOOL_ATF_COMPILE}
- touch atf-compile-cookie
-.else
-atf-compile-cookie:
- test -f atf-compile-cookie || touch atf-compile-cookie
-.endif
-
.if !defined(NOATFFILE)
FILES+= Atffile
FILESDIR_Atffile= ${TESTSDIR}
CVS commit: src/etc/mtree
Module Name:src Committed By: jmmv Date: Fri Jun 4 08:35:36 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Remove directories not required by atf-0.9 any more. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.19 src/etc/mtree/NetBSD.dist.base:1.20 --- src/etc/mtree/NetBSD.dist.base:1.19 Sat May 8 08:13:12 2010 +++ src/etc/mtree/NetBSD.dist.base Fri Jun 4 08:35:35 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.19 2010/05/08 08:13:12 jmmv Exp $ +# $NetBSD: NetBSD.dist.base,v 1.20 2010/06/04 08:35:35 jmmv Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -193,7 +193,6 @@ ./usr/libdata/debug/usr/tests/atf ./usr/libdata/debug/usr/tests/atf/atf-c ./usr/libdata/debug/usr/tests/atf/atf-c++ -./usr/libdata/debug/usr/tests/atf/atf-compile ./usr/libdata/debug/usr/tests/atf/atf-report ./usr/libdata/debug/usr/tests/atf/atf-run ./usr/libdata/debug/usr/tests/atf/formats @@ -1086,12 +1085,10 @@ ./usr/tests/atf/atf-c++ ./usr/tests/atf/atf-check ./usr/tests/atf/atf-cleanup -./usr/tests/atf/atf-compile ./usr/tests/atf/atf-config ./usr/tests/atf/atf-report ./usr/tests/atf/atf-run ./usr/tests/atf/atf-sh -./usr/tests/atf/data ./usr/tests/atf/formats ./usr/tests/atf/test_programs ./usr/tests/crypto
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: jmmv Date: Fri Jun 4 08:37:10 UTC 2010 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/tests: mi Log Message: Adjust file lists for atf-0.9. Most notably, some files are gone for good! To generate a diff of this commit: cvs rdiff -u -r1.865 -r1.866 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1455 -r1.1456 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1214 -r1.1215 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.77 -r1.78 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.865 src/distrib/sets/lists/base/mi:1.866 --- src/distrib/sets/lists/base/mi:1.865 Sat May 8 08:14:37 2010 +++ src/distrib/sets/lists/base/mi Fri Jun 4 08:37:09 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.865 2010/05/08 08:14:37 jmmv Exp $ +# $NetBSD: mi,v 1.866 2010/06/04 08:37:09 jmmv Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -332,6 +332,7 @@ ./usr/bin/atf-configbase-atf-bin atf ./usr/bin/atf-reportbase-atf-bin atf ./usr/bin/atf-runbase-atf-bin atf +./usr/bin/atf-shbase-atf-bin atf ./usr/bin/atf-versionbase-atf-bin atf ./usr/bin/atq base-cron-bin ./usr/bin/atrm base-cron-bin @@ -1363,9 +1364,10 @@ ./usr/share/atf base-atf-share ./usr/share/atf/atf-run.hooks base-atf-bin share,atf ./usr/share/atf/atf.config.subr base-obsolete obsolete -./usr/share/atf/atf.footer.subr base-atf-share share,atf -./usr/share/atf/atf.header.subr base-atf-share share,atf -./usr/share/atf/atf.init.subr base-atf-share share,atf +./usr/share/atf/atf.footer.subr base-obsolete obsolete +./usr/share/atf/atf.header.subr base-obsolete obsolete +./usr/share/atf/atf.init.subr base-obsolete obsolete +./usr/share/atf/libatf-sh.subr base-atf-share atf ./usr/share/calendarbase-calendar-share ./usr/share/calendar/calendar.birthday base-calendar-share share ./usr/share/calendar/calendar.christian base-calendar-share share Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1455 src/distrib/sets/lists/comp/mi:1.1456 --- src/distrib/sets/lists/comp/mi:1.1455 Tue Jun 1 13:52:07 2010 +++ src/distrib/sets/lists/comp/mi Fri Jun 4 08:37:09 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1455 2010/06/01 13:52:07 tnozaki Exp $ +# $NetBSD: mi,v 1.1456 2010/06/04 08:37:09 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -7,7 +7,7 @@ ./usr/bin/ar comp-util-bin binutils ./usr/bin/as comp-util-bin binutils ./usr/bin/asa comp-fortran-bin -./usr/bin/atf-compilecomp-atf-bin atf +./usr/bin/atf-compilecomp-obsolete obsolete ./usr/bin/c++ comp-cxx-bin gcccmds ./usr/bin/c++filtcomp-cxx-bin binutils ./usr/bin/c89 comp-c-bin @@ -153,7 +153,7 @@ ./usr/include/atf-c/list.h comp-atf-include atf ./usr/include/atf-c/macros.h comp-atf-include atf ./usr/include/atf-c/map.h comp-atf-include atf -./usr/include/atf-c/object.h comp-atf-include atf +./usr/include/atf-c/object.h comp-obsolete obsolete ./usr/include/atf-c/process.h comp-atf-include atf ./usr/include/atf-c/sanity.h comp-atf-include atf ./usr/include/atf-c/signals.h comp-atf-include obsolete @@ -2971,10 +2971,11 @@ ./usr/libdata/debug/usr/bin/asa.debug comp-fortran-debug debug ./usr/libdata/debug/usr/bin/at.debug comp-cron-debug debug ./usr/libdata/debug/usr/bin/atf-check.debug comp-atf-debug atf,debug -./usr/libdata/debug/usr/bin/atf-compile.debug comp-atf-debug atf,debug +./usr/libdata/debug/usr/bin/atf-compile.debug comp-obsolete obsolete ./usr/libdata/debug/usr/bin/atf-config.debug comp-atf-debug atf,debug ./usr/libdata/debug/usr/bin/atf-report.debug comp-atf-debug atf,debug ./usr/libdata/debug/usr/bin/atf-run.debug comp-atf-debug atf,debug +./usr/libdata/debug/usr/bin/atf-sh.debug comp-atf-debug atf,debug ./usr/libdata/debug/usr/bin/atf-version.debug comp-atf-debug atf,debug ./usr/libdata/debug/usr/bin/audioctl.debug comp-audio-debug debug ./usr/libdata/debug/usr/bin/audioplay.debug comp-audio-debug debug Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1214 src/distrib/sets/lists/man/mi:1.1215 --- src/distrib/sets/lists/man/mi:1.1214 Tue Jun 1 23:29:09 2010 +++ src/distrib/sets/lists/man/mi Fri Jun 4 08:37:10 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1214 2010/06/01 23:29:09 joerg Exp $ +# $NetBSD: mi,v 1.1215 2010/06/04 08:37:10 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -51,13 +51,14 @@ ./usr/share/man/cat1/atari/msconfig.0 man-sysutil-catman .cat ./usr/share/man/cat1/atf-check.0 man-atf-catman
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Fri Jun 4 08:40:24 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Note import of atf 0.9. To generate a diff of this commit: cvs rdiff -u -r1.1397 -r1.1398 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1397 src/doc/CHANGES:1.1398 --- src/doc/CHANGES:1.1397 Fri May 28 04:12:58 2010 +++ src/doc/CHANGES Fri Jun 4 08:40:24 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1397 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1398 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -622,3 +622,4 @@ [mrg 20100523] X11: Added support for xf86-video-geode and xf86-video-openchrome. [mrg 20100527] + atf(7): Import 0.9. [jmmv 20100604]
CVS commit: src
Module Name:src Committed By: jmmv Date: Fri Jun 4 15:11:31 UTC 2010 Modified Files: src: UPDATING Log Message: atf 0.9 includes a backwards incompatible change that requires rebuilding the sh tests. Add a note to tell users to clean up the old files, as otherwise the rebuilds will not be triggered. To generate a diff of this commit: cvs rdiff -u -r1.212 -r1.213 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.212 src/UPDATING:1.213 --- src/UPDATING:1.212 Sat May 22 11:10:59 2010 +++ src/UPDATING Fri Jun 4 15:11:31 2010 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.212 2010/05/22 11:10:59 mrg Exp $ +$NetBSD: UPDATING,v 1.213 2010/06/04 15:11:31 jmmv Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -16,6 +16,12 @@ Recent changes: ^^^ +20100604: + The update of ATF to 0.9 causes old tests written in shell to fail + unless they are rebuilt. If you are building with MKUPDATE=yes, + you need to clean the src/external/bsd/atf/tests/ and the src/tests/ + trees by hand. + 20100522: Recent Xorg updates in xsrc/external/mit/ will cause various build problems. Delete your entire DESTDIR and OBJDIR if you have any
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Sat May 8 08:05:40 UTC 2010 Update of /cvsroot/src/external/bsd/atf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18487 Log Message: Import atf 0.8. Changes in this release: * Test programs no longer run several test cases in a row. The execution of a test program now requires a test case name, and that single test case is executed. To execute several test cases, use the atf-run utility as usual. * Test programs no longer fork a subprocess to isolate the execution of test cases. They run the test case code in-process, and a crash of the test case will result in a crash of the test program. This is to ease debugging of faulty test cases. * Test programs no longer isolate their test cases. This means that they will not create temporary directories nor sanitize the environment any more. Yes: running a test case that depends on system state by hand will most likely yield different results depending on where (machine, directory, user environment, etc.) it is run. Isolation has been moved to atf-run. * Test programs no longer print a cryptic format (application/X-atf-tcs) on a special file channel. They can now print whatever they want on the screen. Because test programs can now only run one test case every time, providing controlled output is not necessary any more. * Test programs no longer write their status into a special file descriptor. Instead, they create a file with the results, which is later parsed by atf-run. This changes the semantics of the -r flag. * atf-run has been adjusted to perform the test case isolation. As a result, there is now a single canonical place that implements the isolation of test caes. In previous releases, the three language bindings (C, C++ and shell) had to be kept in sync with each other (read: not a nice thing to do at all). As a side effect of this change, writing bindings for other languages will be much, much easier from now on. * atf-run forks test programs on a test case basis, instead of on a test program basis as it did before. This is to provide the test case isolation that was before implemented by the test programs themselves. * Removed the atf-exec tool. This was used to implement test case isolation in atf-sh, but it is now unnecessary. * It is now optional to define the descr meta-data property. It has been proven to be mostly useless, because test cases often carry a descriptive name of their own. Status: Vendor Tag: TNF Release Tags: atf-0-8 U src/external/bsd/atf/dist/configure.ac U src/external/bsd/atf/dist/README U src/external/bsd/atf/dist/Makefile.am.m4 U src/external/bsd/atf/dist/aclocal.m4 U src/external/bsd/atf/dist/atf-c.h U src/external/bsd/atf/dist/atf-c++.hpp U src/external/bsd/atf/dist/Makefile.am U src/external/bsd/atf/dist/Makefile.in U src/external/bsd/atf/dist/bconfig.h.in U src/external/bsd/atf/dist/configure U src/external/bsd/atf/dist/AUTHORS U src/external/bsd/atf/dist/COPYING U src/external/bsd/atf/dist/INSTALL U src/external/bsd/atf/dist/NEWS U src/external/bsd/atf/dist/admin/config.guess U src/external/bsd/atf/dist/admin/compile U src/external/bsd/atf/dist/admin/check-install.sh U src/external/bsd/atf/dist/admin/config.sub U src/external/bsd/atf/dist/admin/depcomp U src/external/bsd/atf/dist/admin/install-sh U src/external/bsd/atf/dist/admin/ltmain.sh U src/external/bsd/atf/dist/admin/missing U src/external/bsd/atf/dist/admin/check-style-common.awk U src/external/bsd/atf/dist/admin/check-style-c.awk U src/external/bsd/atf/dist/admin/check-style-cpp.awk U src/external/bsd/atf/dist/admin/check-style-man.awk U src/external/bsd/atf/dist/admin/check-style-shell.awk U src/external/bsd/atf/dist/admin/check-style.sh U src/external/bsd/atf/dist/admin/choose-revision.sh U src/external/bsd/atf/dist/admin/generate-makefile.sh U src/external/bsd/atf/dist/admin/generate-revision.sh U src/external/bsd/atf/dist/admin/revision-dist.h U src/external/bsd/atf/dist/admin/generate-revision-dist.sh U src/external/bsd/atf/dist/atf-c/error_fwd.h U src/external/bsd/atf/dist/atf-c/build.h U src/external/bsd/atf/dist/atf-c/check.h U src/external/bsd/atf/dist/atf-c/config.h U src/external/bsd/atf/dist/atf-c/dynstr.h U src/external/bsd/atf/dist/atf-c/env.h U src/external/bsd/atf/dist/atf-c/error.h U src/external/bsd/atf/dist/atf-c/list.h U src/external/bsd/atf/dist/atf-c/fs.h U src/external/bsd/atf/dist/atf-c/io.h U src/external/bsd/atf/dist/atf-c/process.h U src/external/bsd/atf/dist/atf-c/macros.h U src/external/bsd/atf/dist/atf-c/map.h U src/external/bsd/atf/dist/atf-c/object.h U src/external/bsd/atf/dist/atf-c/atf-c-api.3 U src/external/bsd/atf/dist/atf-c/sanity.h U src/external/bsd/atf/dist/atf-c/tc.h U src/external/bsd/atf/dist/atf-c/tcr.h U src/external/bsd/atf/dist/atf-c/text.h U src/external/bsd/atf/dist/atf-c/tp.h U src/external/bsd/atf/dist/atf-c/ui.h U src/external/bsd/atf/dist/atf-c/user.h U
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Sat May 8 08:11:05 UTC 2010 Modified Files: src/external/bsd/atf/dist/atf-c: tc.c Removed Files: src/external/bsd/atf/dist: revision.h src/external/bsd/atf/dist/atf-c: expand.c expand.h signals.c signals.h src/external/bsd/atf/dist/tests/atf/atf-c: d_include_expand_h.c d_include_signals_h.c t_expand.c t_signals.c src/external/bsd/atf/dist/tests/atf/formats: d_tcs_1 d_tcs_1.errin d_tcs_1.expout d_tcs_1.outin d_tcs_2 d_tcs_2.errin d_tcs_2.expout d_tcs_2.outin d_tcs_3 d_tcs_3.errin d_tcs_3.expout d_tcs_3.outin d_tcs_4 d_tcs_4.errin d_tcs_4.expout d_tcs_4.outin d_tcs_5 d_tcs_5.errin d_tcs_5.expout d_tcs_5.outin d_tcs_50 d_tcs_50.experr d_tcs_51 d_tcs_51.experr d_tcs_52 d_tcs_52.experr d_tcs_53 d_tcs_53.experr d_tcs_53.expout d_tcs_54 d_tcs_54.experr d_tcs_54.expout d_tcs_55 d_tcs_55.experr d_tcs_55.expout d_tcs_56 d_tcs_56.errin d_tcs_56.experr d_tcs_56.expout d_tcs_56.outin d_tcs_57 d_tcs_57.errin d_tcs_57.experr d_tcs_57.expout d_tcs_57.outin src/external/bsd/atf/dist/tests/atf/test_programs: t_cleanup.sh t_env.sh t_workdir.sh src/external/bsd/atf/dist/tests/atf/tools: Atffile h_fail.cpp h_misc.cpp h_mode.cpp h_pass.cpp t_atf_check.sh t_atf_cleanup.sh t_atf_compile.sh t_atf_config.sh t_atf_exec.sh t_atf_report.sh t_atf_run.sh src/external/bsd/atf/dist/tools: atf-check.1 atf-check.cpp atf-cleanup.1 atf-cleanup.cpp atf-compile.1 atf-compile.cpp atf-config.1 atf-config.cpp atf-exec.1 atf-exec.cpp atf-format.1 atf-format.cpp atf-host-compile.sh atf-report.1 atf-report.cpp atf-run.1 atf-run.cpp atf-run.hooks atf-version.1 atf-version.cpp Log Message: Merge atf 0.8. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/revision.h cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-c/expand.c cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/atf-c/expand.h \ src/external/bsd/atf/dist/atf-c/signals.c \ src/external/bsd/atf/dist/atf-c/signals.h cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-c/tc.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/atf/dist/tests/atf/atf-c/d_include_expand_h.c \ src/external/bsd/atf/dist/tests/atf/atf-c/d_include_signals_h.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/atf/dist/tests/atf/atf-c/t_expand.c \ src/external/bsd/atf/dist/tests/atf/atf-c/t_signals.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_1 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_1.errin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_1.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_1.outin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_2 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_2.errin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_2.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_2.outin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_3 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_3.errin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_3.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_3.outin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_4 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_4.errin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_4.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_4.outin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_5 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_5.errin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_5.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_5.outin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_50 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_50.experr \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_51 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_51.experr \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_52 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_52.experr \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_53 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_53.experr \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_53.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_54 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_54.experr \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_54.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_55 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_55.experr \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_55.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_56 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_56.errin
CVS commit: src/external/bsd/atf
Module Name:src Committed By: jmmv Date: Sat May 8 08:12:35 UTC 2010 Modified Files: src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h src/external/bsd/atf/libexec: Makefile src/external/bsd/atf/libexec/atf-cleanup: Makefile src/external/bsd/atf/libexec/atf-format: Makefile src/external/bsd/atf/tests/atf: Makefile src/external/bsd/atf/tests/atf/atf-c: Makefile src/external/bsd/atf/tests/atf/formats: Makefile src/external/bsd/atf/tests/atf/test_programs: Makefile src/external/bsd/atf/usr.bin/atf-check: Makefile src/external/bsd/atf/usr.bin/atf-compile: Makefile src/external/bsd/atf/usr.bin/atf-config: Makefile src/external/bsd/atf/usr.bin/atf-report: Makefile src/external/bsd/atf/usr.bin/atf-run: Makefile src/external/bsd/atf/usr.bin/atf-version: Makefile Added Files: src/external/bsd/atf/tests/atf/atf-check: Makefile src/external/bsd/atf/tests/atf/atf-cleanup: Makefile src/external/bsd/atf/tests/atf/atf-compile: Makefile src/external/bsd/atf/tests/atf/atf-config: Makefile src/external/bsd/atf/tests/atf/atf-report: Makefile src/external/bsd/atf/tests/atf/atf-run: Makefile Removed Files: src/external/bsd/atf/libexec/atf-exec: Makefile Log Message: Update reachover Makefiles for atf 0.8. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/lib/libatf-c/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/lib/libatf-c/bconfig.h cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/libexec/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/libexec/atf-cleanup/Makefile cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/libexec/atf-exec/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/libexec/atf-format/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/tests/atf/atf-c/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-check/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-cleanup/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-compile/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-config/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-report/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-run/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/formats/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/atf/tests/atf/test_programs/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-check/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-compile/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-config/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-report/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/usr.bin/atf-run/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-version/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/lib/libatf-c/Makefile diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.3 src/external/bsd/atf/lib/libatf-c/Makefile:1.4 --- src/external/bsd/atf/lib/libatf-c/Makefile:1.3 Tue Dec 22 13:38:10 2009 +++ src/external/bsd/atf/lib/libatf-c/Makefile Sat May 8 08:12:33 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2009/12/22 13:38:10 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2010/05/08 08:12:33 jmmv Exp $ NOLINT= # defined @@ -40,7 +40,6 @@ dynstr.c \ env.c \ error.c \ - expand.c \ fs.c \ io.c \ list.c \ @@ -48,7 +47,6 @@ object.c \ process.c \ sanity.c \ - signals.c \ text.c \ ui.c \ user.c \ @@ -65,7 +63,6 @@ env.h \ error.h \ error_fwd.h \ - expand.h \ fs.h \ io.h \ list.h \ @@ -74,7 +71,6 @@ object.h \ process.h \ sanity.h \ - signals.h \ tc.h \ tcr.h \ text.h \ Index: src/external/bsd/atf/lib/libatf-c/bconfig.h diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.2 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.3 --- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.2 Tue Dec 22 13:38:10 2009 +++ src/external/bsd/atf/lib/libatf-c/bconfig.h Sat May 8 08:12:33 2010 @@ -73,6 +73,10 @@ /* Define to the last valid signal number */ #define LAST_SIGNO 63 +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR .libs/ + /* Define to 1 if your C compiler doesn't accept -c and -o together. */ /* #undef NO_MINUS_C_MINUS_O */ @@ -83,25 +87,25 @@ #define PACKAGE_BUGREPORT atf-de...@netbsd.org /* Define to the copyright string applicable to this package. */ -#define PACKAGE_COPYRIGHT Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc. +#define PACKAGE_COPYRIGHT Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc. /* Define to the full
CVS commit: src/etc/mtree
Module Name:src Committed By: jmmv Date: Sat May 8 08:13:12 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Update directories to match the atf 0.8 layout. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.18 src/etc/mtree/NetBSD.dist.base:1.19 --- src/etc/mtree/NetBSD.dist.base:1.18 Tue Apr 27 02:51:04 2010 +++ src/etc/mtree/NetBSD.dist.base Sat May 8 08:13:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.18 2010/04/27 02:51:04 lukem Exp $ +# $NetBSD: NetBSD.dist.base,v 1.19 2010/05/08 08:13:12 jmmv Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -193,9 +193,11 @@ ./usr/libdata/debug/usr/tests/atf ./usr/libdata/debug/usr/tests/atf/atf-c ./usr/libdata/debug/usr/tests/atf/atf-c++ +./usr/libdata/debug/usr/tests/atf/atf-compile +./usr/libdata/debug/usr/tests/atf/atf-report +./usr/libdata/debug/usr/tests/atf/atf-run ./usr/libdata/debug/usr/tests/atf/formats ./usr/libdata/debug/usr/tests/atf/test_programs -./usr/libdata/debug/usr/tests/atf/tools ./usr/libdata/debug/usr/tests/crypto ./usr/libdata/debug/usr/tests/crypto/libcrypto ./usr/libdata/debug/usr/tests/fs @@ -1082,11 +1084,16 @@ ./usr/tests/atf ./usr/tests/atf/atf-c ./usr/tests/atf/atf-c++ +./usr/tests/atf/atf-check +./usr/tests/atf/atf-cleanup +./usr/tests/atf/atf-compile +./usr/tests/atf/atf-config +./usr/tests/atf/atf-report +./usr/tests/atf/atf-run ./usr/tests/atf/atf-sh ./usr/tests/atf/data ./usr/tests/atf/formats ./usr/tests/atf/test_programs -./usr/tests/atf/tools ./usr/tests/crypto ./usr/tests/crypto/libcrypto ./usr/tests/fs
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: jmmv Date: Sat May 8 08:14:37 UTC 2010 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/tests: mi Log Message: Update file lists to match atf 0.8. To generate a diff of this commit: cvs rdiff -u -r1.864 -r1.865 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1441 -r1.1442 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1206 -r1.1207 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.864 src/distrib/sets/lists/base/mi:1.865 --- src/distrib/sets/lists/base/mi:1.864 Fri May 7 17:41:57 2010 +++ src/distrib/sets/lists/base/mi Sat May 8 08:14:37 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.864 2010/05/07 17:41:57 degroote Exp $ +# $NetBSD: mi,v 1.865 2010/05/08 08:14:37 jmmv Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -878,7 +878,7 @@ ./usr/libdata/lintbase-c-usr ./usr/libexec base-sys-usr ./usr/libexec/atf-cleanup base-atf-bin atf -./usr/libexec/atf-execbase-atf-bin atf +./usr/libexec/atf-execbase-atf-bin obsolete ./usr/libexec/atf-format base-atf-bin atf ./usr/libexec/atf-killpg base-obsolete obsolete ./usr/libexec/atrunbase-cron-bin Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1441 src/distrib/sets/lists/comp/mi:1.1442 --- src/distrib/sets/lists/comp/mi:1.1441 Mon May 3 05:01:53 2010 +++ src/distrib/sets/lists/comp/mi Sat May 8 08:14:36 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1441 2010/05/03 05:01:53 jruoho Exp $ +# $NetBSD: mi,v 1.1442 2010/05/08 08:14:36 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -147,7 +147,7 @@ ./usr/include/atf-c/env.h comp-atf-include atf ./usr/include/atf-c/error.h comp-atf-include atf ./usr/include/atf-c/error_fwd.h comp-atf-include atf -./usr/include/atf-c/expand.h comp-atf-include atf +./usr/include/atf-c/expand.h comp-atf-include obsolete ./usr/include/atf-c/fs.h comp-atf-include atf ./usr/include/atf-c/io.h comp-atf-include atf ./usr/include/atf-c/list.h comp-atf-include atf @@ -156,7 +156,7 @@ ./usr/include/atf-c/object.h comp-atf-include atf ./usr/include/atf-c/process.h comp-atf-include atf ./usr/include/atf-c/sanity.h comp-atf-include atf -./usr/include/atf-c/signals.h comp-atf-include atf +./usr/include/atf-c/signals.h comp-atf-include obsolete ./usr/include/atf-c/tc.h comp-atf-include atf ./usr/include/atf-c/tcr.h comp-atf-include atf ./usr/include/atf-c/text.h comp-atf-include atf @@ -3377,7 +3377,7 @@ ./usr/libdata/debug/usr/games/worms.debug comp-games-debug debug ./usr/libdata/debug/usr/games/wump.debug comp-games-debug debug ./usr/libdata/debug/usr/libexec/atf-cleanup.debug comp-atf-debug debug -./usr/libdata/debug/usr/libexec/atf-exec.debug comp-atf-debug debug +./usr/libdata/debug/usr/libexec/atf-exec.debug comp-atf-debug obsolete ./usr/libdata/debug/usr/libexec/atf-format.debug comp-atf-debug debug ./usr/libdata/debug/usr/libexec/atf-killpg.debug comp-obsolete obsolete ./usr/libdata/debug/usr/libexec/atrun.debug comp-cron-debug debug Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1206 src/distrib/sets/lists/man/mi:1.1207 --- src/distrib/sets/lists/man/mi:1.1206 Fri May 7 17:41:57 2010 +++ src/distrib/sets/lists/man/mi Sat May 8 08:14:36 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1206 2010/05/07 17:41:57 degroote Exp $ +# $NetBSD: mi,v 1.1207 2010/05/08 08:14:36 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -53,7 +53,7 @@ ./usr/share/man/cat1/atf-cleanup.0 man-atf-catman .cat,atf ./usr/share/man/cat1/atf-compile.0 man-atf-catman .cat,atf ./usr/share/man/cat1/atf-config.0 man-atf-catman .cat,atf -./usr/share/man/cat1/atf-exec.0 man-atf-catman .cat,atf +./usr/share/man/cat1/atf-exec.0 man-atf-catman obsolete ./usr/share/man/cat1/atf-format.0 man-atf-catman .cat,atf ./usr/share/man/cat1/atf-killpg.0 man-obsolete obsolete ./usr/share/man/cat1/atf-report.0 man-atf-catman .cat,atf @@ -2792,7 +2792,7 @@ ./usr/share/man/html1/atf-cleanup.html man-atf-htmlman html,atf ./usr/share/man/html1/atf-compile.html man-atf-htmlman html,atf ./usr/share/man/html1/atf-config.html man-atf-htmlman html,atf -./usr/share/man/html1/atf-exec.html man-atf-htmlman html,atf +./usr/share/man/html1/atf-exec.html man-atf-htmlman obsolete ./usr/share/man/html1/atf-format.html man-atf-htmlman html,atf ./usr/share/man/html1/atf-killpg.html man-obsolete obsolete ./usr/share/man/html1/atf-report.html man-atf-htmlman html,atf @@
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Sat May 8 08:16:14 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Note update of atf to 0.8. To generate a diff of this commit: cvs rdiff -u -r1.1392 -r1.1393 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1392 src/doc/CHANGES:1.1393 --- src/doc/CHANGES:1.1392 Thu May 6 18:59:50 2010 +++ src/doc/CHANGES Sat May 8 08:16:14 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1392 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1393 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -608,3 +608,4 @@ xen: Enable no-execute bit feature for i386pae and amd64 kernels. [jym 20100505] cron: Import 4.1 from isc. [christos 20100506] + atf(7): Import 0.8. [jmmv 20100508]
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: jmmv Date: Sat May 8 08:16:41 UTC 2010 Modified Files: src/distrib/sets/lists/comp: md.shark Log Message: Add missing debug libraries for MKDEBUG=yes. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/comp/md.shark Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.shark diff -u src/distrib/sets/lists/comp/md.shark:1.13 src/distrib/sets/lists/comp/md.shark:1.14 --- src/distrib/sets/lists/comp/md.shark:1.13 Fri Oct 31 20:24:52 2008 +++ src/distrib/sets/lists/comp/md.shark Sat May 8 08:16:41 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.shark,v 1.13 2008/10/31 20:24:52 mrg Exp $ +# $NetBSD: md.shark,v 1.14 2010/05/08 08:16:41 jmmv Exp $ ./usr/include/sharkcomp-c-include ./usr/include/shark/ansi.h comp-c-include ./usr/include/shark/aout_machdep.h comp-c-include @@ -50,5 +50,7 @@ ./usr/include/shark/vmparam.h comp-c-include ./usr/include/shark/wchar_limits.h comp-c-include ./usr/include/ieeefp.hcomp-c-include +./usr/libdata/debug/usr/lib/libarm.so.0.0.debug comp-sys-debug debug,pic +./usr/libdata/debug/usr/lib/libpmc.so.1.0.debug comp-sys-debug debug,pic ./usr/libdata/debug/sbin/ldconfig.debug comp-sysutil-debug debug,pic ./usr/libdata/debug/usr/sbin/ofctl.debug comp-sysutil-debug debug
CVS commit: src/tools/atf-compile
Module Name:src
Committed By: jmmv
Date: Sat May 8 08:20:18 UTC 2010
Modified Files:
src/tools/atf-compile: Makefile
Log Message:
Adjust paths to new location of the atf-compile sources in atf 0.8.
(You may be happy to know that this tool will probably disappear in
the next atf release!)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tools/atf-compile/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/atf-compile/Makefile
diff -u src/tools/atf-compile/Makefile:1.6 src/tools/atf-compile/Makefile:1.7
--- src/tools/atf-compile/Makefile:1.6 Mon Jan 19 07:14:46 2009
+++ src/tools/atf-compile/Makefile Sat May 8 08:20:18 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/01/19 07:14:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2010/05/08 08:20:18 jmmv Exp $
CLEANFILES+= atf-host-compile
CLEANFILES+= atf-host-compile.tmp
@@ -14,7 +14,7 @@
fi \
${TOOL_SED} -e s,__ATF_PKGDATADIR__,${SRCDIR}/atf-sh,g \
-e s,__ATF_SHELL__,${HOST_SH},g \
- ${SRCDIR}/tools/atf-host-compile.sh \
+ ${SRCDIR}/atf-compile/atf-host-compile.sh \
atf-host-compile.tmp \
chmod +x atf-host-compile.tmp \
mv atf-host-compile.tmp atf-host-compile
@@ -28,4 +28,4 @@
${HOST_INSTALL_FILE} -m ${BINMODE} atf-host-compile ${.TARGET}
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tools
+.PATH: ${SRCDIR}/atf-compile
CVS commit: src/external/bsd/atf/usr.bin/atf-run
Module Name:src
Committed By: jmmv
Date: Sat May 8 16:57:24 UTC 2010
Modified Files:
src/external/bsd/atf/usr.bin/atf-run: Makefile
Log Message:
Make the .pc file rules depend on the Makefile so that when rebuilding
the tree with MKUPDATE=yes set after an atf upgrade, the .pc files get
the correct version in them.
Suggested by njoly@ in private mail.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/usr.bin/atf-run/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/usr.bin/atf-run/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-run/Makefile:1.4 src/external/bsd/atf/usr.bin/atf-run/Makefile:1.5
--- src/external/bsd/atf/usr.bin/atf-run/Makefile:1.4 Sat May 8 08:12:35 2010
+++ src/external/bsd/atf/usr.bin/atf-run/Makefile Sat May 8 16:57:24 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/05/08 08:12:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2010/05/08 16:57:24 jmmv Exp $
.include bsd.own.mk
@@ -32,7 +32,7 @@
FILESDIR_atf-c++.pc= /usr/lib/pkgconfig
realall: atf-c.pc
-atf-c.pc: atf-c.pc.in
+atf-c.pc: Makefile atf-c.pc.in
${TOOL_SED} -e 's,__ATF_VERSION__,0.8,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
@@ -41,7 +41,7 @@
CLEANFILES+= atf-c.pc
realall: atf-c++.pc
-atf-c++.pc: atf-c++.pc.in
+atf-c++.pc: Makefile atf-c++.pc.in
${TOOL_SED} -e 's,__ATF_VERSION__,0.8,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: jmmv Date: Thu May 6 09:25:00 UTC 2010 Modified Files: src/distrib/sets/lists/comp: md.amd64 Log Message: Add missing debuglib libraries to fix MKDEBUGLIB=yes builds. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/comp/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.65 src/distrib/sets/lists/comp/md.amd64:1.66 --- src/distrib/sets/lists/comp/md.amd64:1.65 Wed Apr 28 09:55:25 2010 +++ src/distrib/sets/lists/comp/md.amd64 Thu May 6 09:25:00 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.65 2010/04/28 09:55:25 lukem Exp $ +# $NetBSD: md.amd64,v 1.66 2010/05/06 09:25:00 jmmv Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -240,143 +240,179 @@ ./usr/lib/i386/gcrt0.ocomp-c-lib compat ./usr/lib/i386/i18n/libBIG5.a comp-c-lib compat ./usr/lib/i386/i18n/libBIG5.so comp-sys-shlib compat,pic +./usr/lib/i386/i18n/libBIG5_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/i18n/libBIG5_p.a comp-obsolete obsolete ./usr/lib/i386/i18n/libBIG5_pic.a comp-obsolete obsolete ./usr/lib/i386/i18n/libDECHanyu.a comp-c-lib compat ./usr/lib/i386/i18n/libDECHanyu.so comp-sys-shlib compat,pic +./usr/lib/i386/i18n/libDECHanyu_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/i18n/libDECHanyu_p.a comp-obsolete obsolete ./usr/lib/i386/i18n/libDECHanyu_pic.a comp-obsolete obsolete ./usr/lib/i386/i18n/libEUC.a comp-c-lib compat ./usr/lib/i386/i18n/libEUC.so comp-sys-shlib compat,pic +./usr/lib/i386/i18n/libEUC_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/i18n/libEUCTW.a comp-c-lib compat ./usr/lib/i386/i18n/libEUCTW.so comp-sys-shlib compat,pic +./usr/lib/i386/i18n/libEUCTW_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/i18n/libEUCTW_p.a comp-obsolete obsolete ./usr/lib/i386/i18n/libEUCTW_pic.a comp-obsolete obsolete ./usr/lib/i386/i18n/libEUC_p.a comp-obsolete obsolete ./usr/lib/i386/i18n/libEUC_pic.a comp-obsolete obsolete ./usr/lib/i386/i18n/libGBK2K.a comp-c-lib compat ./usr/lib/i386/i18n/libGBK2K.so comp-sys-shlib compat,pic +./usr/lib/i386/i18n/libGBK2K_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/i18n/libGBK2K_p.a comp-obsolete obsolete ./usr/lib/i386/i18n/libGBK2K_pic.a comp-obsolete obsolete ./usr/lib/i386/i18n/libHZ.a comp-c-lib compat ./usr/lib/i386/i18n/libHZ.so comp-sys-shlib compat,pic +./usr/lib/i386/i18n/libHZ_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/i18n/libHZ_p.a comp-obsolete obsolete ./usr/lib/i386/i18n/libHZ_pic.a comp-obsolete obsolete ./usr/lib/i386/i18n/libISO2022.a comp-c-lib compat ./usr/lib/i386/i18n/libISO2022.so comp-sys-shlib compat,pic +./usr/lib/i386/i18n/libISO2022_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/i18n/libISO2022_p.a comp-obsolete obsolete ./usr/lib/i386/i18n/libISO2022_pic.a comp-obsolete obsolete ./usr/lib/i386/i18n/libJOHAB.a comp-c-lib compat ./usr/lib/i386/i18n/libJOHAB.so comp-sys-shlib compat,pic +./usr/lib/i386/i18n/libJOHAB_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/i18n/libJOHAB_p.a comp-obsolete obsolete ./usr/lib/i386/i18n/libJOHAB_pic.a comp-obsolete obsolete ./usr/lib/i386/i18n/libMSKanji.a comp-c-lib compat ./usr/lib/i386/i18n/libMSKanji.so comp-sys-shlib compat,pic +./usr/lib/i386/i18n/libMSKanji_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/i18n/libMSKanji_p.a comp-obsolete obsolete ./usr/lib/i386/i18n/libMSKanji_pic.a comp-obsolete obsolete ./usr/lib/i386/i18n/libUES.a comp-c-lib compat ./usr/lib/i386/i18n/libUES.so comp-sys-shlib compat,pic +./usr/lib/i386/i18n/libUES_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/i18n/libUES_p.a comp-obsolete obsolete ./usr/lib/i386/i18n/libUES_pic.a comp-obsolete obsolete ./usr/lib/i386/i18n/libUTF1632.a comp-c-lib compat ./usr/lib/i386/i18n/libUTF1632.so comp-sys-shlib compat,pic +./usr/lib/i386/i18n/libUTF1632_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/i18n/libUTF1632_p.a comp-obsolete obsolete ./usr/lib/i386/i18n/libUTF1632_pic.a comp-obsolete obsolete ./usr/lib/i386/i18n/libUTF7.a comp-c-lib compat ./usr/lib/i386/i18n/libUTF7.so comp-sys-shlib compat,pic +./usr/lib/i386/i18n/libUTF7_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/i18n/libUTF7_p.a comp-obsolete obsolete ./usr/lib/i386/i18n/libUTF7_pic.a comp-obsolete obsolete ./usr/lib/i386/i18n/libUTF8.a comp-c-lib compat ./usr/lib/i386/i18n/libUTF8.so comp-sys-shlib compat,pic +./usr/lib/i386/i18n/libUTF8_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/i18n/libUTF8_p.a comp-obsolete obsolete ./usr/lib/i386/i18n/libUTF8_pic.a comp-obsolete obsolete
CVS commit: src/tests/sys/rc
Module Name:src
Committed By: jmmv
Date: Tue May 4 09:33:57 UTC 2010
Modified Files:
src/tests/sys/rc: t_rc_d_cli.sh
Log Message:
Fix execution of the installed tests by using h_{simple,args} as program
names, without the .sh extension.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/sys/rc/t_rc_d_cli.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sys/rc/t_rc_d_cli.sh
diff -u src/tests/sys/rc/t_rc_d_cli.sh:1.1 src/tests/sys/rc/t_rc_d_cli.sh:1.2
--- src/tests/sys/rc/t_rc_d_cli.sh:1.1 Mon Mar 15 19:03:08 2010
+++ src/tests/sys/rc/t_rc_d_cli.sh Tue May 4 09:33:57 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_rc_d_cli.sh,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+# $NetBSD: t_rc_d_cli.sh,v 1.2 2010/05/04 09:33:57 jmmv Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -34,7 +34,7 @@
}
no_command_body() {
export h_simple=YES
- rc_helper=$(atf_get_srcdir)/h_simple.sh
+ rc_helper=$(atf_get_srcdir)/h_simple
atf_check -s eq:1 -o empty -e ignore ${rc_helper}
}
@@ -46,7 +46,7 @@
}
default_start_no_args_body() {
export h_simple=YES
- rc_helper=$(atf_get_srcdir)/h_simple.sh
+ rc_helper=$(atf_get_srcdir)/h_simple
atf_check -s eq:0 -o ignore -e empty ${rc_helper} start
${rc_helper} forcestop
@@ -59,7 +59,7 @@
}
default_start_with_args_body() {
export h_simple=YES
- rc_helper=$(atf_get_srcdir)/h_simple.sh
+ rc_helper=$(atf_get_srcdir)/h_simple
atf_check -s eq:1 -o ignore -e ignore ${rc_helper} start foo
if ${rc_helper} status /dev/null; then
@@ -75,7 +75,7 @@
}
default_stop_no_args_body() {
export h_simple=YES
- rc_helper=$(atf_get_srcdir)/h_simple.sh
+ rc_helper=$(atf_get_srcdir)/h_simple
${rc_helper} start
atf_check -s eq:0 -o ignore -e empty ${rc_helper} stop
@@ -88,7 +88,7 @@
}
default_stop_with_args_body() {
export h_simple=YES
- rc_helper=$(atf_get_srcdir)/h_simple.sh
+ rc_helper=$(atf_get_srcdir)/h_simple
${rc_helper} start
atf_check -s eq:1 -o ignore -e ignore ${rc_helper} stop foo
@@ -106,7 +106,7 @@
}
default_restart_no_args_body() {
export h_simple=YES
- rc_helper=$(atf_get_srcdir)/h_simple.sh
+ rc_helper=$(atf_get_srcdir)/h_simple
${rc_helper} start
atf_check -s eq:0 -o ignore -e empty ${rc_helper} restart
@@ -120,7 +120,7 @@
}
default_restart_with_args_body() {
export h_simple=YES
- rc_helper=$(atf_get_srcdir)/h_simple.sh
+ rc_helper=$(atf_get_srcdir)/h_simple
${rc_helper} start
atf_check -s eq:1 -o ignore -e ignore ${rc_helper} restart foo
@@ -131,7 +131,7 @@
local command=${1}; shift
export h_args=YES
- rc_helper=$(atf_get_srcdir)/h_args.sh
+ rc_helper=$(atf_get_srcdir)/h_args
cat expout EOF
pre${command}:.
@@ -145,7 +145,7 @@
local command=${1}; shift
export h_args=YES
- rc_helper=$(atf_get_srcdir)/h_args.sh
+ rc_helper=$(atf_get_srcdir)/h_args
cat expout EOF
pre${command}:.
CVS commit: src/share/man/man8
Module Name:src Committed By: jmmv Date: Mon Mar 15 19:00:20 UTC 2010 Modified Files: src/share/man/man8: rc.subr.8 Log Message: Document that run_rc_command can take extra parameters and will pass those to the command being executed. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/share/man/man8/rc.subr.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man8/rc.subr.8 diff -u src/share/man/man8/rc.subr.8:1.25 src/share/man/man8/rc.subr.8:1.26 --- src/share/man/man8/rc.subr.8:1.25 Mon Oct 5 09:57:18 2009 +++ src/share/man/man8/rc.subr.8 Mon Mar 15 19:00:20 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: rc.subr.8,v 1.25 2009/10/05 09:57:18 apb Exp $ +.\ $NetBSD: rc.subr.8,v 1.26 2010/03/15 19:00:20 jmmv Exp $ .\ .\ Copyright (c) 2002-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd October 5, 2009 +.Dd March 13, 2010 .Dt RC.SUBR 8 .Os .Sh NAME @@ -64,7 +64,7 @@ .It .Ic reverse_list Ar item Op Ar ... .It -.Ic run_rc_command Ar argument +.Ic run_rc_command Ar argument [parameters] .It .Ic run_rc_script Ar file Ar argument .It @@ -338,7 +338,7 @@ Print the list of .Ar items in reverse order. -.It Ic run_rc_command Ar argument +.It Ic run_rc_command Ar argument Op Ar parameter ... Run the .Ar argument method for the current @@ -348,6 +348,8 @@ is extremely flexible, and allows fully functional .Xr rc.d 8 scripts to be implemented in a small amount of shell code. +The optional set of parameters is passed verbatim to the command, but not to its +pre/post hooks. .Pp .Ar argument is searched for in the list of supported commands, which may be one
CVS commit: src/tests
Module Name:src
Committed By: jmmv
Date: Mon Mar 15 19:03:08 UTC 2010
Modified Files:
src/tests: Makefile
Added Files:
src/tests/sys: Atffile Makefile
src/tests/sys/rc: Atffile Makefile h_args.sh h_simple.sh t_rc_d_cli.sh
Log Message:
Add some basic tests for rc.d scripts to validate the execution of
subcommands and the optional argument passing to them from the command
line.
Triggered by the modification of the run_rc_command function in rc.subr
to allow passing in extra parameters to the commands defined in rc.d
scripts.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/tests/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/sys/Atffile src/tests/sys/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/sys/rc/Atffile src/tests/sys/rc/Makefile \
src/tests/sys/rc/h_args.sh src/tests/sys/rc/h_simple.sh \
src/tests/sys/rc/t_rc_d_cli.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/Makefile
diff -u src/tests/Makefile:1.19 src/tests/Makefile:1.20
--- src/tests/Makefile:1.19 Tue Dec 15 03:01:48 2009
+++ src/tests/Makefile Mon Mar 15 19:03:08 2010
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2009/12/15 03:01:48 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2010/03/15 19:03:08 jmmv Exp $
.include bsd.own.mk
SUBDIR= crypto games ipf util
.if ${MKATF} != no
-SUBDIR+= fs net kernel lib libexec rump syscall
+SUBDIR+= fs net kernel lib libexec rump sys syscall
. if ${MACHINE} != evbppc ${MKKMOD} != no
SUBDIR+= modules
Added files:
Index: src/tests/sys/Atffile
diff -u /dev/null src/tests/sys/Atffile:1.1
--- /dev/null Mon Mar 15 19:03:08 2010
+++ src/tests/sys/Atffile Mon Mar 15 19:03:08 2010
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version=1
+X-NetBSD-Id: $NetBSD: Atffile,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+
+prop: test-suite = NetBSD
+
+tp-glob: *
Index: src/tests/sys/Makefile
diff -u /dev/null src/tests/sys/Makefile:1.1
--- /dev/null Mon Mar 15 19:03:08 2010
+++ src/tests/sys/Makefile Mon Mar 15 19:03:08 2010
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/sys
+
+SUBDIR+= rc
+
+.include bsd.test.mk
+.include bsd.subdir.mk
Index: src/tests/sys/rc/Atffile
diff -u /dev/null src/tests/sys/rc/Atffile:1.1
--- /dev/null Mon Mar 15 19:03:08 2010
+++ src/tests/sys/rc/Atffile Mon Mar 15 19:03:08 2010
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version=1
+X-NetBSD-Id: $NetBSD: Atffile,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+
+prop: test-suite = NetBSD
+
+tp-glob: t_*
Index: src/tests/sys/rc/Makefile
diff -u /dev/null src/tests/sys/rc/Makefile:1.1
--- /dev/null Mon Mar 15 19:03:08 2010
+++ src/tests/sys/rc/Makefile Mon Mar 15 19:03:08 2010
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/sys/rc
+
+TESTS_SH= t_rc_d_cli
+
+SCRIPTSDIR= ${TESTSDIR}
+SCRIPTS= h_args.sh \
+ h_simple.sh
+
+.include bsd.subdir.mk
+.include bsd.test.mk
Index: src/tests/sys/rc/h_args.sh
diff -u /dev/null src/tests/sys/rc/h_args.sh:1.1
--- /dev/null Mon Mar 15 19:03:08 2010
+++ src/tests/sys/rc/h_args.sh Mon Mar 15 19:03:08 2010
@@ -0,0 +1,64 @@
+#! /bin/sh
+#
+# $NetBSD: h_args.sh,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Julio Merino.
+#
+# 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+#
+
+#
+# An rc.d script that overrides all standard comands and adds a non-standard
+# command. All of them print the set of arguments passed
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: jmmv Date: Mon Mar 15 19:03:33 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Register the new tests in sys/rc for rc.d scripts. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.61 src/distrib/sets/lists/tests/mi:1.62 --- src/distrib/sets/lists/tests/mi:1.61 Sat Feb 27 12:16:50 2010 +++ src/distrib/sets/lists/tests/mi Mon Mar 15 19:03:33 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.61 2010/02/27 12:16:50 martin Exp $ +# $NetBSD: mi,v 1.62 2010/03/15 19:03:33 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -959,6 +959,13 @@ ./usr/tests/rump/rumpkern/Atffile tests-rump-tests atf ./usr/tests/rump/rumpkern/t_modcmd tests-rump-tests atf ./usr/tests/rump/rumpkern/t_modlinkset tests-rump-tests atf +./usr/tests/systests-sys-tests +./usr/tests/sys/Atffile tests-sys-tests atf +./usr/tests/sys/rctests-sys-tests +./usr/tests/sys/rc/Atffile tests-sys-tests atf +./usr/tests/sys/rc/h_args.sh tests-sys-tests atf +./usr/tests/sys/rc/h_simple.sh tests-sys-tests atf +./usr/tests/sys/rc/t_rc_d_cli tests-sys-tests atf ./usr/tests/syscalltests-syscall-tests ./usr/tests/syscall/Atffile tests-syscall-tests atf ./usr/tests/syscall/t_cmsg tests-syscall-tests atf
CVS commit: src/etc
Module Name:src
Committed By: jmmv
Date: Fri Feb 5 16:29:02 UTC 2010
Modified Files:
src/etc: daily security
src/etc/defaults: daily.conf security.conf
Log Message:
Deprecate the pkgdb_dir settings from daily.conf and security.conf in
favor of the PKG_DBDIR variable in /etc/pkg_install.conf. The purpose
of this is to only have to define the location of the packages database
in a single place and have all other system components pick it up.
pkgdb_dir is still honored if defined and the scripts will spit out a
warning in that case, asking the administrator to migrate to the
PKG_DBDIR setting. We can't remove this compatibility workaround until,
at least, after NetBSD 6 is released.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/etc/daily
cvs rdiff -u -r1.107 -r1.108 src/etc/security
cvs rdiff -u -r1.13 -r1.14 src/etc/defaults/daily.conf
cvs rdiff -u -r1.22 -r1.23 src/etc/defaults/security.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/daily
diff -u src/etc/daily:1.75 src/etc/daily:1.76
--- src/etc/daily:1.75 Wed Jan 27 16:22:41 2010
+++ src/etc/daily Fri Feb 5 16:29:02 2010
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: daily,v 1.75 2010/01/27 16:22:41 jmmv Exp $
+# $NetBSD: daily,v 1.76 2010/02/05 16:29:02 jmmv Exp $
# @(#)daily 8.2 (Berkeley) 1/25/94
#
@@ -30,6 +30,12 @@
MAILTO=root
fi
+if [ -n ${pkgdb_dir} ]; then
+echo WARNING: Setting pkgdb_dir in daily.conf(5) is deprecated
+echo WARNING: Please define PKG_DBDIR in pkg_install.conf(5) instead
+_compat_K_flag=-K ${pkgdb_dir}
+fi
+
echo
echo Uptime: `uptime`
@@ -242,13 +248,11 @@
fi
fi
-: ${pkgdb_dir:=/var/db/pkg}
-
-if pkg_info -K ${pkgdb_dir} -q -E '*'; then
+if pkg_info ${_compat_K_flag} -q -E '*'; then
echo
echo Fetching package vulnerabilities database:
if checkyesno fetch_pkg_vulnerabilities; then
- ( umask 022 pkg_admin -K ${pkgdb_dir} \
+ ( umask 022 pkg_admin ${_compat_K_flag} \
fetch-pkg-vulnerabilities -u )
else
echo fetch_pkg_vulnerabilities is set to NO in daily.conf(5).
Index: src/etc/security
diff -u src/etc/security:1.107 src/etc/security:1.108
--- src/etc/security:1.107 Tue Jan 19 22:08:11 2010
+++ src/etc/security Fri Feb 5 16:29:02 2010
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: security,v 1.107 2010/01/19 22:08:11 jmmv Exp $
+# $NetBSD: security,v 1.108 2010/02/05 16:29:02 jmmv Exp $
# from: @(#)security 8.1 (Berkeley) 6/9/93
#
@@ -25,7 +25,6 @@
# Set reasonable defaults (if they're not set in security.conf)
#
backup_dir=${backup_dir:-/var/backups}
-pkgdb_dir=${pkgdb_dir:-/var/db/pkg} # TODO Inherit from daily.conf.
max_loginlen=${max_loginlen:-8}
max_grouplen=${max_grouplen:-8}
pkg_info=${pkg_info:-/usr/sbin/pkg_info}
@@ -63,6 +62,16 @@
CHANGEFILES=changefiles.$$
SPECIALSPEC=specialspec.$$
+if [ -n ${pkgdb_dir} ]; then
+echo WARNING: Setting pkgdb_dir in security.conf(5) is deprecated
+echo WARNING: Please define PKG_DBDIR in pkg_install.conf(5) instead
+_compat_K_flag=-K ${pkgdb_dir}
+fi
+
+have_pkgs() {
+ $pkg_info ${_compat_K_flag} -q -E '*'
+}
+
# migrate_file old new
# Determine if the ${old} path name needs to be migrated to the
# ${new} path. Also checks if ${old}.current needs migrating,
@@ -910,10 +919,12 @@
# Check for changes in the list of installed pkgs
#
-if checkyesno check_pkgs [ -d $pkgdb_dir ]; then
+if checkyesno check_pkgs have_pkgs; then
pkgs=$work_dir/pkgs
migrate_file $backup_dir/pkgs $pkgs
- ( cd $pkgdb_dir
+ pkg_dbdir=$(pkg_admin config-var PKG_DBDIR)
+ : ${pkg_dbdir:=/var/db/pkg}
+ ( cd $pkg_dbdir
$pkg_info | sort
echo
find . \( -name +REQUIRED_BY -o -name +CONTENTS \) -print0 |
@@ -992,9 +1003,9 @@
done
fi
-if pkg_info -K ${pkgdb_dir} -q -E '*'; then
+if have_pkgs; then
if checkyesno check_pkg_vulnerabilities; then
- pkg_admin -K ${pkgdb_dir} audit ${OUTPUT} 21
+ pkg_admin ${_compat_K_flag} audit ${OUTPUT} 21
if [ -s ${OUTPUT} ]; then
printf \nInstalled vulnerable packages:\n
cat ${OUTPUT}
@@ -1002,7 +1013,7 @@
fi
if checkyesno check_pkg_signatures; then
- pkg_admin -K ${pkgdb_dir} check ${OUTPUT} 21
+ pkg_admin ${_compat_K_flag} check ${OUTPUT} 21
if [ $? -ne 0 ]; then
printf \nFiles with invalid signatures:\n
cat ${OUTPUT}
Index: src/etc/defaults/daily.conf
diff -u src/etc/defaults/daily.conf:1.13 src/etc/defaults/daily.conf:1.14
--- src/etc/defaults/daily.conf:1.13 Wed Jan 20 22:19:20 2010
+++ src/etc/defaults/daily.conf Fri Feb 5 16:29:02 2010
@@ -1,4 +1,4 @@
-# $NetBSD: daily.conf,v 1.13 2010/01/20 22:19:20 jmmv Exp $
+# $NetBSD: daily.conf,v 1.14 2010/02/05 16:29:02 jmmv Exp $
#
# /etc/defaults/daily.conf --
# default configuration of /etc/daily.conf
@@ -28,7 +28,6 @@
run_rdist=YES
run_security=YES
run_skeyaudit=YES
-pkgdb_dir=/var/db/pkg
fetch_pkg_vulnerabilities=NO
CVS commit: src/share/man/man5
Module Name:src Committed By: jmmv Date: Fri Feb 5 16:32:20 UTC 2010 Modified Files: src/share/man/man5: daily.conf.5 security.conf.5 Log Message: Note that pkgdb_dir is deprecated and point to the alternative setting. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/share/man/man5/daily.conf.5 cvs rdiff -u -r1.35 -r1.36 src/share/man/man5/security.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/daily.conf.5 diff -u src/share/man/man5/daily.conf.5:1.25 src/share/man/man5/daily.conf.5:1.26 --- src/share/man/man5/daily.conf.5:1.25 Tue Jan 19 22:08:52 2010 +++ src/share/man/man5/daily.conf.5 Fri Feb 5 16:32:19 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: daily.conf.5,v 1.25 2010/01/19 22:08:52 jmmv Exp $ +.\ $NetBSD: daily.conf.5,v 1.26 2010/02/05 16:32:19 jmmv Exp $ .\ .\ Copyright (c) 1996 Matthew R. Green .\ All rights reserved. @@ -24,7 +24,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd January 19, 2010 +.Dd February 5, 2010 .Dt DAILY.CONF 5 .Os .Sh NAME @@ -169,7 +169,14 @@ .Sy run_security phase will always be sent, even if it is empty. .It Sy pkgdb_dir -Location of the packages database. +.Em DEPRECATED . +Please set +.Sq PKGDB_DIR +in +.Xr pkg_install.conf 5 +instead. +.Pp +If defined, points to the location of the packages database. Defaults to .Pa /var/db/pkg . .El Index: src/share/man/man5/security.conf.5 diff -u src/share/man/man5/security.conf.5:1.35 src/share/man/man5/security.conf.5:1.36 --- src/share/man/man5/security.conf.5:1.35 Wed Jan 20 07:33:25 2010 +++ src/share/man/man5/security.conf.5 Fri Feb 5 16:32:20 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: security.conf.5,v 1.35 2010/01/20 07:33:25 wiz Exp $ +.\ $NetBSD: security.conf.5,v 1.36 2010/02/05 16:32:20 jmmv Exp $ .\ .\ Copyright (c) 1996 Matthew R. Green .\ All rights reserved. @@ -24,7 +24,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd January 19, 2010 +.Dd February 5, 2010 .Dt SECURITY.CONF 5 .Os .Sh NAME @@ -253,11 +253,16 @@ .Dq -u , for unified-format context-diffs. .It Sy pkgdb_dir -Change the pkg database directory from -.Pa /var/db/pkg -when -.Sy check_pkgs -is enabled. +.Em DEPRECATED . +Please set +.Sq PKGDB_DIR +in +.Xr pkg_install.conf 5 +instead. +.Pp +If defined, points to the location of the packages database. +Defaults to +.Pa /var/db/pkg . .It Sy backup_uses_rcs Use .Xr rcs 1
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: jmmv
Date: Wed Jan 27 11:02:03 UTC 2010
Modified Files:
src/distrib/utils/sysinst: defs.h util.c
Log Message:
Perform in-place replacement of the cypher type instead of renaming the
passwd.conf file to passwd.conf.pre-sysinst file and creating a new one
from scratch:
- This is consistent with all other edits of configuration files performed
by sysinst. (E.g. in-place changes of rc.conf.)
- This eases the upgrade of the system to a newer set of files because the
diffs presented by etcupdate are easier to read.
No objections in tech-inst...@. Tested installing NetBSD/amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.162 -r1.163 src/distrib/utils/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.147 src/distrib/utils/sysinst/defs.h:1.148
--- src/distrib/utils/sysinst/defs.h:1.147 Sat Jan 2 21:16:46 2010
+++ src/distrib/utils/sysinst/defs.h Wed Jan 27 11:02:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.147 2010/01/02 21:16:46 dsl Exp $ */
+/* $NetBSD: defs.h,v 1.148 2010/01/27 11:02:03 jmmv Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -409,7 +409,7 @@
int get_and_unpack_sets(int, msg, msg, msg);
int sanity_check(void);
int set_timezone(void);
-int set_crypt_type(void);
+void set_crypt_type(void);
int set_root_password(void);
int set_root_shell(void);
void scripting_fprintf(FILE *, const char *, ...);
Index: src/distrib/utils/sysinst/util.c
diff -u src/distrib/utils/sysinst/util.c:1.162 src/distrib/utils/sysinst/util.c:1.163
--- src/distrib/utils/sysinst/util.c:1.162 Sat Jan 2 18:06:57 2010
+++ src/distrib/utils/sysinst/util.c Wed Jan 27 11:02:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.162 2010/01/02 18:06:57 dsl Exp $ */
+/* $NetBSD: util.c,v 1.163 2010/01/27 11:02:03 jmmv Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -47,6 +47,7 @@
#include sys/stat.h
#include sys/statvfs.h
#include curses.h
+#include err.h
#include errno.h
#include dirent.h
#include util.h
@@ -250,6 +251,32 @@
free(owd);
}
+/*
+ * Performs in-place replacement of a set of patterns in a file that lives
+ * inside the installed system. The patterns must be separated by a semicolon.
+ * For example:
+ *
+ * replace(/etc/some-file.conf, s/prop1=NO/prop1=YES/;s/foo/bar/);
+ */
+static
+void
+replace(const char *path, const char *patterns, ...)
+{
+ char *spatterns;
+ va_list ap;
+
+ va_start(ap, patterns);
+ vasprintf(spatterns, patterns, ap);
+ va_end(ap);
+ if (spatterns == NULL)
+ err(1, vasprintf(spatterns, \%s\, ...), patterns);
+
+ run_program(RUN_CHROOT, sed -an -e '%s;H;$!d;g;w %s' %s, spatterns,
+ path, path);
+
+ free(spatterns);
+}
+
static int
floppy_fetch(const char *set_name)
{
@@ -1152,61 +1179,39 @@
return 1;
}
-int
+static
+void
+replace_crypt_type(const char *localcipher, const char *ypcipher)
+{
+
+ replace(/etc/passwd.conf, s/^.*default:.*$/default:/;
+ s/^.*localcipher.*$/\tlocalcipher = %s/;
+ s/^.*ypcipher.*$/\typcipher = %s/, localcipher, ypcipher);
+}
+
+void
set_crypt_type(void)
{
- FILE *pwc;
- char *fn;
msg_display(MSG_choose_crypt);
process_menu(MENU_crypttype, NULL);
- fn = strdup(target_expand(/etc/passwd.conf));
- if (fn == NULL)
- return -1;
switch (yesno) {
case 0:
break;
case 1: /* DES */
- rename(fn, target_expand(/etc/passwd.conf.pre-sysinst));
- pwc = fopen(fn, w);
- fprintf(pwc,
- default:\n
- localcipher = old\n
- ypcipher = old\n);
- fclose(pwc);
+ replace_crypt_type(old, old);
break;
case 2: /* MD5 */
- rename(fn, target_expand(/etc/passwd.conf.pre-sysinst));
- pwc = fopen(fn, w);
- fprintf(pwc,
- default:\n
- localcipher = md5\n
- ypcipher = md5\n);
- fclose(pwc);
+ replace_crypt_type(md5, md5);
break;
case 3: /* blowfish 2^7 */
- rename(fn, target_expand(/etc/passwd.conf.pre-sysinst));
- pwc = fopen(fn, w);
- fprintf(pwc,
- default:\n
- localcipher = blowfish,7\n
- ypcipher = blowfish,7\n);
- fclose(pwc);
+ replace_crypt_type(blowfish,7, blowfish,7);
break;
case 4: /* sha1 */
- rename(fn, target_expand(/etc/passwd.conf.pre-sysinst));
- pwc = fopen(fn, w);
- fprintf(pwc,
- default:\n
- localcipher = sha1\n
- ypcipher = sha1\n);
- fclose(pwc);
+ replace_crypt_type(sha1, sha1);
break;
}
-
- free(fn);
- return (0);
}
int
@@ -1291,9 +1296,8 @@
void
enable_rc_conf(void)
{
- run_program(RUN_CHROOT,
- sed -an -e 's/^rc_configured=NO/rc_configured=YES/;
-H;$!d;g;w /etc/rc.conf' /etc/rc.conf);
+
+ replace(/etc/rc.conf, s/^rc_configured=NO/rc_configured=YES/);
}
int
CVS commit: src/etc
Module Name:src
Committed By: jmmv
Date: Wed Jan 27 16:22:41 UTC 2010
Modified Files:
src/etc: daily
Log Message:
Reset the umask while refreshing the vulnerabilities database so that it
remains world-readable. Otherwise, it ends up with 600 permissions which
make it unusable for building pkgsrc packages as non-root.
Problem found by w...@.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/etc/daily
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/daily
diff -u src/etc/daily:1.74 src/etc/daily:1.75
--- src/etc/daily:1.74 Wed Jan 20 22:19:20 2010
+++ src/etc/daily Wed Jan 27 16:22:41 2010
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: daily,v 1.74 2010/01/20 22:19:20 jmmv Exp $
+# $NetBSD: daily,v 1.75 2010/01/27 16:22:41 jmmv Exp $
# @(#)daily 8.2 (Berkeley) 1/25/94
#
@@ -248,7 +248,8 @@
echo
echo Fetching package vulnerabilities database:
if checkyesno fetch_pkg_vulnerabilities; then
- pkg_admin -K ${pkgdb_dir} fetch-pkg-vulnerabilities -u
+ ( umask 022 pkg_admin -K ${pkgdb_dir} \
+ fetch-pkg-vulnerabilities -u )
else
echo fetch_pkg_vulnerabilities is set to NO in daily.conf(5).
echo You should set it to YES to enable vulnerability checks.
CVS commit: src/etc
Module Name:src
Committed By: jmmv
Date: Wed Jan 20 22:19:20 UTC 2010
Modified Files:
src/etc: daily
src/etc/defaults: daily.conf
Log Message:
Default fetch_pkg_vulnerabilities to NO and complain if it is set to that
value when packages are found (so that the user knows he is not getting the
vulnerability checks).
Why? People is complaining. (And somehow, the argument that NetBSD doesn't
do any network operation by default convinces me that it should continue to
do so.)
But still, I will be adding a question to sysinst to enable/disable this.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/etc/daily
cvs rdiff -u -r1.12 -r1.13 src/etc/defaults/daily.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/daily
diff -u src/etc/daily:1.73 src/etc/daily:1.74
--- src/etc/daily:1.73 Tue Jan 19 22:08:11 2010
+++ src/etc/daily Wed Jan 20 22:19:20 2010
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: daily,v 1.73 2010/01/19 22:08:11 jmmv Exp $
+# $NetBSD: daily,v 1.74 2010/01/20 22:19:20 jmmv Exp $
# @(#)daily 8.2 (Berkeley) 1/25/94
#
@@ -245,10 +245,13 @@
: ${pkgdb_dir:=/var/db/pkg}
if pkg_info -K ${pkgdb_dir} -q -E '*'; then
+ echo
+ echo Fetching package vulnerabilities database:
if checkyesno fetch_pkg_vulnerabilities; then
- echo
- echo Fetching package vulnerabilities database:
pkg_admin -K ${pkgdb_dir} fetch-pkg-vulnerabilities -u
+ else
+ echo fetch_pkg_vulnerabilities is set to NO in daily.conf(5).
+ echo You should set it to YES to enable vulnerability checks.
fi
fi
Index: src/etc/defaults/daily.conf
diff -u src/etc/defaults/daily.conf:1.12 src/etc/defaults/daily.conf:1.13
--- src/etc/defaults/daily.conf:1.12 Tue Jan 19 22:08:11 2010
+++ src/etc/defaults/daily.conf Wed Jan 20 22:19:20 2010
@@ -1,4 +1,4 @@
-# $NetBSD: daily.conf,v 1.12 2010/01/19 22:08:11 jmmv Exp $
+# $NetBSD: daily.conf,v 1.13 2010/01/20 22:19:20 jmmv Exp $
#
# /etc/defaults/daily.conf --
# default configuration of /etc/daily.conf
@@ -29,6 +29,6 @@
run_security=YES
run_skeyaudit=YES
pkgdb_dir=/var/db/pkg
-fetch_pkg_vulnerabilities=YES
+fetch_pkg_vulnerabilities=NO
send_empty_security=NO
CVS commit: src/share/man/man8
Module Name:src Committed By: jmmv Date: Wed Jan 20 22:24:18 UTC 2010 Modified Files: src/share/man/man8: afterboot.8 Log Message: Ask the user to enable fetch_pkg_vulnerabilities in /etc/daily.conf right after installation. Automatic changes from sysinst will come later. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/share/man/man8/afterboot.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man8/afterboot.8 diff -u src/share/man/man8/afterboot.8:1.42 src/share/man/man8/afterboot.8:1.43 --- src/share/man/man8/afterboot.8:1.42 Sat Oct 24 12:18:05 2009 +++ src/share/man/man8/afterboot.8 Wed Jan 20 22:24:18 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: afterboot.8,v 1.42 2009/10/24 12:18:05 reed Exp $ +.\ $NetBSD: afterboot.8,v 1.43 2010/01/20 22:24:18 jmmv Exp $ .\ $OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $ .\ .\ Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu @@ -59,7 +59,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 18, 2009 +.Dd January 20, 2010 .Dt AFTERBOOT 8 .Os .Sh NAME @@ -94,6 +94,20 @@ All significant and easily fixed problems will be reported at .Pa http://www.NetBSD.org/support/security/ . It is recommended that you check this page regularly. +.Pp +Additionally, you should set +.Dq fetch_pkg_vulnerabilities=YES +in +.Pa /etc/daily.conf +to allow your system to automatically update the local database of known +vulnerable packages to the latest version available on-line. +The system will later check, on a daily basis, if any of your installed +packages are vulnerable based on the contents of this database. +See +.Xr daily.conf 5 +and +.Xr security.conf 5 +for more details. .Ss Login Login as .Dq Ic root .
CVS commit: src/share/man/man5
Module Name:src Committed By: jmmv Date: Tue Jan 19 22:08:52 UTC 2010 Modified Files: src/share/man/man5: daily.conf.5 security.conf.5 Log Message: Document the new package-related maintenance options and security checks in daily.conf and security.conf. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/share/man/man5/daily.conf.5 cvs rdiff -u -r1.33 -r1.34 src/share/man/man5/security.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/daily.conf.5 diff -u src/share/man/man5/daily.conf.5:1.24 src/share/man/man5/daily.conf.5:1.25 --- src/share/man/man5/daily.conf.5:1.24 Wed Oct 28 02:31:44 2009 +++ src/share/man/man5/daily.conf.5 Tue Jan 19 22:08:52 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: daily.conf.5,v 1.24 2009/10/28 02:31:44 snj Exp $ +.\ $NetBSD: daily.conf.5,v 1.25 2010/01/19 22:08:52 jmmv Exp $ .\ .\ Copyright (c) 1996 Matthew R. Green .\ All rights reserved. @@ -24,7 +24,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd August 30, 2008 +.Dd January 19, 2010 .Dt DAILY.CONF 5 .Os .Sh NAME @@ -58,7 +58,7 @@ (Note that you should never edit .Pa /etc/defaults/daily.conf directly, as it is often replaced during system upgrades.) -.Bl -tag -width purge_accounting +.Bl -tag -width fetch_pkg_vulnerabilities .It Sy find_core This runs .Xr find 1 @@ -136,6 +136,11 @@ .Xr skeyaudit 1 program to check the S/Key database and informs users of S/Keys that are about to expire. +.It Sy fetch_pkg_vulnerabilities +Refreshes the local database of package vulnerabilities. +See the settings in +.Xr security.conf 5 +for details on the actual package checks. .El .Pp The variables described below can be set to modify the tests: @@ -163,6 +168,10 @@ If set, the report generated by the .Sy run_security phase will always be sent, even if it is empty. +.It Sy pkgdb_dir +Location of the packages database. +Defaults to +.Pa /var/db/pkg . .El .Sh FILES .Bl -tag -width /etc/defaults/daily.conf -compact Index: src/share/man/man5/security.conf.5 diff -u src/share/man/man5/security.conf.5:1.33 src/share/man/man5/security.conf.5:1.34 --- src/share/man/man5/security.conf.5:1.33 Thu May 29 14:51:25 2008 +++ src/share/man/man5/security.conf.5 Tue Jan 19 22:08:52 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: security.conf.5,v 1.33 2008/05/29 14:51:25 mrg Exp $ +.\ $NetBSD: security.conf.5,v 1.34 2010/01/19 22:08:52 jmmv Exp $ .\ .\ Copyright (c) 1996 Matthew R. Green .\ All rights reserved. @@ -24,7 +24,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd May 29, 2006 +.Dd January 19, 2010 .Dt SECURITY.CONF 5 .Os .Sh NAME @@ -46,7 +46,7 @@ .Pa /etc/daily.conf . .Pp The variables described below can be set to NO to disable the test: -.Bl -tag -width check_network +.Bl -tag -width check_pkg_vulnerabilities .It Sy check_passwd This checks the .Pa /etc/master.passwd @@ -151,6 +151,17 @@ This includes files such as .Pa /etc/master.passwd . .El +.It Sy check_pkg_vulnerabilities +Checks the currently installed packages against a database of known +vulnerabilities and reports those that are vulnerable. +Check the +.Sy fetch_pkg_vulnerabilities +setting in +.Xr daily.conf 5 +to keep the database up to date. +.It Sy check_pkg_signatures +Checks the digital signature of all files installed by packages against +the expected values stored in the packages database. .El .Pp The variables described below can be set to modify the tests:
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Tue Jan 19 22:11:57 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Note the addition of new security checks to daily.conf and security.conf for packages. To generate a diff of this commit: cvs rdiff -u -r1.1345 -r1.1346 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1345 src/doc/CHANGES:1.1346 --- src/doc/CHANGES:1.1345 Mon Jan 18 23:41:47 2010 +++ src/doc/CHANGES Tue Jan 19 22:11:57 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1345 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1346 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -524,3 +524,10 @@ tn3270: Removed from base [roy 20100116] macppc: Add support for new-style kernel modules. [jmmv 20100118] shark: Add support for new-style kernel modules. [jmmv 20100118] + daily.conf(5): Add fetch_pkg_vulnerabilities to keep the packages + vulnerabilities database up to date, if it exists. + [jmmv 20100119] + security.conf(5): Add check_pkg_vulnerabilities and + check_pkg_signatures to validate the installed packages + against the vulnerabilities database and the expected + checksums for their files. [jmmv 20100119]
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: jmmv
Date: Mon Jan 18 23:04:30 UTC 2010
Modified Files:
src/sys/arch/arm/arm32: arm32_machdep.c
Log Message:
Define an empty module_init_md function so that kernels with 'options
MODULAR' can be built (at least in shark). Still not working due to
some relocations resolving to too far away symbols though.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/arm/arm32/arm32_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/arm32_machdep.c
diff -u src/sys/arch/arm/arm32/arm32_machdep.c:1.71 src/sys/arch/arm/arm32/arm32_machdep.c:1.72
--- src/sys/arch/arm/arm32/arm32_machdep.c:1.71 Sun Nov 29 04:15:42 2009
+++ src/sys/arch/arm/arm32/arm32_machdep.c Mon Jan 18 23:04:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_machdep.c,v 1.71 2009/11/29 04:15:42 rmind Exp $ */
+/* $NetBSD: arm32_machdep.c,v 1.72 2010/01/18 23:04:30 jmmv Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,8 +42,9 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: arm32_machdep.c,v 1.71 2009/11/29 04:15:42 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: arm32_machdep.c,v 1.72 2010/01/18 23:04:30 jmmv Exp $);
+#include opt_modular.h
#include opt_md.h
#include opt_pmap_debug.h
@@ -60,6 +61,7 @@
#include uvm/uvm_extern.h
#include sys/sysctl.h
#include sys/cpu.h
+#include sys/module.h
#include dev/cons.h
@@ -478,3 +480,13 @@
}
}
#endif /* __HAVE_FAST_SOFTINTS */
+
+#ifdef MODULAR
+/*
+ * Push any modules loaded by the boot loader.
+ */
+void
+module_init_md(void)
+{
+}
+#endif /* MODULAR */
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: jmmv
Date: Mon Jan 18 23:35:51 UTC 2010
Modified Files:
src/sys/arch/powerpc/powerpc: kobj_machdep.c powerpc_machdep.c
Log Message:
Define kobj_machdep and module_init_md empty functions so that powerpc
kernels (at least macppc) with 'options MODULAR' can be built.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/powerpc/kobj_machdep.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/powerpc/powerpc/powerpc_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/kobj_machdep.c
diff -u src/sys/arch/powerpc/powerpc/kobj_machdep.c:1.2 src/sys/arch/powerpc/powerpc/kobj_machdep.c:1.3
--- src/sys/arch/powerpc/powerpc/kobj_machdep.c:1.2 Mon Apr 28 20:23:32 2008
+++ src/sys/arch/powerpc/powerpc/kobj_machdep.c Mon Jan 18 23:35:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj_machdep.c,v 1.2 2008/04/28 20:23:32 martin Exp $ */
+/* $NetBSD: kobj_machdep.c,v 1.3 2010/01/18 23:35:51 jmmv Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kobj_machdep.c,v 1.2 2008/04/28 20:23:32 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: kobj_machdep.c,v 1.3 2010/01/18 23:35:51 jmmv Exp $);
#define ELFSIZE ARCH_ELFSIZE
@@ -141,3 +141,10 @@
return 0;
}
+
+int
+kobj_machdep(kobj_t ko, void *base, size_t size, bool load)
+{
+
+ return 0;
+}
Index: src/sys/arch/powerpc/powerpc/powerpc_machdep.c
diff -u src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.41 src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.42
--- src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.41 Thu Dec 10 14:13:51 2009
+++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c Mon Jan 18 23:35:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc_machdep.c,v 1.41 2009/12/10 14:13:51 matt Exp $ */
+/* $NetBSD: powerpc_machdep.c,v 1.42 2010/01/18 23:35:51 jmmv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,9 +32,10 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: powerpc_machdep.c,v 1.41 2009/12/10 14:13:51 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: powerpc_machdep.c,v 1.42 2010/01/18 23:35:51 jmmv Exp $);
#include opt_altivec.h
+#include opt_modular.h
#include sys/param.h
#include sys/conf.h
@@ -48,6 +49,7 @@
#include sys/sysctl.h
#include sys/ucontext.h
#include sys/cpu.h
+#include sys/module.h
int cpu_timebase;
int cpu_printfataltraps;
@@ -301,3 +303,12 @@
return curcpu()-ci_idepth != 0;
}
+#ifdef MODULAR
+/*
+ * Push any modules loaded by the boot loader.
+ */
+void
+module_init_md(void)
+{
+}
+#endif /* MODULAR */
CVS commit: src/share/mk
Module Name:src
Committed By: jmmv
Date: Mon Jan 18 23:39:08 UTC 2010
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
Generate long calls in modules for arm32 and powerpc to avoid unsupported
relocations by the module loader in the kernel. This makes modules work
in, at least, shark and macppc respectively.
This is obviously a workaround that results in slower code, but at least
makes modules work. I'm adding a comment detailing what the real solution
would be so that the whole thing can be revisited in the future. (Read:
I don't have time now to dig the details of how to implement trampoline
generation.)
(Based on the old bsd.kmod.mk file, I understand that hppa needs this
workaround too, but I can't check this platform.)
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.23 src/share/mk/bsd.kmodule.mk:1.24
--- src/share/mk/bsd.kmodule.mk:1.23 Mon Dec 14 08:51:16 2009
+++ src/share/mk/bsd.kmodule.mk Mon Jan 18 23:39:07 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.23 2009/12/14 08:51:16 mrg Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.24 2010/01/18 23:39:07 jmmv Exp $
# We are not building this with PIE
MKPIE=no
@@ -23,6 +23,18 @@
CFLAGS+= -fno-strict-aliasing -Wno-pointer-sign
.endif
+# XXX This is a workaround for platforms that have relative relocations
+# that, when relocated by the module loader, result in addresses that
+# overflow the size of the relocation (e.g. R_PPC_REL24 in powerpc).
+# The real solution to this involves generating trampolines for those
+# relocations inside the loader and removing this workaround, as the
+# resulting code would be much faster.
+.if ${MACHINE_CPU} == arm
+CFLAGS+= -mlong-calls
+.elif ${MACHINE_CPU} == powerpc
+CFLAGS+= -mlongcall
+.endif
+
_YKMSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}}
DPSRCS+= ${_YKMSRCS}
CLEANFILES+= ${_YKMSRCS}
CVS commit: src/sys/arch
Module Name:src Committed By: jmmv Date: Mon Jan 18 23:40:07 UTC 2010 Modified Files: src/sys/arch/macppc/conf: GENERIC src/sys/arch/shark/conf: GENERIC Log Message: Enable 'options MODULAR' in macppc and shark GENERIC kernels now that the modules work. To generate a diff of this commit: cvs rdiff -u -r1.277 -r1.278 src/sys/arch/macppc/conf/GENERIC cvs rdiff -u -r1.86 -r1.87 src/sys/arch/shark/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/macppc/conf/GENERIC diff -u src/sys/arch/macppc/conf/GENERIC:1.277 src/sys/arch/macppc/conf/GENERIC:1.278 --- src/sys/arch/macppc/conf/GENERIC:1.277 Sat Dec 5 20:11:15 2009 +++ src/sys/arch/macppc/conf/GENERIC Mon Jan 18 23:40:06 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.277 2009/12/05 20:11:15 pooka Exp $ +# $NetBSD: GENERIC,v 1.278 2010/01/18 23:40:06 jmmv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.277 $ +#ident GENERIC-$Revision: 1.278 $ maxusers 32 @@ -40,6 +40,7 @@ options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support +options MODULAR # new style module framework options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) Index: src/sys/arch/shark/conf/GENERIC diff -u src/sys/arch/shark/conf/GENERIC:1.86 src/sys/arch/shark/conf/GENERIC:1.87 --- src/sys/arch/shark/conf/GENERIC:1.86 Sat Dec 5 20:11:17 2009 +++ src/sys/arch/shark/conf/GENERIC Mon Jan 18 23:40:06 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.86 2009/12/05 20:11:17 pooka Exp $ +# $NetBSD: GENERIC,v 1.87 2010/01/18 23:40:06 jmmv Exp $ # # Generic Shark configuration. # @@ -7,7 +7,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.86 $ +#ident GENERIC-$Revision: 1.87 $ # estimated number of users maxusers 32 @@ -152,6 +152,7 @@ options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel +options MODULAR # new style module framework # Development and Debugging options
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Mon Jan 18 23:41:47 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Document the addition of new-style kernel modules support in macppc and shark. To generate a diff of this commit: cvs rdiff -u -r1.1344 -r1.1345 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1344 src/doc/CHANGES:1.1345 --- src/doc/CHANGES:1.1344 Sat Jan 16 15:46:32 2010 +++ src/doc/CHANGES Mon Jan 18 23:41:47 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1344 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1345 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -522,3 +522,5 @@ found on SPARCstation-4/5 and qemu. Allows to idle the CPU when in the idle loop. [bouyer 20100115] tn3270: Removed from base [roy 20100116] + macppc: Add support for new-style kernel modules. [jmmv 20100118] + shark: Add support for new-style kernel modules. [jmmv 20100118]
CVS commit: src/share/man/man4
Module Name:src Committed By: jmmv Date: Tue Jan 12 00:04:30 UTC 2010 Modified Files: src/share/man/man4: btbc.4 Log Message: Drop unnecessary trailing commas. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/btbc.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/btbc.4 diff -u src/share/man/man4/btbc.4:1.3 src/share/man/man4/btbc.4:1.4 --- src/share/man/man4/btbc.4:1.3 Fri Apr 10 15:15:10 2009 +++ src/share/man/man4/btbc.4 Tue Jan 12 00:04:30 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: btbc.4,v 1.3 2009/04/10 15:15:10 joerg Exp $ +.\ $NetBSD: btbc.4,v 1.4 2010/01/12 00:04:30 jmmv Exp $ .\ .\ Copyright (c) 2007 KIYOHARA Takashi .\ All rights reserved. @@ -35,11 +35,11 @@ .Sh DESCRIPTION The .Nm -driver provides support for the AnyCom BlueCard (LSE041, LSE039, LSE139), +driver provides support for the AnyCom BlueCard (LSE041, LSE039, LSE139) to the Bluetooth protocol stack. .Sh SEE ALSO .Xr bluetooth 4 , -.Xr pcmcia 4 , +.Xr pcmcia 4 .Sh HISTORY This .Nm
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Tue Dec 22 13:26:15 UTC 2009 Update of /cvsroot/src/external/bsd/atf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23161 Log Message: Import atf 0.7. Changes in this release: * Added build-time checks to atf-c and atf-c++. A binding for atf-sh will come later. * Migrated all build-time checks for header files to proper ATF tests. This demonstrates the use of the new feature described above. * Added an internal API for child process management. * Converted all plain-text distribution documents to a Docbook canonical version, and include pre-generated plain text and HTML copies in the distribution file. * Simplified the contents of the Makefile.am by regenerating it from a canonical Makefile.am.m4 source. As a side-effect, some dependency specifications were fixed. * Migrated all checks from the check target to installcheck, as these require ATF to be installed. * Fixed sign comparison mismatches triggered by the now-enabled -Wsign-compare. * Fixed many memory and object leaks. Status: Vendor Tag: TNF Release Tags: atf-0-7 U src/external/bsd/atf/dist/configure.ac U src/external/bsd/atf/dist/README N src/external/bsd/atf/dist/Makefile.am.m4 U src/external/bsd/atf/dist/aclocal.m4 U src/external/bsd/atf/dist/atf-c.h U src/external/bsd/atf/dist/atf-c++.hpp U src/external/bsd/atf/dist/Makefile.am U src/external/bsd/atf/dist/Makefile.in U src/external/bsd/atf/dist/bconfig.h.in U src/external/bsd/atf/dist/configure U src/external/bsd/atf/dist/AUTHORS U src/external/bsd/atf/dist/COPYING U src/external/bsd/atf/dist/INSTALL U src/external/bsd/atf/dist/NEWS U src/external/bsd/atf/dist/revision.h U src/external/bsd/atf/dist/admin/config.guess U src/external/bsd/atf/dist/admin/compile U src/external/bsd/atf/dist/admin/check-install.sh U src/external/bsd/atf/dist/admin/config.sub U src/external/bsd/atf/dist/admin/depcomp U src/external/bsd/atf/dist/admin/install-sh U src/external/bsd/atf/dist/admin/ltmain.sh U src/external/bsd/atf/dist/admin/missing U src/external/bsd/atf/dist/admin/check-style-common.awk U src/external/bsd/atf/dist/admin/check-style-c.awk U src/external/bsd/atf/dist/admin/check-style-cpp.awk U src/external/bsd/atf/dist/admin/check-style-man.awk U src/external/bsd/atf/dist/admin/check-style-shell.awk U src/external/bsd/atf/dist/admin/check-style.sh N src/external/bsd/atf/dist/admin/choose-revision.sh N src/external/bsd/atf/dist/admin/generate-makefile.sh N src/external/bsd/atf/dist/admin/generate-revision.sh U src/external/bsd/atf/dist/admin/revision-dist.h N src/external/bsd/atf/dist/admin/generate-revision-dist.sh U src/external/bsd/atf/dist/atf-c/error_fwd.h N src/external/bsd/atf/dist/atf-c/build.h U src/external/bsd/atf/dist/atf-c/check.h U src/external/bsd/atf/dist/atf-c/config.h U src/external/bsd/atf/dist/atf-c/dynstr.h U src/external/bsd/atf/dist/atf-c/env.h U src/external/bsd/atf/dist/atf-c/error.h U src/external/bsd/atf/dist/atf-c/process.h U src/external/bsd/atf/dist/atf-c/expand.h U src/external/bsd/atf/dist/atf-c/fs.h U src/external/bsd/atf/dist/atf-c/io.h U src/external/bsd/atf/dist/atf-c/list.h U src/external/bsd/atf/dist/atf-c/macros.h U src/external/bsd/atf/dist/atf-c/map.h U src/external/bsd/atf/dist/atf-c/object.h U src/external/bsd/atf/dist/atf-c/signals.h U src/external/bsd/atf/dist/atf-c/sanity.h U src/external/bsd/atf/dist/atf-c/tcr.h U src/external/bsd/atf/dist/atf-c/tc.h U src/external/bsd/atf/dist/atf-c/atf-c-api.3 U src/external/bsd/atf/dist/atf-c/defs.h.in U src/external/bsd/atf/dist/atf-c/text.h U src/external/bsd/atf/dist/atf-c/tp.h U src/external/bsd/atf/dist/atf-c/ui.h U src/external/bsd/atf/dist/atf-c/user.h U src/external/bsd/atf/dist/atf-c/process.c N src/external/bsd/atf/dist/atf-c/build.c U src/external/bsd/atf/dist/atf-c/check.c U src/external/bsd/atf/dist/atf-c/config.c C src/external/bsd/atf/dist/atf-c/dynstr.c U src/external/bsd/atf/dist/atf-c/env.c U src/external/bsd/atf/dist/atf-c/error.c U src/external/bsd/atf/dist/atf-c/expand.c C src/external/bsd/atf/dist/atf-c/fs.c C src/external/bsd/atf/dist/atf-c/io.c U src/external/bsd/atf/dist/atf-c/list.c U src/external/bsd/atf/dist/atf-c/map.c U src/external/bsd/atf/dist/atf-c/object.c U src/external/bsd/atf/dist/atf-c/signals.c U src/external/bsd/atf/dist/atf-c/sanity.c U src/external/bsd/atf/dist/atf-c/tp_main.c U src/external/bsd/atf/dist/atf-c/text.c U src/external/bsd/atf/dist/atf-c/ui.c U src/external/bsd/atf/dist/atf-c/user.c C src/external/bsd/atf/dist/atf-c/tc.c U src/external/bsd/atf/dist/atf-c/tcr.c U src/external/bsd/atf/dist/atf-c/tp.c U src/external/bsd/atf/dist/atf-c++/application.hpp U src/external/bsd/atf/dist/atf-c++/atffile.hpp N src/external/bsd/atf/dist/atf-c++/build.hpp U src/external/bsd/atf/dist/atf-c++/check.hpp U src/external/bsd/atf/dist/atf-c++/config.hpp U src/external/bsd/atf/dist/atf-c++/env.hpp U src/external/bsd/atf/dist/atf-c++/exceptions.hpp U
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Tue Dec 22 13:36:57 UTC 2009 Modified Files: src/external/bsd/atf/dist/atf-c: dynstr.c fs.c io.c tc.c Removed Files: src/external/bsd/atf/dist: ChangeLog ROADMAP src/external/bsd/atf/dist/tests/atf/atf-c: h_check.c h_macros.h src/external/bsd/atf/dist/tests/build: t_include_atf_c++_hpp.cpp t_include_atf_c_h.cpp src/external/bsd/atf/dist/tests/build/atf-c: t_include_check_h.c t_include_config_h.c t_include_dynstr_h.c t_include_env_h.c t_include_error_fwd_h.c t_include_error_h.c t_include_expand_h.c t_include_fs_h.c t_include_io_h.c t_include_list_h.c t_include_macros_h.c t_include_map_h.c t_include_object_h.c t_include_process_h.c t_include_sanity_h.c t_include_signals_h.c t_include_tc_h.c t_include_tcr_h.c t_include_text_h.c t_include_tp_h.c t_include_ui_h.c t_use_macros_h.c src/external/bsd/atf/dist/tests/build/atf-c++: t_include_application_hpp.cpp t_include_atffile_hpp.cpp t_include_check_hpp.cpp t_include_config_hpp.cpp t_include_env_hpp.cpp t_include_exceptions_hpp.cpp t_include_expand_hpp.cpp t_include_formats_hpp.cpp t_include_fs_hpp.cpp t_include_io_hpp.cpp t_include_macros_hpp.cpp t_include_parser_hpp.cpp t_include_process_hpp.cpp t_include_sanity_hpp.cpp t_include_signals_hpp.cpp t_include_tests_hpp.cpp t_include_text_hpp.cpp t_include_ui_hpp.cpp t_include_user_hpp.cpp t_include_utils_hpp.cpp t_use_macros_hpp.cpp Log Message: Merge atf 0.7. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/ChangeLog \ src/external/bsd/atf/dist/ROADMAP cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/atf-c/dynstr.c \ src/external/bsd/atf/dist/atf-c/fs.c src/external/bsd/atf/dist/atf-c/io.c \ src/external/bsd/atf/dist/atf-c/tc.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/atf/dist/tests/atf/atf-c/h_check.c \ src/external/bsd/atf/dist/tests/atf/atf-c/h_macros.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/atf/dist/tests/build/t_include_atf_c++_hpp.cpp \ src/external/bsd/atf/dist/tests/build/t_include_atf_c_h.cpp cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_check_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_config_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_dynstr_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_env_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_error_fwd_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_error_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_expand_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_fs_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_io_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_list_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_macros_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_map_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_object_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_process_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_sanity_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_signals_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_tc_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_tcr_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_text_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_tp_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_include_ui_h.c \ src/external/bsd/atf/dist/tests/build/atf-c/t_use_macros_h.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/atf/dist/tests/build/atf-c++/t_include_application_hpp.cpp \ src/external/bsd/atf/dist/tests/build/atf-c++/t_include_atffile_hpp.cpp \ src/external/bsd/atf/dist/tests/build/atf-c++/t_include_check_hpp.cpp \ src/external/bsd/atf/dist/tests/build/atf-c++/t_include_config_hpp.cpp \ src/external/bsd/atf/dist/tests/build/atf-c++/t_include_env_hpp.cpp \ src/external/bsd/atf/dist/tests/build/atf-c++/t_include_exceptions_hpp.cpp \ src/external/bsd/atf/dist/tests/build/atf-c++/t_include_expand_hpp.cpp \ src/external/bsd/atf/dist/tests/build/atf-c++/t_include_formats_hpp.cpp \ src/external/bsd/atf/dist/tests/build/atf-c++/t_include_fs_hpp.cpp \ src/external/bsd/atf/dist/tests/build/atf-c++/t_include_io_hpp.cpp \ src/external/bsd/atf/dist/tests/build/atf-c++/t_include_macros_hpp.cpp \ src/external/bsd/atf/dist/tests/build/atf-c++/t_include_parser_hpp.cpp \ src/external/bsd/atf/dist/tests/build/atf-c++/t_include_process_hpp.cpp \ src/external/bsd/atf/dist/tests/build/atf-c++/t_include_sanity_hpp.cpp \
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: jmmv Date: Tue Dec 22 13:38:41 UTC 2009 Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/misc: mi src/distrib/sets/lists/tests: mi Log Message: Update file sets to match atf 0.7. To generate a diff of this commit: cvs rdiff -u -r1.1351 -r1.1352 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.163 -r1.164 src/distrib/sets/lists/misc/mi cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1351 src/distrib/sets/lists/comp/mi:1.1352 --- src/distrib/sets/lists/comp/mi:1.1351 Mon Dec 21 21:09:41 2009 +++ src/distrib/sets/lists/comp/mi Tue Dec 22 13:38:40 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1351 2009/12/21 21:09:41 dyoung Exp $ +# $NetBSD: mi,v 1.1352 2009/12/22 13:38:40 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -115,6 +115,7 @@ ./usr/include/atf-c++.hpp comp-atf-include atf ./usr/include/atf-c++/application.hpp comp-atf-include atf ./usr/include/atf-c++/atffile.hpp comp-atf-include atf +./usr/include/atf-c++/build.hpp comp-atf-include atf ./usr/include/atf-c++/check.hpp comp-atf-include atf ./usr/include/atf-c++/config.hpp comp-atf-include atf ./usr/include/atf-c++/env.hpp comp-atf-include atf @@ -134,6 +135,7 @@ ./usr/include/atf-c++/user.hpp comp-atf-include atf ./usr/include/atf-c++/utils.hpp comp-atf-include atf ./usr/include/atf-c.hcomp-atf-include atf +./usr/include/atf-c/build.h comp-atf-include atf ./usr/include/atf-c/check.h comp-atf-include atf ./usr/include/atf-c/config.h comp-atf-include atf ./usr/include/atf-c/defs.h comp-atf-include atf Index: src/distrib/sets/lists/misc/mi diff -u src/distrib/sets/lists/misc/mi:1.163 src/distrib/sets/lists/misc/mi:1.164 --- src/distrib/sets/lists/misc/mi:1.163 Tue Dec 15 03:01:16 2009 +++ src/distrib/sets/lists/misc/mi Tue Dec 22 13:38:40 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.163 2009/12/15 03:01:16 mrg Exp $ +# $NetBSD: mi,v 1.164 2009/12/22 13:38:40 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -19,7 +19,7 @@ ./usr/share/doc/atf/COPYING misc-atf-doc doc,atf ./usr/share/doc/atf/NEWS misc-atf-doc doc,atf ./usr/share/doc/atf/README misc-atf-doc doc,atf -./usr/share/doc/atf/ROADMAP misc-atf-doc doc,atf +./usr/share/doc/atf/ROADMAP misc-atf-doc obsolete ./usr/share/doc/html/bind9/arm/Bv9ARM.ch01.html misc-bind-htmldoc doc ./usr/share/doc/html/bind9/arm/Bv9ARM.ch02.html misc-bind-htmldoc doc ./usr/share/doc/html/bind9/arm/Bv9ARM.ch03.html misc-bind-htmldoc doc Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.57 src/distrib/sets/lists/tests/mi:1.58 --- src/distrib/sets/lists/tests/mi:1.57 Tue Dec 15 03:01:16 2009 +++ src/distrib/sets/lists/tests/mi Tue Dec 22 13:38:41 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.57 2009/12/15 03:01:16 mrg Exp $ +# $NetBSD: mi,v 1.58 2009/12/22 13:38:41 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -6,7 +6,10 @@ ./usr/libdata/debug/usr/tests tests-base-debug ./usr/libdata/debug/usr/tests/atf tests-atf-debug ./usr/libdata/debug/usr/tests/atf/atf-c tests-atf-debug -./usr/libdata/debug/usr/tests/atf/atf-c/h_check.debug tests-atf-debug debug,atf +./usr/libdata/debug/usr/tests/atf/atf-c/h_check.debug tests-atf-debug obsolete +./usr/libdata/debug/usr/tests/atf/atf-c/h_processes.debug tests-atf-debug debug,atf +./usr/libdata/debug/usr/tests/atf/atf-c/t_atf_c.debug tests-atf-debug debug,atf +./usr/libdata/debug/usr/tests/atf/atf-c/t_build.debug tests-atf-debug debug,atf ./usr/libdata/debug/usr/tests/atf/atf-c/t_check.debug tests-atf-debug debug,atf ./usr/libdata/debug/usr/tests/atf/atf-c/t_config.debug tests-atf-debug debug,atf ./usr/libdata/debug/usr/tests/atf/atf-c/t_dynstr.debug tests-atf-debug debug,atf @@ -14,6 +17,7 @@ ./usr/libdata/debug/usr/tests/atf/atf-c/t_error.debug tests-atf-debug debug,atf ./usr/libdata/debug/usr/tests/atf/atf-c/t_expand.debug tests-atf-debug debug,atf ./usr/libdata/debug/usr/tests/atf/atf-c/t_fs.debug tests-atf-debug debug,atf +./usr/libdata/debug/usr/tests/atf/atf-c/t_h_lib.debug tests-atf-debug debug,atf ./usr/libdata/debug/usr/tests/atf/atf-c/t_io.debug tests-atf-debug debug,atf ./usr/libdata/debug/usr/tests/atf/atf-c/t_list.debug tests-atf-debug debug,atf ./usr/libdata/debug/usr/tests/atf/atf-c/t_macros.debug tests-atf-debug debug,atf @@ -27,18 +31,26 @@ ./usr/libdata/debug/usr/tests/atf/atf-c/t_ui.debug tests-atf-debug debug,atf ./usr/libdata/debug/usr/tests/atf/atf-c/t_user.debug tests-atf-debug debug,atf ./usr/libdata/debug/usr/tests/atf/atf-c++tests-atf-debug
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Tue Dec 22 13:41:41 UTC 2009 Modified Files: src/doc: CHANGES Log Message: Note import of atf 0.7. To generate a diff of this commit: cvs rdiff -u -r1.1331 -r1.1332 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1331 src/doc/CHANGES:1.1332 --- src/doc/CHANGES:1.1331 Tue Dec 15 06:04:22 2009 +++ src/doc/CHANGES Tue Dec 22 13:41:41 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1331 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1332 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -504,3 +504,4 @@ [pooka 20091205] ntp: Import ntp-4-2-4p8. [kardel 20091208] zaurus: Add support Xorg. [nonaka 20091213] + atf(7): Import 0.7. [jmmv 20091222]
CVS commit: src/sys/fs/tmpfs
Module Name:src
Committed By: jmmv
Date: Sun Nov 22 17:09:58 UTC 2009
Modified Files:
src/sys/fs/tmpfs: tmpfs_vnops.c
Log Message:
Fix panic when trying to delete a directory entry (hi yamt!) by not
attempting to release a pnbuf that does not exist.
I.e. fixes mkdir a ; unlink a/.. And actually, this was caught by the
automated tests.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/fs/tmpfs/tmpfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/tmpfs/tmpfs_vnops.c
diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.64 src/sys/fs/tmpfs/tmpfs_vnops.c:1.65
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.64 Sat Oct 17 22:20:56 2009
+++ src/sys/fs/tmpfs/tmpfs_vnops.c Sun Nov 22 17:09:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vnops.c,v 1.64 2009/10/17 22:20:56 njoly Exp $ */
+/* $NetBSD: tmpfs_vnops.c,v 1.65 2009/11/22 17:09:58 jmmv Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tmpfs_vnops.c,v 1.64 2009/10/17 22:20:56 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: tmpfs_vnops.c,v 1.65 2009/11/22 17:09:58 jmmv Exp $);
#include sys/param.h
#include sys/dirent.h
@@ -728,7 +728,10 @@
vrele(dvp);
else
vput(dvp);
- PNBUF_PUT(cnp-cn_pnbuf);
+ if (cnp-cn_flags HASBUF) {
+ PNBUF_PUT(cnp-cn_pnbuf);
+ cnp-cn_flags = ~HASBUF;
+ }
return error;
}
CVS commit: src/tests/util/sh
Module Name:src
Committed By: jmmv
Date: Tue Oct 20 21:58:35 UTC 2009
Modified Files:
src/tests/util/sh: Makefile t_expand.sh
Added Files:
src/tests/util/sh: t_exit.sh t_wait.sh
Removed Files:
src/tests/util/sh: t_exitstatus.sh
Log Message:
Migrate three sh test cases from regress to tests.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/util/sh/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/util/sh/t_exit.sh \
src/tests/util/sh/t_wait.sh
cvs rdiff -u -r1.2 -r0 src/tests/util/sh/t_exitstatus.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/util/sh/t_expand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/sh/Makefile
diff -u src/tests/util/sh/Makefile:1.2 src/tests/util/sh/Makefile:1.3
--- src/tests/util/sh/Makefile:1.2 Wed Nov 21 15:39:35 2007
+++ src/tests/util/sh/Makefile Tue Oct 20 21:58:35 2009
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2007/11/21 15:39:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2009/10/20 21:58:35 jmmv Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/util/sh
TESTS_SH= t_compexit
-TESTS_SH+= t_exitstatus
+TESTS_SH+= t_exit
TESTS_SH+= t_expand
TESTS_SH+= t_fsplit
TESTS_SH+= t_here
TESTS_SH+= t_set_e
TESTS_SH+= t_varquote
+TESTS_SH+= t_wait
.include bsd.test.mk
Index: src/tests/util/sh/t_expand.sh
diff -u src/tests/util/sh/t_expand.sh:1.3 src/tests/util/sh/t_expand.sh:1.4
--- src/tests/util/sh/t_expand.sh:1.3 Wed Oct 14 13:02:03 2009
+++ src/tests/util/sh/t_expand.sh Tue Oct 20 21:58:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: t_expand.sh,v 1.3 2009/10/14 13:02:03 jmmv Exp $
+# $NetBSD: t_expand.sh,v 1.4 2009/10/20 21:58:35 jmmv Exp $
#
# Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -94,6 +94,17 @@
atf_check_equal '$stripped' '${line%%/\**}'
}
+atf_test_case varpattern_backslashes
+varpattern_backslashes_head() {
+ atf_set descr Tests that protecting wildcards with backslashes \
+ works in variable patterns.
+}
+varpattern_backslashes_body() {
+ line='/foo/bar/*/baz'
+ stripped='/foo/bar/'
+ atf_check_equal $stripped ${line%%\**}
+}
+
atf_test_case arithmetic
arithmetic_head() {
atf_set descr POSIX requires shell arithmetic to use signed \
@@ -111,5 +122,6 @@
atf_add_test_case dollar_at
atf_add_test_case dollar_at_with_text
atf_add_test_case strip
+ atf_add_test_case varpattern_backslashes
atf_add_test_case arithmetic
}
Added files:
Index: src/tests/util/sh/t_exit.sh
diff -u /dev/null src/tests/util/sh/t_exit.sh:1.1
--- /dev/null Tue Oct 20 21:58:35 2009
+++ src/tests/util/sh/t_exit.sh Tue Oct 20 21:58:35 2009
@@ -0,0 +1,69 @@
+# $NetBSD: t_exit.sh,v 1.1 2009/10/20 21:58:35 jmmv Exp $
+#
+# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+#
+
+crud() {
+ test yes = no
+
+ cat EOF
+$?
+EOF
+}
+
+atf_test_case function
+function_head() {
+ atf_set descr Tests that \$? is correctly updated inside \
+ a function
+}
+function_body() {
+ foo=`crud`
+ atf_check_equal 'x$foo' 'x1'
+}
+
+atf_test_case readout
+readout_head() {
+ atf_set descr Tests that \$? is correctly updated in a \
+ compound expression
+}
+readout_body() {
+ atf_check_equal '$( true ! true | false; echo $? )' '0'
+}
+
+atf_test_case trap_subshell
+trap_subshell_head() {
+ atf_set descr Tests that the trap statement in a subshell \
+ works when the subshell exits
+}
+trap_subshell_body() {
+ atf_check -s eq:0 -o inline:'exiting\n' -x \
+ '( trap echo exiting EXIT; /usr/bin/true )'
+}
+
+atf_init_test_cases() {
+ atf_add_test_case function
+
CVS commit: src/tests/util/sh
Module Name:src
Committed By: jmmv
Date: Wed Oct 14 13:02:04 UTC 2009
Modified Files:
src/tests/util/sh: t_expand.sh
Log Message:
Add test cases for prefix $@ suffix expansion. From PR bin/33956.
This issue was fixed a while ago but the tests described in the report
were never written as proper test cases.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/util/sh/t_expand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/sh/t_expand.sh
diff -u src/tests/util/sh/t_expand.sh:1.2 src/tests/util/sh/t_expand.sh:1.3
--- src/tests/util/sh/t_expand.sh:1.2 Wed Apr 30 13:11:00 2008
+++ src/tests/util/sh/t_expand.sh Wed Oct 14 13:02:03 2009
@@ -1,6 +1,6 @@
-# $NetBSD: t_expand.sh,v 1.2 2008/04/30 13:11:00 martin Exp $
+# $NetBSD: t_expand.sh,v 1.3 2009/10/14 13:02:03 jmmv Exp $
#
-# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -29,6 +29,19 @@
# This file tests the functions in expand.c.
#
+delim_argv() {
+ str=
+ while [ $# -gt 0 ]; do
+ if [ -z ${str} ]; then
+ str=$1
+ else
+ str=${str} $1
+ fi
+shift
+ done
+ echo ${str}
+}
+
atf_test_case dollar_at
dollar_at_head() {
atf_set descr Somewhere between 2.0.2 and 3.0 the expansion \
@@ -52,6 +65,23 @@
atf_check_equal '0' '$n_args'
}
+atf_test_case dollar_at_with_text
+dollar_at_with_text_head() {
+ atf_set descr Test \$@ expansion when it is surrounded by text \
+ within the quotes. PR bin/33956.
+}
+dollar_at_with_text_body() {
+ set --
+ atf_check_equal '' $(delim_argv $@)
+ atf_check_equal 'foobar' $(delim_argv f...@bar)
+ atf_check_equal 'foo bar' $(delim_argv foo $@ bar)
+
+ set -- a b c
+ atf_check_equal 'a b c' $(delim_argv $@)
+ atf_check_equal 'fooa b cbar' $(delim_argv f...@bar)
+ atf_check_equal 'foo a b c bar' $(delim_argv foo $@ bar)
+}
+
atf_test_case strip
strip_head() {
atf_set descr Checks that the %% operator works and strips \
@@ -79,6 +109,7 @@
atf_init_test_cases() {
atf_add_test_case dollar_at
+ atf_add_test_case dollar_at_with_text
atf_add_test_case strip
atf_add_test_case arithmetic
}
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jmmv Date: Thu Oct 1 19:02:27 UTC 2009 Modified Files: src/sys/dev/pci: r128fb.c Log Message: Recognize PCI_PRODUCT_ATI_RAGEGLPCI. Works on a PowerMac G3 BW running NetBSD/macppc. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/r128fb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/r128fb.c diff -u src/sys/dev/pci/r128fb.c:1.9 src/sys/dev/pci/r128fb.c:1.10 --- src/sys/dev/pci/r128fb.c:1.9 Thu Aug 20 02:40:57 2009 +++ src/sys/dev/pci/r128fb.c Thu Oct 1 19:02:27 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: r128fb.c,v 1.9 2009/08/20 02:40:57 macallan Exp $ */ +/* $NetBSD: r128fb.c,v 1.10 2009/10/01 19:02:27 jmmv Exp $ */ /* * Copyright (c) 2007 Michael Lorenz @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: r128fb.c,v 1.9 2009/08/20 02:40:57 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: r128fb.c,v 1.10 2009/10/01 19:02:27 jmmv Exp $); #include sys/param.h #include sys/systm.h @@ -173,6 +173,7 @@ /* only cards tested on so far - likely need a list */ if ((PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_ATI_RAGE1AGP4XT) || (PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_ATI_RAGE3AGP4XT) || + (PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_ATI_RAGEGLPCI) || (PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_ATI_RAGE_MOB_M3_AGP)) return 100; return (0);
CVS commit: src/libexec/ld.elf_so/arch
Module Name:src Committed By: jmmv Date: Sat Aug 29 13:46:55 UTC 2009 Modified Files: src/libexec/ld.elf_so/arch/alpha: alpha_reloc.c src/libexec/ld.elf_so/arch/arm: mdreloc.c src/libexec/ld.elf_so/arch/hppa: hppa_reloc.c src/libexec/ld.elf_so/arch/i386: mdreloc.c src/libexec/ld.elf_so/arch/m68k: mdreloc.c src/libexec/ld.elf_so/arch/mips: mips_reloc.c src/libexec/ld.elf_so/arch/powerpc: ppc_reloc.c src/libexec/ld.elf_so/arch/sh3: mdreloc.c src/libexec/ld.elf_so/arch/vax: mdreloc.c src/libexec/ld.elf_so/arch/x86_64: mdreloc.c Log Message: Remove trailing \n in calls to _rtld_error: a newline is automatically added by a call to the function. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c cvs rdiff -u -r1.29 -r1.30 src/libexec/ld.elf_so/arch/arm/mdreloc.c cvs rdiff -u -r1.28 -r1.29 src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c cvs rdiff -u -r1.27 -r1.28 src/libexec/ld.elf_so/arch/i386/mdreloc.c cvs rdiff -u -r1.23 -r1.24 src/libexec/ld.elf_so/arch/m68k/mdreloc.c cvs rdiff -u -r1.54 -r1.55 src/libexec/ld.elf_so/arch/mips/mips_reloc.c cvs rdiff -u -r1.42 -r1.43 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c cvs rdiff -u -r1.25 -r1.26 src/libexec/ld.elf_so/arch/sh3/mdreloc.c cvs rdiff -u -r1.24 -r1.25 src/libexec/ld.elf_so/arch/vax/mdreloc.c cvs rdiff -u -r1.34 -r1.35 src/libexec/ld.elf_so/arch/x86_64/mdreloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c diff -u src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.32 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.33 --- src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.32 Sun May 24 18:29:03 2009 +++ src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c Sat Aug 29 13:46:54 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: alpha_reloc.c,v 1.32 2009/05/24 18:29:03 he Exp $ */ +/* $NetBSD: alpha_reloc.c,v 1.33 2009/08/29 13:46:54 jmmv Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -62,7 +62,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: alpha_reloc.c,v 1.32 2009/05/24 18:29:03 he Exp $); +__RCSID($NetBSD: alpha_reloc.c,v 1.33 2009/08/29 13:46:54 jmmv Exp $); #endif /* not lint */ #include sys/types.h @@ -270,7 +270,7 @@ (void *)load_ptr(where), obj-strtab + obj-symtab[symnum].st_name)); _rtld_error(%s: Unsupported relocation type %ld - in non-PLT relocations\n, + in non-PLT relocations, obj-path, (u_long) ELF_R_TYPE(rela-r_info)); return -1; } Index: src/libexec/ld.elf_so/arch/arm/mdreloc.c diff -u src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.29 src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.30 --- src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.29 Mon Mar 16 02:46:47 2009 +++ src/libexec/ld.elf_so/arch/arm/mdreloc.c Sat Aug 29 13:46:54 2009 @@ -1,8 +1,8 @@ -/* $NetBSD: mdreloc.c,v 1.29 2009/03/16 02:46:47 lukem Exp $ */ +/* $NetBSD: mdreloc.c,v 1.30 2009/08/29 13:46:54 jmmv Exp $ */ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: mdreloc.c,v 1.29 2009/03/16 02:46:47 lukem Exp $); +__RCSID($NetBSD: mdreloc.c,v 1.30 2009/08/29 13:46:54 jmmv Exp $); #endif /* not lint */ #include sys/types.h @@ -188,7 +188,7 @@ (void *)rel-r_offset, (void *)load_ptr(where), obj-strtab + obj-symtab[symnum].st_name)); _rtld_error(%s: Unsupported relocation type %ld - in non-PLT relocations\n, + in non-PLT relocations, obj-path, (u_long) ELF_R_TYPE(rel-r_info)); return -1; } Index: src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c diff -u src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.28 src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.29 --- src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.28 Sat May 23 17:50:34 2009 +++ src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c Sat Aug 29 13:46:54 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: hppa_reloc.c,v 1.28 2009/05/23 17:50:34 mjf Exp $ */ +/* $NetBSD: hppa_reloc.c,v 1.29 2009/08/29 13:46:54 jmmv Exp $ */ /*- * Copyright (c) 2002, 2004 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: hppa_reloc.c,v 1.28 2009/05/23 17:50:34 mjf Exp $); +__RCSID($NetBSD: hppa_reloc.c,v 1.29 2009/08/29 13:46:54 jmmv Exp $); #endif /* not lint */ #include stdlib.h @@ -483,7 +483,7 @@ (void *)load_ptr(where), obj-strtab + obj-symtab[symnum].st_name)); _rtld_error(%s: Unsupported relocation type %ld - in non-PLT relocations\n, + in non-PLT relocations, obj-path, (u_long) ELF_R_TYPE(rela-r_info)); return -1; } Index: src/libexec/ld.elf_so/arch/i386/mdreloc.c diff -u src/libexec/ld.elf_so/arch/i386/mdreloc.c:1.27 src/libexec/ld.elf_so/arch/i386/mdreloc.c:1.28 --- src/libexec/ld.elf_so/arch/i386/mdreloc.c:1.27 Mon Mar 16 02:44:47 2009 +++ src/libexec/ld.elf_so/arch/i386/mdreloc.c
