CVS commit: src/lib/libpthread
Module Name:src Committed By: wiz Date: Fri Aug 6 06:29:39 UTC 2010 Modified Files: src/lib/libpthread: pthread_testcancel.3 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libpthread/pthread_testcancel.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpthread/pthread_testcancel.3 diff -u src/lib/libpthread/pthread_testcancel.3:1.6 src/lib/libpthread/pthread_testcancel.3:1.7 --- src/lib/libpthread/pthread_testcancel.3:1.6 Fri Aug 6 05:25:46 2010 +++ src/lib/libpthread/pthread_testcancel.3 Fri Aug 6 06:29:38 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: pthread_testcancel.3,v 1.6 2010/08/06 05:25:46 christos Exp $ +.\ $NetBSD: pthread_testcancel.3,v 1.7 2010/08/06 06:29:38 wiz Exp $ .\ .\ Copyright (c) 2002 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -23,7 +23,7 @@ .\ POSSIBILITY OF SUCH DAMAGE. .\ .\ $FreeBSD: src/lib/libpthread/man/pthread_testcancel.3,v 1.9 2002/09/16 19:29:29 mini Exp $ -.Dd Auguest 6, 2010 +.Dd August 6, 2010 .Dt PTHREAD_TESTCANCEL 3 .Os .Sh NAME
CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src Committed By: agc Date: Fri Aug 6 06:58:53 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist: configure.ac Added Files: src/crypto/external/bsd/netpgp/dist: ax_check_openssl.m4 Log Message: Check in mods from Alan Horn to allow an alternate location for (a more up to date?) version of openssl to be specified at configuration time. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/crypto/external/bsd/netpgp/dist/ax_check_openssl.m4 cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/netpgp/dist/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/configure.ac diff -u src/crypto/external/bsd/netpgp/dist/configure.ac:1.33 src/crypto/external/bsd/netpgp/dist/configure.ac:1.34 --- src/crypto/external/bsd/netpgp/dist/configure.ac:1.33 Fri Jul 9 05:36:28 2010 +++ src/crypto/external/bsd/netpgp/dist/configure.ac Fri Aug 6 06:58:53 2010 @@ -1,10 +1,10 @@ -# $NetBSD: configure.ac,v 1.33 2010/07/09 05:36:28 agc Exp $ +# $NetBSD: configure.ac,v 1.34 2010/08/06 06:58:53 agc Exp $ # # Process this file with autoconf to produce a configure script. -AC_INIT([netpgp],[20100707],[Alistair Crooks a...@netbsd.org c0596823]) +AC_INIT([netpgp],[20100710],[Alistair Crooks a...@netbsd.org c0596823]) AC_PREREQ(2.63) -AC_REVISION([$Revision: 1.33 $]) +AC_REVISION([$Revision: 1.34 $]) AS_SHELL_SANITIZE @@ -38,6 +38,9 @@ AC_MSG_RESULT([no])]) AC_SUBST([WARNCFLAGS]) +# try to see if we need to link with -ldl +AC_SEARCH_LIBS(dlopen, dl) + # Checks for header files. # AC_HEADER_STDC @@ -64,6 +67,12 @@ AC_TYPE_UINT64_T AC_TYPE_UINT8_T +# check for openssl +m4_include([ax_check_openssl.m4]) + +AX_CHECK_OPENSSL([LIBS=$LIBS $OPENSSL_LIBS INCLUDES=$INCLUDES $OPENSSL_INCLUDES], + [AC_MSG_ERROR([Missing OpenSSL])]) + AC_CHECK_TYPES([SHA256_CTX], [], [AC_MSG_FAILURE([missing SHA256_CTX; is openssl 0.9.8 or newer installed?])], Added files: Index: src/crypto/external/bsd/netpgp/dist/ax_check_openssl.m4 diff -u /dev/null src/crypto/external/bsd/netpgp/dist/ax_check_openssl.m4:1.1 --- /dev/null Fri Aug 6 06:58:54 2010 +++ src/crypto/external/bsd/netpgp/dist/ax_check_openssl.m4 Fri Aug 6 06:58:53 2010 @@ -0,0 +1,124 @@ +# === +# http://www.gnu.org/software/autoconf-archive/ax_check_openssl.html +# === +# +# SYNOPSIS +# +# AX_CHECK_OPENSSL([action-if-found[, action-if-not-found]]) +# +# DESCRIPTION +# +# Look for OpenSSL in a number of default spots, or in a user-selected +# spot (via --with-openssl). Sets +# +# OPENSSL_INCLUDES to the include directives required +# OPENSSL_LIBS to the -l directives required +# OPENSSL_LDFLAGS to the -L or -R flags required +# +# and calls ACTION-IF-FOUND or ACTION-IF-NOT-FOUND appropriately +# +# This macro sets OPENSSL_INCLUDES such that source files should use the +# openssl/ directory in include directives: +# +# #include openssl/hmac.h +# +# LICENSE +# +# Copyright (c) 2009 Zmanda Inc. http://www.zmanda.com/ +# Copyright (c) 2009 Dustin J. Mitchell dus...@zmanda.com +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 5 + +AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL]) +AC_DEFUN([AX_CHECK_OPENSSL], [ +found=false +AC_ARG_WITH(openssl, +AS_HELP_STRING([--with-openssl=DIR], +[root of the OpenSSL directory]), +[ +case $withval in + | y | ye | yes | n | no) +AC_MSG_ERROR([Invalid --with-openssl value]) + ;; +*) ssldirs=$withval + ;; +esac +], [ +# if pkg-config is installed and openssl has installed a .pc file, +# then use that information and don't search ssldirs +AC_PATH_PROG(PKG_CONFIG, pkg-config) +if test x$PKG_CONFIG != x; then +OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2/dev/null` +if test $? = 0; then +OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2/dev/null` +OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2/dev/null` +found=true +fi +fi + +# no such luck; use some default ssldirs +if ! $found; then +ssldirs=/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr +fi +] +) + + +# note that we #include openssl/foo.h, so the OpenSSL headers have to be in +# an
CVS commit: src/games/sail
Module Name:src
Committed By: dholland
Date: Fri Aug 6 09:14:40 UTC 2010
Modified Files:
src/games/sail: dr_main.c extern.h globals.c lo_main.c main.c pl_7.c
pl_main.c
Log Message:
Rework the game startup so it uses curses nicely. There are now menus
and stuff for picking scenarios and ships and all that.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/games/sail/dr_main.c
cvs rdiff -u -r1.35 -r1.36 src/games/sail/extern.h
cvs rdiff -u -r1.15 -r1.16 src/games/sail/globals.c
cvs rdiff -u -r1.18 -r1.19 src/games/sail/lo_main.c
cvs rdiff -u -r1.25 -r1.26 src/games/sail/main.c
cvs rdiff -u -r1.39 -r1.40 src/games/sail/pl_7.c
cvs rdiff -u -r1.26 -r1.27 src/games/sail/pl_main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/sail/dr_main.c
diff -u src/games/sail/dr_main.c:1.14 src/games/sail/dr_main.c:1.15
--- src/games/sail/dr_main.c:1.14 Sat Mar 14 19:36:42 2009
+++ src/games/sail/dr_main.c Fri Aug 6 09:14:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dr_main.c,v 1.14 2009/03/14 19:36:42 dholland Exp $ */
+/* $NetBSD: dr_main.c,v 1.15 2010/08/06 09:14:40 dholland Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,17 +34,22 @@
#if 0
static char sccsid[] = @(#)dr_main.c 8.2 (Berkeley) 4/16/94;
#else
-__RCSID($NetBSD: dr_main.c,v 1.14 2009/03/14 19:36:42 dholland Exp $);
+__RCSID($NetBSD: dr_main.c,v 1.15 2010/08/06 09:14:40 dholland Exp $);
#endif
#endif /* not lint */
#include err.h
+#include setjmp.h
#include signal.h
#include stdio.h
#include stdlib.h
#include unistd.h
#include extern.h
#include driver.h
+#include player.h /* XXX for LEAVE_FORK */
+#include restart.h
+
+static int driver_wait_fd = -1;
int
dr_main(void)
@@ -54,23 +59,28 @@
int nat[NNATION];
int value = 0;
+ /*
+ * XXX need a way to print diagnostics back to the player
+ * process instead of stomping on the curses screen.
+ */
+
signal(SIGINT, SIG_IGN);
signal(SIGQUIT, SIG_IGN);
signal(SIGTSTP, SIG_IGN);
if (game 0 || game = NSCENE) {
- errx(1, driver: Bad game number %d, game);
+ errx(1, \ndriver: Bad game number %d, game);
}
cc = scene[game];
ls = SHIP(cc-vessels);
if (sync_open() 0) {
- err(1, driver: syncfile);
+ err(1, \ndriver: syncfile);
}
for (n = 0; n NNATION; n++)
nat[n] = 0;
foreachship(sp) {
if (sp-file == NULL
(sp-file = calloc(1, sizeof (struct File))) == NULL) {
- fprintf(stderr, DRIVER: Out of memory.\n);
+ fprintf(stderr, \nDRIVER: Out of memory.\n);
exit(1);
}
sp-file-index = sp - SHIP(0);
@@ -86,6 +96,12 @@
windspeed = cc-windspeed;
winddir = cc-winddir;
people = 0;
+
+ /* report back to the player process that we've started */
+ if (driver_wait_fd = 0) {
+ close(driver_wait_fd);
+ }
+
for (;;) {
sleep(7);
if (Sync() 0) {
@@ -112,3 +128,35 @@
sync_close(1);
return value;
}
+
+void
+startdriver(void)
+{
+ int fds[2];
+ char c;
+
+ if (pipe(fds)) {
+ warn(pipe);
+ leave(LEAVE_FORK);
+ return;
+ }
+
+ switch (fork()) {
+ case 0:
+ close(fds[0]);
+ driver_wait_fd = fds[1];
+ longjmp(restart, MODE_DRIVER);
+ /*NOTREACHED*/
+ case -1:
+ warn(fork);
+ close(fds[0]);
+ close(fds[1]);
+ leave(LEAVE_FORK);
+ break;
+ default:
+ hasdriver++;
+ close(fds[1]);
+ read(fds[0], c, 1);
+ close(fds[0]);
+ }
+}
Index: src/games/sail/extern.h
diff -u src/games/sail/extern.h:1.35 src/games/sail/extern.h:1.36
--- src/games/sail/extern.h:1.35 Wed Aug 12 09:05:08 2009
+++ src/games/sail/extern.h Fri Aug 6 09:14:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.35 2009/08/12 09:05:08 dholland Exp $ */
+/* $NetBSD: extern.h,v 1.36 2010/08/06 09:14:40 dholland Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -43,13 +43,15 @@
#define MODE_LOGGER 3
/* command line flags */
-extern int randomize; /* -x, give first available ship */
-extern int longfmt; /* -l, print score in long format */
-extern int nobells; /* -b, don't ring bell before Signal */
+extern bool randomize; /* -x, give first available ship */
+extern bool longfmt; /* -l, print score in long format */
+extern bool nobells; /* -b, don't ring bell before Signal */
- /* other initial modes */
+ /* other initial data */
extern gid_t gid;
extern gid_t egid;
+#define MAXNAMESIZE 20
+extern char myname[MAXNAMESIZE];
#define dieroll() ((random()) % 6 + 1)
#define sqr(a) ((a) * (a))
@@ -103,7 +105,7 @@
#define NLOG 10
struct logs {
- char l_name[20];
+ char l_name[MAXNAMESIZE];
int l_uid;
int l_shipnum;
int l_gamenum;
@@ -121,7 +123,7 @@
short sn_turn;
};
-#define NSCENE nscene
+#define NSCENE /*nscene*/ 32
#define NSHIP 10
#define NBP 3
@@ -137,7 +139,7 @@
struct File {
int index;
- char captain[20]; /* 0 */
+ char captain[MAXNAMESIZE]; /* 0 */
short points; /* 20 */
unsigned char loadL; /* 22 */
unsigned char loadR; /* 24 */
@@ -185,7 +187,7 @@
const char
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Aug 6 10:59:52 UTC 2010 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention new bind. To generate a diff of this commit: cvs rdiff -u -r1.772 -r1.773 src/doc/3RDPARTY cvs rdiff -u -r1.1426 -r1.1427 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/3RDPARTY diff -u src/doc/3RDPARTY:1.772 src/doc/3RDPARTY:1.773 --- src/doc/3RDPARTY:1.772 Wed Aug 4 13:15:24 2010 +++ src/doc/3RDPARTY Fri Aug 6 06:59:52 2010 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.772 2010/08/04 17:15:24 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.773 2010/08/06 10:59:52 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -91,8 +91,8 @@ bc includes dc, both of which are in the NetBSD tree. Package: bind [named and utils] -Version: 9.7.0-rc1 -Current Vers: 9.7.0-rc1 +Version: 9.7.2b1 +Current Vers: 9.7.2b1 Maintainer: Paul Vixie vi...@vix.com Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/sw/bind/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1426 src/doc/CHANGES:1.1427 --- src/doc/CHANGES:1.1426 Wed Aug 4 13:15:24 2010 +++ src/doc/CHANGES Fri Aug 6 06:59:52 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1426 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1427 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -701,3 +701,4 @@ [kiyohara 20100801] tests: Convert the sort tests to ATF. [jmmv 20100801] wpa: New wpa_supplicant and hostapd 0.7.2 [christos 20100804] + bind: Update to 9.7.2b1. [christos 20100806]
CVS commit: src/lib/libpthread
Module Name:src Committed By: christos Date: Fri Aug 6 14:23:06 UTC 2010 Modified Files: src/lib/libpthread: pthread_attr.c Log Message: Add a weak alias for pthread_attr_get_np. Noted my Matthias Drochner. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/libpthread/pthread_attr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpthread/pthread_attr.c diff -u src/lib/libpthread/pthread_attr.c:1.13 src/lib/libpthread/pthread_attr.c:1.14 --- src/lib/libpthread/pthread_attr.c:1.13 Fri Aug 6 01:25:02 2010 +++ src/lib/libpthread/pthread_attr.c Fri Aug 6 10:23:06 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_attr.c,v 1.13 2010/08/06 05:25:02 christos Exp $ */ +/* $NetBSD: pthread_attr.c,v 1.14 2010/08/06 14:23:06 christos Exp $ */ /*- * Copyright (c) 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: pthread_attr.c,v 1.13 2010/08/06 05:25:02 christos Exp $); +__RCSID($NetBSD: pthread_attr.c,v 1.14 2010/08/06 14:23:06 christos Exp $); #include errno.h #include stdio.h @@ -41,6 +41,12 @@ #include pthread.h #include pthread_int.h +#ifndef __lint__ +#define pthread_attr_get_np _pthread_attr_get_np +#endif + +__weak_alias(pthread_attr_get_np, _pthread_attr_get_np) + static struct pthread_attr_private *pthread__attr_init_private( pthread_attr_t *);
CVS commit: src/usr.sbin/puffs/mount_sysctlfs
Module Name:src
Committed By: pooka
Date: Fri Aug 6 15:04:13 UTC 2010
Modified Files:
src/usr.sbin/puffs/mount_sysctlfs: Makefile sysctlfs.c
Log Message:
If compiled with RUMP_ACTION, access rump kernel instead of host
kernel. This is an easy way to browse modify the sysctl tree
offered by a rump kernel instance.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/puffs/mount_sysctlfs/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/puffs/mount_sysctlfs/Makefile
diff -u src/usr.sbin/puffs/mount_sysctlfs/Makefile:1.3 src/usr.sbin/puffs/mount_sysctlfs/Makefile:1.4
--- src/usr.sbin/puffs/mount_sysctlfs/Makefile:1.3 Wed Apr 22 15:23:07 2009
+++ src/usr.sbin/puffs/mount_sysctlfs/Makefile Fri Aug 6 15:04:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/04/22 15:23:07 lukem Exp $
+# $NetBSD: Makefile,v 1.4 2010/08/06 15:04:13 pooka Exp $
PROG= mount_sysctlfs
SRCS= sysctlfs.c
@@ -8,4 +8,9 @@
MAN= mount_sysctlfs.8
+.ifdef RUMP_ACTION
+CPPFLAGS+= -DRUMP_ACTION
+LDADD+= -lrump -lrumpuser -lpthread
+.endif
+
.include bsd.prog.mk
Index: src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c
diff -u src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c:1.14 src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c:1.15
--- src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c:1.14 Sun Apr 11 15:08:17 2010
+++ src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c Fri Aug 6 15:04:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctlfs.c,v 1.14 2010/04/11 15:08:17 pooka Exp $ */
+/* $NetBSD: sysctlfs.c,v 1.15 2010/08/06 15:04:13 pooka Exp $ */
/*-
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -33,7 +33,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: sysctlfs.c,v 1.14 2010/04/11 15:08:17 pooka Exp $);
+__RCSID($NetBSD: sysctlfs.c,v 1.15 2010/08/06 15:04:13 pooka Exp $);
#endif /* !lint */
#include sys/types.h
@@ -50,6 +50,13 @@
#include unistd.h
#include util.h
+#ifdef RUMP_ACTION
+#include rump/rump.h
+#include rump/rump_syscalls.h
+
+#define sysctl(a,b,c,d,e,f) rump_sys___sysctl(a,b,c,d,e,f)
+#endif
+
PUFFSOP_PROTOS(sysctlfs)
struct sfsnode {
@@ -292,6 +299,14 @@
if (puffs_daemon(pu, 1, 1) == -1)
err(1, puffs_daemon);
+#ifdef RUMP_ACTION
+ {
+ extern int puffs_fakecc;
+ puffs_fakecc = 1;
+ rump_init();
+ }
+#endif
+
if (puffs_mount(pu, argv[1], mntflags, puffs_getroot(pu)) == -1)
err(1, puffs_mount);
if (puffs_mainloop(pu) == -1)
CVS commit: src/lib/libpthread
Module Name:src Committed By: christos Date: Fri Aug 6 15:21:50 UTC 2010 Modified Files: src/lib/libpthread: pthread_attr.c Log Message: move namespace protection before inclusion. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libpthread/pthread_attr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpthread/pthread_attr.c diff -u src/lib/libpthread/pthread_attr.c:1.14 src/lib/libpthread/pthread_attr.c:1.15 --- src/lib/libpthread/pthread_attr.c:1.14 Fri Aug 6 10:23:06 2010 +++ src/lib/libpthread/pthread_attr.c Fri Aug 6 11:21:50 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_attr.c,v 1.14 2010/08/06 14:23:06 christos Exp $ */ +/* $NetBSD: pthread_attr.c,v 1.15 2010/08/06 15:21:50 christos Exp $ */ /*- * Copyright (c) 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: pthread_attr.c,v 1.14 2010/08/06 14:23:06 christos Exp $); +__RCSID($NetBSD: pthread_attr.c,v 1.15 2010/08/06 15:21:50 christos Exp $); #include errno.h #include stdio.h @@ -38,13 +38,13 @@ #include string.h #include unistd.h -#include pthread.h -#include pthread_int.h - #ifndef __lint__ #define pthread_attr_get_np _pthread_attr_get_np #endif +#include pthread.h +#include pthread_int.h + __weak_alias(pthread_attr_get_np, _pthread_attr_get_np) static struct pthread_attr_private *pthread__attr_init_private(
CVS commit: src/usr.sbin/puffs/mount_sysctlfs
Module Name:src
Committed By: pooka
Date: Fri Aug 6 15:26:16 UTC 2010
Modified Files:
src/usr.sbin/puffs/mount_sysctlfs: sysctlfs.c
Log Message:
support CTLTYPE_BOOL
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c
diff -u src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c:1.15 src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c:1.16
--- src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c:1.15 Fri Aug 6 15:04:13 2010
+++ src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c Fri Aug 6 15:26:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctlfs.c,v 1.15 2010/08/06 15:04:13 pooka Exp $ */
+/* $NetBSD: sysctlfs.c,v 1.16 2010/08/06 15:26:16 pooka Exp $ */
/*-
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -33,7 +33,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: sysctlfs.c,v 1.15 2010/08/06 15:04:13 pooka Exp $);
+__RCSID($NetBSD: sysctlfs.c,v 1.16 2010/08/06 15:26:16 pooka Exp $);
#endif /* !lint */
#include sys/types.h
@@ -400,6 +400,20 @@
memset(buf, 0, *bufsize);
switch (SYSCTL_TYPE(sfs-sysctl_flags)) {
+ case CTLTYPE_BOOL: {
+ bool b;
+ sz = sizeof(bool);
+ assert(sz = *bufsize);
+ if (sysctl(po-po_path, po-po_len, b, sz, NULL, 0) == -1) {
+ error = errno;
+ break;
+ }
+ if (rflag)
+ memcpy(buf, b, sz);
+ else
+ snprintf(buf, *bufsize, %s, b ? true : false);
+ break;
+ }
case CTLTYPE_INT: {
int i;
sz = sizeof(int);
@@ -458,7 +472,8 @@
break;
}
default:
- snprintf(buf, *bufsize, invalid sysctl CTLTYPE);
+ snprintf(buf, *bufsize, invalid sysctl CTLTYPE %d,
+ SYSCTL_TYPE(sfs-sysctl_flags));
break;
}
@@ -722,6 +737,7 @@
struct sfsnode *sfs = pn-pn_data;
long long ll;
int i, rv;
+ bool b;
/*
* I picked the wrong day to ... um, the wrong place to return errors
@@ -744,6 +760,16 @@
return EINVAL;
switch (SYSCTL_TYPE(sfs-sysctl_flags)) {
+ case CTLTYPE_BOOL:
+ if (strcasestr((const char *)buf, true))
+ b = true;
+ else if (strcasestr((const char *)buf, false))
+ b = false;
+ else
+ return EINVAL;
+ rv = sysctl(PNPATH(pn), PNPLEN(pn), NULL, NULL,
+ b, sizeof(b));
+ break;
case CTLTYPE_INT:
if (sscanf((const char *)buf, %d, i) != 1)
return EINVAL;
CVS commit: src/sys/dev/sysmon
Module Name:src
Committed By: pooka
Date: Fri Aug 6 16:02:56 UTC 2010
Modified Files:
src/sys/dev/sysmon: swwdog.c
Log Message:
* fix logic inversion in swwdog_reboot (and the sysctl).
* attach sysctl in constructor instead of as a link set to give it
a chance to work in a module
* teardown sysctl when driver is detached to avoid dangling pointer
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/sysmon/swwdog.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/sysmon/swwdog.c
diff -u src/sys/dev/sysmon/swwdog.c:1.10 src/sys/dev/sysmon/swwdog.c:1.11
--- src/sys/dev/sysmon/swwdog.c:1.10 Thu Jul 22 14:10:15 2010
+++ src/sys/dev/sysmon/swwdog.c Fri Aug 6 16:02:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: swwdog.c,v 1.10 2010/07/22 14:10:15 pgoyette Exp $ */
+/* $NetBSD: swwdog.c,v 1.11 2010/08/06 16:02:56 pooka Exp $ */
/*
* Copyright (c) 2004, 2005 Steven M. Bellovin
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: swwdog.c,v 1.10 2010/07/22 14:10:15 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: swwdog.c,v 1.11 2010/08/06 16:02:56 pooka Exp $);
/*
*
@@ -82,6 +82,9 @@
CFATTACH_DECL_NEW(swwdog, sizeof(struct swwdog_softc),
swwdog_match, swwdog_attach, swwdog_detach, NULL);
+static void swwdog_sysctl_setup(void);
+static struct sysctllog *swwdog_sysctllog;
+
void
swwdogattach(int n __unused)
{
@@ -134,6 +137,8 @@
if (!pmf_device_register(self, swwdog_suspend, NULL))
aprint_error_dev(self, couldn't establish power handler\n);
+
+ swwdog_sysctl_setup();
}
static int
@@ -143,6 +148,7 @@
swwdog_disarm(sc);
callout_destroy(sc-sc_c);
+ sysctl_teardown(swwdog_sysctllog);
return 1;
}
@@ -207,8 +213,8 @@
struct swwdog_softc *sc = vsc;
bool do_panic;
- do_panic = swwdog_reboot;
- swwdog_reboot = 1;
+ do_panic = !swwdog_reboot;
+ swwdog_reboot = false;
callout_schedule(sc-sc_c, 60 * hz); /* deliberate double-panic */
printf(%s: %d second timer expired\n, device_xname(sc-sc_dev),
@@ -220,25 +226,19 @@
cpu_reboot(0, NULL);
}
-SYSCTL_SETUP(sysctl_swwdog, swwdog subtree setup)
+static void
+swwdog_sysctl_setup(void)
{
- int err;
const struct sysctlnode *me;
- err = sysctl_createv(NULL, 0, NULL, NULL, CTLFLAG_PERMANENT,
- CTLTYPE_NODE, machdep, NULL,
- NULL, 0, NULL, 0,
- CTL_HW, CTL_EOL);
+ KASSERT(swwdog_sysctllog == NULL);
- if (err == 0)
- err = sysctl_createv(NULL, 0, NULL, me, CTLFLAG_READWRITE,
- CTLTYPE_NODE, swwdog, NULL,
- NULL, 0, NULL, 0,
- CTL_HW, CTL_CREATE, CTL_EOL);
-
- if (err == 0)
- err = sysctl_createv(NULL, 0, NULL, NULL, CTLFLAG_READWRITE,
- CTLTYPE_BOOL, reboot, reboot if timer expires,
- NULL, 0, swwdog_reboot, sizeof(bool),
- CTL_HW, me-sysctl_num, CTL_CREATE, CTL_EOL);
+ sysctl_createv(swwdog_sysctllog, 0, NULL, me, CTLFLAG_READWRITE,
+ CTLTYPE_NODE, swwdog, NULL,
+ NULL, 0, NULL, 0,
+ CTL_HW, CTL_CREATE, CTL_EOL);
+ sysctl_createv(swwdog_sysctllog, 0, NULL, NULL, CTLFLAG_READWRITE,
+ CTLTYPE_BOOL, reboot, reboot if timer expires,
+ NULL, 0, swwdog_reboot, sizeof(bool),
+ CTL_HW, me-sysctl_num, CTL_CREATE, CTL_EOL);
}
CVS commit: src/tests/dev
Module Name:src
Committed By: pooka
Date: Fri Aug 6 16:13:27 UTC 2010
Modified Files:
src/tests/dev: Makefile
Added Files:
src/tests/dev/sysmon: Makefile t_swwdog.c
Log Message:
Add test cases to check that sysmon/swwdog will panic and reboot
the kernel if left untickled.
Thanks to jmmv for the tip that doing this is possible in atf via
means of fork/wait.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/dev/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/dev/sysmon/Makefile \
src/tests/dev/sysmon/t_swwdog.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/dev/Makefile
diff -u src/tests/dev/Makefile:1.1 src/tests/dev/Makefile:1.2
--- src/tests/dev/Makefile:1.1 Wed Aug 4 13:15:15 2010
+++ src/tests/dev/Makefile Fri Aug 6 16:13:26 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2010/08/04 13:15:15 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/08/06 16:13:26 pooka Exp $
#
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/dev
-TESTS_SUBDIRS+= audio
+TESTS_SUBDIRS+= audio sysmon
.include bsd.test.mk
Added files:
Index: src/tests/dev/sysmon/Makefile
diff -u /dev/null src/tests/dev/sysmon/Makefile:1.1
--- /dev/null Fri Aug 6 16:13:27 2010
+++ src/tests/dev/sysmon/Makefile Fri Aug 6 16:13:26 2010
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2010/08/06 16:13:26 pooka Exp $
+#
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/dev/sysmon
+
+TESTS_C= t_swwdog
+
+LDADD+= -lrumpdev_sysmon -lrumpdev -lrumpvfs
+LDADD+= -lrump
+LDADD+= -lrumpuser -lpthread
+
+WARNS= 4
+
+.include bsd.test.mk
Index: src/tests/dev/sysmon/t_swwdog.c
diff -u /dev/null src/tests/dev/sysmon/t_swwdog.c:1.1
--- /dev/null Fri Aug 6 16:13:27 2010
+++ src/tests/dev/sysmon/t_swwdog.c Fri Aug 6 16:13:26 2010
@@ -0,0 +1,166 @@
+/* $NetBSD: t_swwdog.c,v 1.1 2010/08/06 16:13:26 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/types.h
+#include sys/wait.h
+#include sys/wdog.h
+
+#include assert.h
+#include atf-c.h
+#include err.h
+#include errno.h
+#include fcntl.h
+#include stdio.h
+#include stdlib.h
+#include string.h
+#include unistd.h
+
+#include rump/rump.h
+#include rump/rump_syscalls.h
+
+#include ../../h_macros.h
+
+static sig_atomic_t tcount;
+
+static void
+sigcount(int sig)
+{
+
+ assert(sig == SIGUSR1);
+ tcount++;
+}
+
+/*
+ * Since we are testing for swwdog's ability to reboot/panic, we need
+ * to fork and monitor the exit status from the parent and report
+ * something sensible back to atf.
+ */
+static int
+testbody(void)
+{
+ char wname[WDOG_NAMESIZE];
+ struct wdog_conf wc;
+ struct wdog_mode wm;
+ pid_t p1, p2;
+ int status;
+ int fd;
+
+ signal(SIGUSR1, sigcount);
+
+ switch ((p1 = fork())) {
+ case 0:
+ break;
+ case -1:
+ atf_tc_fail_errno(fork);
+ break;
+ default:
+ p2 = wait(status);
+ ATF_REQUIRE_EQ(p1, p2);
+ ATF_REQUIRE_EQ(tcount, 1);
+ return status;
+ }
+
+ rump_init();
+
+ fd = rump_sys_open(/dev/watchdog, O_RDWR);
+ if (fd == -1)
+ err(1, open watchdog);
+
+ wc.wc_count = 1;
+ wc.wc_names = wname;
+
+ if (rump_sys_ioctl(fd, WDOGIOC_GWDOGS, wc) == -1)
+ err(1, can't fetch watchdog names);
+
+ if (wc.wc_count) {
+ assert(wc.wc_count == 1);
+
+ strlcpy(wm.wm_name, wc.wc_names, sizeof(wm.wm_name));
+ wm.wm_mode = WDOG_MODE_ETICKLE;
+ wm.wm_period = 1;
+ if (rump_sys_ioctl(fd, WDOGIOC_SMODE, wm) == -1)
+ atf_tc_fail_errno(failed to set tickle);
+
+ usleep(50);
+ rump_sys_ioctl(fd, WDOGIOC_TICKLE);
+ kill(getppid(), SIGUSR1);
+
+ sleep(2);
+ printf(staying alive\n);
+ }
+ /* fail */
+ _exit(1);
+}
+
+ATF_TC(reboot);
CVS commit: src/etc/mtree
Module Name:src Committed By: pooka Date: Fri Aug 6 16:13:55 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: +tests/dev/sysmon To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 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.44 src/etc/mtree/NetBSD.dist.base:1.45 --- src/etc/mtree/NetBSD.dist.base:1.44 Wed Aug 4 13:18:50 2010 +++ src/etc/mtree/NetBSD.dist.base Fri Aug 6 16:13:55 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.44 2010/08/04 13:18:50 pooka Exp $ +# $NetBSD: NetBSD.dist.base,v 1.45 2010/08/06 16:13:55 pooka Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -202,6 +202,7 @@ ./usr/libdata/debug/usr/tests/crypto/libcrypto ./usr/libdata/debug/usr/tests/dev ./usr/libdata/debug/usr/tests/dev/audio +./usr/libdata/debug/usr/tests/dev/sysmon ./usr/libdata/debug/usr/tests/fs ./usr/libdata/debug/usr/tests/fs/ffs ./usr/libdata/debug/usr/tests/fs/kernfs @@ -1127,6 +1128,7 @@ ./usr/tests/crypto/libcrypto ./usr/tests/dev ./usr/tests/dev/audio +./usr/tests/dev/sysmon ./usr/tests/fs ./usr/tests/fs/ffs ./usr/tests/fs/kernfs
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pooka Date: Fri Aug 6 16:17:13 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: +tp To generate a diff of this commit: cvs rdiff -u -r1.132 -r1.133 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.132 src/distrib/sets/lists/tests/mi:1.133 --- src/distrib/sets/lists/tests/mi:1.132 Wed Aug 4 20:50:30 2010 +++ src/distrib/sets/lists/tests/mi Fri Aug 6 16:17:13 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.132 2010/08/04 20:50:30 joerg Exp $ +# $NetBSD: mi,v 1.133 2010/08/06 16:17:13 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -188,6 +188,8 @@ ./usr/libdata/debug/usr/tests/dev tests-fs-debug ./usr/libdata/debug/usr/tests/dev/audio tests-fs-debug ./usr/libdata/debug/usr/tests/dev/audio/h_pad.debug tests-fs-debug debug,atf +./usr/libdata/debug/usr/tests/dev/sysmon tests-fs-debug +./usr/libdata/debug/usr/tests/dev/sysmon/t_swwdog.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs tests-fs-debug ./usr/libdata/debug/usr/tests/fs/ffs/t_fifos.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs/t_mount.debug tests-fs-debug debug,atf @@ -936,6 +938,9 @@ ./usr/tests/dev/audio/h_pad tests-fs-tests atf ./usr/tests/dev/audio/t_pad tests-fs-tests atf ./usr/tests/dev/audio/t_pad_output.bz2.uue tests-fs-tests atf +./usr/tests/dev/sysmontests-fs-tests +./usr/tests/dev/sysmon/Atffile tests-fs-tests atf +./usr/tests/dev/sysmon/t_swwdog tests-fs-tests atf ./usr/tests/fs tests-fs-tests ./usr/tests/fs/Atffiletests-fs-tests atf ./usr/tests/fs/h_funcs.subr tests-fs-tests atf
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: joerg
Date: Fri Aug 6 16:33:19 UTC 2010
Modified Files:
src/libexec/ld.elf_so: rtld.h
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/sparc: mdreloc.c
src/libexec/ld.elf_so/arch/sparc64: mdreloc.c
src/libexec/ld.elf_so/arch/vax: mdreloc.c
src/libexec/ld.elf_so/arch/x86_64: mdreloc.c
Log Message:
Reduce header pollution for mdreloc.c. Make Obj_Entry argument of
_rtld_relocate_nonplt_objects non-const in preparation for TLS support.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/libexec/ld.elf_so/rtld.h
cvs rdiff -u -r1.36 -r1.37 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c
cvs rdiff -u -r1.33 -r1.34 src/libexec/ld.elf_so/arch/arm/mdreloc.c
cvs rdiff -u -r1.32 -r1.33 src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c
cvs rdiff -u -r1.31 -r1.32 src/libexec/ld.elf_so/arch/i386/mdreloc.c
cvs rdiff -u -r1.26 -r1.27 src/libexec/ld.elf_so/arch/m68k/mdreloc.c
cvs rdiff -u -r1.58 -r1.59 src/libexec/ld.elf_so/arch/mips/mips_reloc.c
cvs rdiff -u -r1.44 -r1.45 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
cvs rdiff -u -r1.27 -r1.28 src/libexec/ld.elf_so/arch/sh3/mdreloc.c
cvs rdiff -u -r1.43 -r1.44 src/libexec/ld.elf_so/arch/sparc/mdreloc.c
cvs rdiff -u -r1.46 -r1.47 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c
cvs rdiff -u -r1.26 -r1.27 src/libexec/ld.elf_so/arch/vax/mdreloc.c
cvs rdiff -u -r1.37 -r1.38 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/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.91 src/libexec/ld.elf_so/rtld.h:1.92
--- src/libexec/ld.elf_so/rtld.h:1.91 Mon Apr 5 14:01:26 2010
+++ src/libexec/ld.elf_so/rtld.h Fri Aug 6 16:33:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.h,v 1.91 2010/04/05 14:01:26 joerg Exp $ */
+/* $NetBSD: rtld.h,v 1.92 2010/08/06 16:33:17 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -280,7 +280,7 @@
/* reloc.c */
int _rtld_do_copy_relocations(const Obj_Entry *);
int _rtld_relocate_objects(Obj_Entry *, bool);
-int _rtld_relocate_nonplt_objects(const Obj_Entry *);
+int _rtld_relocate_nonplt_objects(Obj_Entry *);
int _rtld_relocate_plt_lazy(const Obj_Entry *);
int _rtld_relocate_plt_objects(const Obj_Entry *);
void _rtld_setup_pltgot(const Obj_Entry *);
@@ -309,6 +309,7 @@
#endif
/* map_object.c */
+struct stat;
Obj_Entry *_rtld_map_object(const char *, int, const struct stat *);
void _rtld_obj_free(Obj_Entry *);
Obj_Entry *_rtld_obj_new(void);
Index: src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c
diff -u src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.36 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.37
--- src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.36 Thu Jan 14 11:58:31 2010
+++ src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c Fri Aug 6 16:33:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: alpha_reloc.c,v 1.36 2010/01/14 11:58:31 skrll Exp $ */
+/* $NetBSD: alpha_reloc.c,v 1.37 2010/08/06 16:33:17 joerg Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -62,11 +62,10 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: alpha_reloc.c,v 1.36 2010/01/14 11:58:31 skrll Exp $);
+__RCSID($NetBSD: alpha_reloc.c,v 1.37 2010/08/06 16:33:17 joerg Exp $);
#endif /* not lint */
#include sys/types.h
-#include sys/stat.h
#include string.h
#include rtld.h
@@ -196,7 +195,7 @@
}
int
-_rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+_rtld_relocate_nonplt_objects(Obj_Entry *obj)
{
const Elf_Rela *rela;
Elf_Addr target = -1;
Index: src/libexec/ld.elf_so/arch/arm/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.33 src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.34
--- src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.33 Thu Jan 14 12:12:07 2010
+++ src/libexec/ld.elf_so/arch/arm/mdreloc.c Fri Aug 6 16:33:17 2010
@@ -1,13 +1,11 @@
-/* $NetBSD: mdreloc.c,v 1.33 2010/01/14 12:12:07 skrll Exp $ */
+/* $NetBSD: mdreloc.c,v 1.34 2010/08/06 16:33:17 joerg Exp $ */
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: mdreloc.c,v 1.33 2010/01/14 12:12:07 skrll Exp $);
+__RCSID($NetBSD: mdreloc.c,v 1.34 2010/08/06 16:33:17 joerg Exp $);
#endif /* not lint */
#include sys/types.h
-#include sys/stat.h
-
#include string.h
#include debug.h
@@ -73,7 +71,7 @@
}
int
-_rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+_rtld_relocate_nonplt_objects(Obj_Entry *obj)
{
const Elf_Rel *rel;
Index: src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c
diff -u
CVS commit: src
Module Name:src Committed By: jruoho Date: Fri Aug 6 16:42:31 UTC 2010 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4/man4.x86: Makefile Added Files: src/share/man/man4/man4.x86: hpet.4 Log Message: Add hpet(4). To generate a diff of this commit: cvs rdiff -u -r1.1231 -r1.1232 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.x86/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.x86/hpet.4 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1231 src/distrib/sets/lists/man/mi:1.1232 --- src/distrib/sets/lists/man/mi:1.1231 Thu Aug 5 17:31:11 2010 +++ src/distrib/sets/lists/man/mi Fri Aug 6 16:42:31 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1231 2010/08/05 17:31:11 jruoho Exp $ +# $NetBSD: mi,v 1.1232 2010/08/06 16:42:31 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1734,6 +1734,7 @@ ./usr/share/man/cat4/x68k/vs.0 man-sys-catman .cat ./usr/share/man/cat4/x86/amdpcib.0 man-sys-catman .cat ./usr/share/man/cat4/x86/balloon.0 man-sys-catman .cat +./usr/share/man/cat4/x86/hpet.0 man-sys-catman .cat ./usr/share/man/cat4/xbox.0 man-sys-catman .cat ./usr/share/man/cat4/xge.0 man-sys-catman .cat ./usr/share/man/cat4/xi.0 man-sys-catman .cat @@ -4330,6 +4331,7 @@ ./usr/share/man/html4/x68k/vs.html man-sys-htmlman html ./usr/share/man/html4/x86/amdpcib.html man-sys-htmlman html ./usr/share/man/html4/x86/balloon.html man-sys-htmlman html +./usr/share/man/html4/x86/hpet.html man-sys-htmlman html ./usr/share/man/html4/xbox.html man-sys-htmlman html ./usr/share/man/html4/xge.html man-sys-htmlman html ./usr/share/man/html4/xi.html man-sys-htmlman html @@ -6864,6 +6866,7 @@ ./usr/share/man/man4/x68k/vs.4 man-sys-man .man ./usr/share/man/man4/x86/amdpcib.4 man-sys-man .man ./usr/share/man/man4/x86/balloon.4 man-sys-man .man +./usr/share/man/man4/x86/hpet.4 man-sys-man .man ./usr/share/man/man4/xbox.4 man-sys-man .man ./usr/share/man/man4/xge.4 man-sys-man .man ./usr/share/man/man4/xi.4 man-sys-man .man Index: src/share/man/man4/man4.x86/Makefile diff -u src/share/man/man4/man4.x86/Makefile:1.2 src/share/man/man4/man4.x86/Makefile:1.3 --- src/share/man/man4/man4.x86/Makefile:1.2 Thu Aug 5 04:58:27 2010 +++ src/share/man/man4/man4.x86/Makefile Fri Aug 6 16:42:31 2010 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2010/08/05 04:58:27 jruoho Exp $ +# $NetBSD: Makefile,v 1.3 2010/08/06 16:42:31 jruoho Exp $ -MAN= amdpcib.4 balloon.4 +MAN= amdpcib.4 balloon.4 hpet.4 MANSUBDIR=/x86 Added files: Index: src/share/man/man4/man4.x86/hpet.4 diff -u /dev/null src/share/man/man4/man4.x86/hpet.4:1.1 --- /dev/null Fri Aug 6 16:42:31 2010 +++ src/share/man/man4/man4.x86/hpet.4 Fri Aug 6 16:42:31 2010 @@ -0,0 +1,76 @@ +.\ $NetBSD: hpet.4,v 1.1 2010/08/06 16:42:31 jruoho Exp $ +.\ +.\ Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi +.\ 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. Neither the name of the author nor the names of any +.\contributors may be used to endorse or promote products derived +.\from this software without specific prior written permission. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS +.\ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 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. +.\ +.Dd August 6, 2010 +.Dt HPET 4 x86 +.Os +.Sh NAME +.Nm hpet +.Nd High Precision Event Timer +.Sh SYNOPSIS +.Cd hpet* at acpi? +.Cd hpet* at amdpcib? +.Cd hpet* at ichlpcib? +.Sh DESCRIPTION +The +.Nm +driver supports High Precision Event Timers +.Pq Tn HPETs . +The +.Tn HPET +architecture defines one main 64-bit counter and several +additional timers with variable width. +The minimum clock frequency of the main timecounter is 10 MHz, +but much higher rates are common. +The additional 32 or 64 -bit parts are typically accessible via +.Tn MMIO
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Fri Aug 6 16:44:07 UTC 2010 Modified Files: src/share/man/man4: acpi.4 ichlpcib.4 src/share/man/man4/man4.x86: amdpcib.4 Log Message: Reference hpet(4). To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/share/man/man4/acpi.4 cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/ichlpcib.4 cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/man4.x86/amdpcib.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/acpi.4 diff -u src/share/man/man4/acpi.4:1.53 src/share/man/man4/acpi.4:1.54 --- src/share/man/man4/acpi.4:1.53 Thu Aug 5 17:45:44 2010 +++ src/share/man/man4/acpi.4 Fri Aug 6 16:44:06 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpi.4,v 1.53 2010/08/05 17:45:44 jruoho Exp $ +.\ $NetBSD: acpi.4,v 1.54 2010/08/06 16:44:06 jruoho Exp $ .\ .\ Copyright (c) 2002, 2004, 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -228,7 +228,7 @@ NS8250-, NS16450-, and NS16550-based serial ports. .It Xr fdc 4 Floppy disk controllers. -.It hpet +.It Xr hpet 4 High Precision Event Timer .Pq Tn HPET . .It Xr hpqlb 4 Index: src/share/man/man4/ichlpcib.4 diff -u src/share/man/man4/ichlpcib.4:1.11 src/share/man/man4/ichlpcib.4:1.12 --- src/share/man/man4/ichlpcib.4:1.11 Thu Jul 29 18:25:19 2010 +++ src/share/man/man4/ichlpcib.4 Fri Aug 6 16:44:06 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: ichlpcib.4,v 1.11 2010/07/29 18:25:19 jruoho Exp $ +.\ $NetBSD: ichlpcib.4,v 1.12 2010/08/06 16:44:06 jruoho Exp $ .\ .\ Copyright (c) 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 July 29, 2010 +.Dd August 6, 2010 .Dt ICHLPCIB 4 .Os .Sh NAME @@ -72,6 +72,7 @@ .Sh SEE ALSO .Xr fwhrng 4 , .Xr gpio 4 , +.Xr hpet 4 , .Xr sysctl 8 , .Xr wdogctl 8 .Sh HISTORY Index: src/share/man/man4/man4.x86/amdpcib.4 diff -u src/share/man/man4/man4.x86/amdpcib.4:1.1 src/share/man/man4/man4.x86/amdpcib.4:1.2 --- src/share/man/man4/man4.x86/amdpcib.4:1.1 Thu Aug 5 04:58:27 2010 +++ src/share/man/man4/man4.x86/amdpcib.4 Fri Aug 6 16:44:06 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: amdpcib.4,v 1.1 2010/08/05 04:58:27 jruoho Exp $ +.\ $NetBSD: amdpcib.4,v 1.2 2010/08/06 16:44:06 jruoho Exp $ .\ .\ $OpenBSD: amdpcib.4,v 1.4 2007/10/08 12:48:21 jmc Exp $ .\ @@ -23,6 +23,7 @@ bridge and implements a 32/64-bit 14.3 MHz (or variable) timecounter using the HPET timer. .Sh SEE ALSO +.Xr hpet 4 , .Xr isa 4 , .Xr pci 4 .Rs
CVS commit: src
Module Name:src Committed By: jruoho Date: Fri Aug 6 17:00:13 UTC 2010 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile src/share/man/man4/man4.x86: Makefile Added Files: src/share/man/man4/man4.x86: fwhrng.4 ichlpcib.4 Removed Files: src/share/man/man4: fwhrng.4 ichlpcib.4 Log Message: Move fwhrng(4) and ichlpcib(4) to the right category. To generate a diff of this commit: cvs rdiff -u -r1.1232 -r1.1233 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.524 -r1.525 src/share/man/man4/Makefile cvs rdiff -u -r1.1 -r0 src/share/man/man4/fwhrng.4 cvs rdiff -u -r1.12 -r0 src/share/man/man4/ichlpcib.4 cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.x86/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.x86/fwhrng.4 \ src/share/man/man4/man4.x86/ichlpcib.4 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1232 src/distrib/sets/lists/man/mi:1.1233 --- src/distrib/sets/lists/man/mi:1.1232 Fri Aug 6 16:42:31 2010 +++ src/distrib/sets/lists/man/mi Fri Aug 6 17:00:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1232 2010/08/06 16:42:31 jruoho Exp $ +# $NetBSD: mi,v 1.1233 2010/08/06 17:00:12 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -946,7 +946,7 @@ ./usr/share/man/cat4/fss.0 man-sys-catman .cat ./usr/share/man/cat4/fssbs.0 man-obsolete obsolete ./usr/share/man/cat4/fta.0 man-sys-catman .cat -./usr/share/man/cat4/fwhrng.0 man-sys-catman .cat +./usr/share/man/cat4/fwhrng.0 man-obsolete obsolete ./usr/share/man/cat4/fwip.0 man-sys-catman .cat ./usr/share/man/cat4/fwiso.0 man-obsolete obsolete ./usr/share/man/cat4/fwohci.0 man-sys-catman .cat @@ -1096,7 +1096,7 @@ ./usr/share/man/cat4/i4btrc.0 man-obsolete obsolete ./usr/share/man/cat4/i915drm.0 man-sys-catman .cat ./usr/share/man/cat4/iavc.0 man-sys-catman .cat -./usr/share/man/cat4/ichlpcib.0 man-sys-catman .cat +./usr/share/man/cat4/ichlpcib.0 man-obsolete obsolete ./usr/share/man/cat4/ichsmb.0 man-sys-catman .cat ./usr/share/man/cat4/icmp.0 man-sys-catman .cat ./usr/share/man/cat4/icmp6.0 man-sys-catman .cat @@ -1734,7 +1734,9 @@ ./usr/share/man/cat4/x68k/vs.0 man-sys-catman .cat ./usr/share/man/cat4/x86/amdpcib.0 man-sys-catman .cat ./usr/share/man/cat4/x86/balloon.0 man-sys-catman .cat +./usr/share/man/cat4/x86/fwhrng.0 man-sys-catman .cat ./usr/share/man/cat4/x86/hpet.0 man-sys-catman .cat +./usr/share/man/cat4/x86/ichlpcib.0 man-sys-catman .cat ./usr/share/man/cat4/xbox.0 man-sys-catman .cat ./usr/share/man/cat4/xge.0 man-sys-catman .cat ./usr/share/man/cat4/xi.0 man-sys-catman .cat @@ -3623,7 +3625,7 @@ ./usr/share/man/html4/fss.html man-sys-htmlman html ./usr/share/man/html4/fssbs.html man-obsolete obsolete ./usr/share/man/html4/fta.html man-sys-htmlman html -./usr/share/man/html4/fwhrng.html man-sys-htmlman html +./usr/share/man/html4/fwhrng.html man-obsolete obsolete ./usr/share/man/html4/fwip.html man-sys-htmlman html ./usr/share/man/html4/fwohci.html man-sys-htmlman html ./usr/share/man/html4/fxp.html man-sys-htmlman html @@ -3743,7 +3745,7 @@ ./usr/share/man/html4/i386/vesafb.html man-obsolete obsolete ./usr/share/man/html4/i915drm.html man-sys-htmlman html ./usr/share/man/html4/iavc.html man-sys-htmlman html -./usr/share/man/html4/ichlpcib.html man-sys-htmlman html +./usr/share/man/html4/ichlpcib.html man-obsolete obsolete ./usr/share/man/html4/ichsmb.html man-sys-htmlman html ./usr/share/man/html4/icmp.html man-sys-htmlman html ./usr/share/man/html4/icmp6.html man-sys-htmlman html @@ -4331,7 +4333,9 @@ ./usr/share/man/html4/x68k/vs.html man-sys-htmlman html ./usr/share/man/html4/x86/amdpcib.html man-sys-htmlman html ./usr/share/man/html4/x86/balloon.html man-sys-htmlman html +./usr/share/man/html4/x86/fwhrng.html man-sys-htmlman html ./usr/share/man/html4/x86/hpet.html man-sys-htmlman html +./usr/share/man/html4/x86/ichlpcib.html man-sys-htmlman html ./usr/share/man/html4/xbox.html man-sys-htmlman html ./usr/share/man/html4/xge.html man-sys-htmlman html ./usr/share/man/html4/xi.html man-sys-htmlman html @@ -6078,7 +6082,7 @@ ./usr/share/man/man4/fss.4 man-sys-man .man ./usr/share/man/man4/fssbs.4 man-obsolete obsolete ./usr/share/man/man4/fta.4 man-sys-man .man -./usr/share/man/man4/fwhrng.4 man-sys-man .man +./usr/share/man/man4/fwhrng.4 man-obsolete obsolete ./usr/share/man/man4/fwip.4 man-sys-man .man ./usr/share/man/man4/fwiso.4 man-obsolete obsolete ./usr/share/man/man4/fwohci.4 man-sys-man .man @@ -6228,7 +6232,7 @@ ./usr/share/man/man4/i4btrc.4 man-obsolete obsolete ./usr/share/man/man4/i915drm.4 man-sys-man .man ./usr/share/man/man4/iavc.4
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Fri Aug 6 18:36:10 UTC 2010
Modified Files:
src/share/man/man7: sysctl.7
src/sys/kern: sys_aio.c
Log Message:
Like with mqueue(3), create and remove the aio(3) sysctl nodes dynamically.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/share/man/man7/sysctl.7
cvs rdiff -u -r1.34 -r1.35 src/sys/kern/sys_aio.c
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/man7/sysctl.7
diff -u src/share/man/man7/sysctl.7:1.50 src/share/man/man7/sysctl.7:1.51
--- src/share/man/man7/sysctl.7:1.50 Sat Jul 31 02:04:45 2010
+++ src/share/man/man7/sysctl.7 Fri Aug 6 18:36:09 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: sysctl.7,v 1.50 2010/07/31 02:04:45 jruoho Exp $
+.\ $NetBSD: sysctl.7,v 1.51 2010/08/06 18:36:09 jruoho Exp $
.\
.\ Copyright (c) 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ @(#)sysctl.3 8.4 (Berkeley) 5/9/95
.\
-.Dd July 31, 2010
+.Dd August 6, 2010
.Dt SYSCTL 7
.Os
.Sh NAME
@@ -239,6 +239,8 @@
.Bl -column kern.posix_reader_writer_locks \
struct kinfo_drivers not applicable
.It Sy Second level name Type Changeable
+.It kern.aio_listio_max integer yes
+.It kern.aio_max integer yes
.It kern.arandom integer no
.It kern.argmax integer no
.It kern.boothowto integer no
@@ -296,6 +298,7 @@
.It kern.pipe node not applicable
.\ .It kern.posix node not applicable
.It kern.posix1version integer no
+.It kern.posix_aio integer no
.It kern.posix_barriers integer no
.It kern.posix_reader_writer_locks integer no
.\.It kern.posix_sched integer yes
@@ -329,6 +332,16 @@
.It kern.vnode struct vnode no
.El
.Bl -tag -width 123456
+.It Li kern.aio_listio_max
+The maximum number of asynchronous
+.Tn I/O
+operations in a single list I/O call.
+Like with all variables related to
+.Xr aio 3 ,
+the variable may be created and removed dynamically
+upon loading or unloading the corresponding kernel module.
+.It Li kern.aio_max
+The maximum number of asynchronous I/O operations.
.It Li kern.arandom
This variable picks a random number each time it is queried.
The used random number generator
@@ -784,6 +797,10 @@
.It Li kern.posix1version ( KERN_POSIX1 )
The version of ISO/IEC 9945 (POSIX 1003.1) with which the system
attempts to comply.
+.It Li kern.posix_aio
+The version of
+.St -p1003.1
+and its Asynchronous I/O option to which the system attempts to conform.
.It Li kern.posix_barriers ( KERN_POSIX_BARRIERS )
The version of
.St -p1003.1
Index: src/sys/kern/sys_aio.c
diff -u src/sys/kern/sys_aio.c:1.34 src/sys/kern/sys_aio.c:1.35
--- src/sys/kern/sys_aio.c:1.34 Thu Jun 24 13:03:11 2010
+++ src/sys/kern/sys_aio.c Fri Aug 6 18:36:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_aio.c,v 1.34 2010/06/24 13:03:11 hannken Exp $ */
+/* $NetBSD: sys_aio.c,v 1.35 2010/08/06 18:36:09 jruoho Exp $ */
/*
* Copyright (c) 2007 Mindaugas Rasiukevicius rmind at NetBSD org
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_aio.c,v 1.34 2010/06/24 13:03:11 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_aio.c,v 1.35 2010/08/06 18:36:09 jruoho Exp $);
#ifdef _KERNEL_OPT
#include opt_ddb.h
@@ -73,15 +73,20 @@
static u_int aio_max = AIO_MAX;
static u_int aio_jobs_count;
+static struct sysctllog *aio_sysctl;
static struct pool aio_job_pool;
static struct pool aio_lio_pool;
static void * aio_ehook;
-static void aio_worker(void *);
-static void aio_process(struct aio_job *);
-static void aio_sendsig(struct proc *, struct sigevent *);
-static int aio_enqueue_job(int, void *, struct lio_req *);
-static void aio_exit(proc_t *, void *);
+static void aio_worker(void *);
+static void aio_process(struct aio_job *);
+static void aio_sendsig(struct proc *, struct sigevent *);
+static int aio_enqueue_job(int, void *, struct lio_req *);
+static void aio_exit(proc_t *, void *);
+
+static int sysctl_aio_listio_max(SYSCTLFN_PROTO);
+static int sysctl_aio_max(SYSCTLFN_PROTO);
+static int sysctl_aio_init(void);
static const struct syscall_package aio_syscalls[] = {
{ SYS_aio_cancel, 0, (sy_call_t *)sys_aio_cancel },
@@ -122,6 +127,9 @@
return EBUSY;
}
}
+ if (aio_sysctl != NULL)
+ sysctl_teardown(aio_sysctl);
+
KASSERT(aio_jobs_count == 0);
exithook_disestablish(aio_ehook);
pool_destroy(aio_job_pool);
@@ -142,9 +150,15 @@
pool_init(aio_lio_pool, sizeof(struct lio_req), 0, 0, 0,
aio_lio_pool, pool_allocator_nointr, IPL_NONE);
aio_ehook = exithook_establish(aio_exit, NULL);
+
+ error = sysctl_aio_init();
+ if (error != 0) {
+ (void)aio_fini(false);
+ return error;
+ }
error = syscall_establish(NULL, aio_syscalls);
if (error != 0)
- aio_fini(false);
+ (void)aio_fini(false);
return error;
}
@@ -1077,15 +1091,23 @@
return 0;
}
-SYSCTL_SETUP(sysctl_aio_setup, sysctl aio setup)
+static int
+sysctl_aio_init(void)
{
+
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Fri Aug 6 18:54:50 UTC 2010 Modified Files: src/share/man/man4: acpi.4 Log Message: As the devices are listed in the body of the text, remove the .Xref spam in SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/share/man/man4/acpi.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/acpi.4 diff -u src/share/man/man4/acpi.4:1.54 src/share/man/man4/acpi.4:1.55 --- src/share/man/man4/acpi.4:1.54 Fri Aug 6 16:44:06 2010 +++ src/share/man/man4/acpi.4 Fri Aug 6 18:54:50 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpi.4,v 1.54 2010/08/06 16:44:06 jruoho Exp $ +.\ $NetBSD: acpi.4,v 1.55 2010/08/06 18:54:50 jruoho Exp $ .\ .\ Copyright (c) 2002, 2004, 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd June 30, 2010 +.Dd August 6, 2010 .Dt ACPI 4 .Os .Sh NAME @@ -514,37 +514,6 @@ is set to 1, the message stored to the debug object is printed every time the method is called by the interpreter. .Sh SEE ALSO -.Xr acpiacad 4 , -.Xr acpibat 4 , -.Xr acpibut 4 , -.Xr acpicpu 4 , -.Xr acpidalb 4 , -.Xr acpiec 4 , -.Xr acpilid 4 , -.Xr acpismbus 4 , -.Xr acpitz 4 , -.Xr acpiwmi 4 , -.Xr aibs 4 , -.Xr apm 4 , -.Xr attimer 4 , -.Xr com 4 , -.Xr fdc 4 , -.Xr hpqlb 4 , -.Xr joy 4 , -.Xr lpt 4 , -.Xr mpu 4 , -.Xr npx 4 , -.Xr pci 4 , -.Xr pckbc 4 , -.Xr pcppi 4 , -.Xr sony 4 , -.Xr spic 4 , -.Xr thinkpad 4 , -.Xr ug 4 , -.Xr vald 4 , -.Xr wb 4 , -.Xr wss 4 , -.Xr ym 4 , .Xr acpidump 8 , .Xr amldb 8 , .Xr iasl 8
CVS commit: src/doc
Module Name:src Committed By: jruoho Date: Fri Aug 6 19:39:26 UTC 2010 Modified Files: src/doc: 3RDPARTY Log Message: ACPICA 20100806 is out. (Not yet time to import; rest of the GPE changes should arrive before this is updated for the last time before 6.0.) To generate a diff of this commit: cvs rdiff -u -r1.773 -r1.774 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.773 src/doc/3RDPARTY:1.774 --- src/doc/3RDPARTY:1.773 Fri Aug 6 10:59:52 2010 +++ src/doc/3RDPARTY Fri Aug 6 19:39:26 2010 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.773 2010/08/06 10:59:52 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.774 2010/08/06 19:39:26 jruoho Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -26,7 +26,7 @@ Package: acpica Version: 20100528 -Current Vers: 20100702 +Current Vers: 20100806 Maintainer: INTEL Archive Site: http://www.acpica.org/downloads/unix_source_code.php Home Page: http://www.acpica.org/
CVS commit: src/sys
Module Name:src
Committed By: jruoho
Date: Fri Aug 6 22:45:00 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c acpi_verbose.c acpivar.h
src/sys/dev/acpi/wmi: files.wmi wmi_acpi.c
src/sys/modules/acpiverbose: Makefile
Removed Files:
src/sys/dev/acpi/wmi: wmi_dump.c
Log Message:
Remove the acpiwmi(4) dump from the ACPIVERBOSE module. Instead of this
complex solution, just use aprint_debug(9) in the driver.
To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/acpi_verbose.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/acpi/acpivar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/wmi/files.wmi
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/wmi/wmi_acpi.c
cvs rdiff -u -r1.1 -r0 src/sys/dev/acpi/wmi/wmi_dump.c
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/acpiverbose/Makefile
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/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.209 src/sys/dev/acpi/acpi.c:1.210
--- src/sys/dev/acpi/acpi.c:1.209 Fri Aug 6 18:10:40 2010
+++ src/sys/dev/acpi/acpi.c Fri Aug 6 22:45:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.209 2010/08/06 18:10:40 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.210 2010/08/06 22:45:00 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.209 2010/08/06 18:10:40 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.210 2010/08/06 22:45:00 jruoho Exp $);
#include opt_acpi.h
#include opt_pcifixup.h
@@ -199,31 +199,23 @@
extern struct cfdriver acpi_cd;
-/* Handle routine vectors and loading for acpiverbose module */
-void acpi_null(void);
+/*
+ * Handle routine vectors and loading for acpiverbose module.
+ */
+int acpi_verbose_loaded = 0;
void acpi_print_devnodes_stub(struct acpi_softc *);
void acpi_print_tree_stub(struct acpi_devnode *, uint32_t);
void acpi_print_dev_stub(const char *);
-void acpi_wmidump_stub(void *);
void (*acpi_print_devnodes)(struct acpi_softc *) = acpi_print_devnodes_stub;
-void (*acpi_print_tree)(struct acpi_devnode *, uint32_t) = acpi_print_tree_stub;
+void (*acpi_print_tree)(struct acpi_devnode *,uint32_t) = acpi_print_tree_stub;
void (*acpi_print_dev)(const char *) = acpi_print_dev_stub;
-void (*acpi_wmidump)(void *) = acpi_wmidump_stub;
-
-int acpi_verbose_loaded = 0;
/*
* Support for ACPIVERBOSE.
*/
void
-acpi_null(void)
-{
- /* Nothing to do. */
-}
-
-void
acpi_load_verbose(void)
{
if (acpi_verbose_loaded == 0) {
@@ -257,14 +249,6 @@
acpi_print_dev(pnpstr);
}
-void
-acpi_wmidump_stub(void *arg)
-{
- acpi_load_verbose();
- if (acpi_verbose_loaded)
- acpi_wmidump(arg);
-}
-
CFATTACH_DECL2_NEW(acpi, sizeof(struct acpi_softc),
acpi_match, acpi_attach, acpi_detach, NULL, acpi_rescan, acpi_childdet);
Index: src/sys/dev/acpi/acpi_verbose.c
diff -u src/sys/dev/acpi/acpi_verbose.c:1.4 src/sys/dev/acpi/acpi_verbose.c:1.5
--- src/sys/dev/acpi/acpi_verbose.c:1.4 Sun Jul 25 12:54:46 2010
+++ src/sys/dev/acpi/acpi_verbose.c Fri Aug 6 22:45:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_verbose.c,v 1.4 2010/07/25 12:54:46 pgoyette Exp $ */
+/* $NetBSD: acpi_verbose.c,v 1.5 2010/08/06 22:45:00 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_verbose.c,v 1.4 2010/07/25 12:54:46 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_verbose.c,v 1.5 2010/08/06 22:45:00 jruoho Exp $);
#include sys/param.h
#include sys/device.h
@@ -81,9 +81,9 @@
void acpi_print_tree_real(struct acpi_devnode *, uint32_t);
void acpi_print_dev_real(const char *);
-MODULE(MODULE_CLASS_MISC, acpiverbose, NULL);
+extern int acpi_verbose_loaded;
-__weak_alias(acpi_wmidump_real, acpi_null);
+MODULE(MODULE_CLASS_MISC, acpiverbose, NULL);
static int
acpiverbose_modcmd(modcmd_t cmd, void *arg)
@@ -91,25 +91,21 @@
static void (*saved_print_devnodes)(struct acpi_softc *);
static void (*saved_print_tree)(struct acpi_devnode *, uint32_t);
static void (*saved_print_dev)(const char *);
- static void (*saved_wmidump)(void *);
switch (cmd) {
case MODULE_CMD_INIT:
saved_print_devnodes = acpi_print_devnodes;
saved_print_tree = acpi_print_tree;
saved_print_dev = acpi_print_dev;
- saved_wmidump = acpi_wmidump;
acpi_print_devnodes = acpi_print_devnodes_real;
acpi_print_tree = acpi_print_tree_real;
acpi_print_dev = acpi_print_dev_real;
- acpi_wmidump = acpi_wmidump_real;
acpi_verbose_loaded = 1;
return 0;
case MODULE_CMD_FINI:
acpi_print_devnodes = saved_print_devnodes;
acpi_print_tree = saved_print_tree;
acpi_print_dev = saved_print_dev;
- acpi_wmidump = saved_wmidump;
acpi_verbose_loaded = 0;
return 0;
default:
Index: src/sys/dev/acpi/acpivar.h
diff -u
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Fri Aug 6 23:38:34 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c acpi_verbose.c acpivar.h
Log Message:
Simplify ACPIVERBOSE; we can manage just fine with the function pointers.
To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/acpi_verbose.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/acpi/acpivar.h
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/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.210 src/sys/dev/acpi/acpi.c:1.211
--- src/sys/dev/acpi/acpi.c:1.210 Fri Aug 6 22:45:00 2010
+++ src/sys/dev/acpi/acpi.c Fri Aug 6 23:38:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.210 2010/08/06 22:45:00 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.211 2010/08/06 23:38:34 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.210 2010/08/06 22:45:00 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.211 2010/08/06 23:38:34 jruoho Exp $);
#include opt_acpi.h
#include opt_pcifixup.h
@@ -121,11 +121,13 @@
int acpi_active;
int acpi_force_load;
int acpi_suspended = 0;
+int acpi_verbose_loaded = 0;
-struct acpi_softc *acpi_softc;
-static uint64_t acpi_root_pointer;
-extern kmutex_t acpi_interrupt_list_mtx;
-static ACPI_HANDLE acpi_scopes[4];
+struct acpi_softc *acpi_softc;
+static uint64_t acpi_root_pointer;
+extern kmutex_t acpi_interrupt_list_mtx;
+extern struct cfdriver acpi_cd;
+static ACPI_HANDLE acpi_scopes[4];
/*
* This structure provides a context for the ACPI
@@ -197,58 +199,12 @@
static ACPI_TABLE_HEADER *acpi_map_rsdt(void);
static void acpi_unmap_rsdt(ACPI_TABLE_HEADER *);
-extern struct cfdriver acpi_cd;
+void acpi_print_verbose_stub(struct acpi_softc *);
+void acpi_print_dev_stub(const char *);
-/*
- * Handle routine vectors and loading for acpiverbose module.
- */
-int acpi_verbose_loaded = 0;
-
-void acpi_print_devnodes_stub(struct acpi_softc *);
-void acpi_print_tree_stub(struct acpi_devnode *, uint32_t);
-void acpi_print_dev_stub(const char *);
-
-void (*acpi_print_devnodes)(struct acpi_softc *) = acpi_print_devnodes_stub;
-void (*acpi_print_tree)(struct acpi_devnode *,uint32_t) = acpi_print_tree_stub;
+void (*acpi_print_verbose)(struct acpi_softc *) = acpi_print_verbose_stub;
void (*acpi_print_dev)(const char *) = acpi_print_dev_stub;
-/*
- * Support for ACPIVERBOSE.
- */
-void
-acpi_load_verbose(void)
-{
- if (acpi_verbose_loaded == 0) {
- mutex_enter(module_lock);
- module_autoload(acpiverbose, MODULE_CLASS_MISC);
- mutex_exit(module_lock);
- }
-}
-
-void
-acpi_print_devnodes_stub(struct acpi_softc *sc)
-{
- acpi_load_verbose();
- if (acpi_verbose_loaded)
- acpi_print_devnodes(sc);
-}
-
-void
-acpi_print_tree_stub(struct acpi_devnode *ad, uint32_t level)
-{
- acpi_load_verbose();
- if (acpi_verbose_loaded)
- acpi_print_tree(ad, level);
-}
-
-void
-acpi_print_dev_stub(const char *pnpstr)
-{
- acpi_load_verbose();
- if (acpi_verbose_loaded)
- acpi_print_dev(pnpstr);
-}
-
CFATTACH_DECL2_NEW(acpi, sizeof(struct acpi_softc),
acpi_match, acpi_attach, acpi_detach, NULL, acpi_rescan, acpi_childdet);
@@ -533,11 +489,14 @@
acpi_debug_init();
#endif
+ /*
+ * Print debug information.
+ */
+ acpi_print_verbose(sc);
+
return;
fail:
- KASSERT(rv != AE_OK);
-
aprint_error(%s: failed to initialize ACPI: %s\n,
__func__, AcpiFormatException(rv));
}
@@ -662,9 +621,6 @@
acpi_rescan_capabilities(sc);
(void)acpi_pcidev_scan(sc-sc_root);
-
- acpi_print_devnodes(sc);
- acpi_print_tree(sc-sc_root, 0);
}
static ACPI_STATUS
@@ -1732,3 +1688,37 @@
AcpiOsUnmapMemory(rsdt, sizeof(ACPI_TABLE_HEADER));
}
+
+/*
+ * ACPIVERBOSE.
+ */
+void
+acpi_load_verbose(void)
+{
+
+ if (acpi_verbose_loaded == 0) {
+ mutex_enter(module_lock);
+ module_autoload(acpiverbose, MODULE_CLASS_MISC);
+ mutex_exit(module_lock);
+ }
+}
+
+void
+acpi_print_verbose_stub(struct acpi_softc *sc)
+{
+
+ acpi_load_verbose();
+
+ if (acpi_verbose_loaded != 0)
+ acpi_print_verbose(sc);
+}
+
+void
+acpi_print_dev_stub(const char *pnpstr)
+{
+
+ acpi_load_verbose();
+
+ if (acpi_verbose_loaded != 0)
+ acpi_print_dev(pnpstr);
+}
Index: src/sys/dev/acpi/acpi_verbose.c
diff -u src/sys/dev/acpi/acpi_verbose.c:1.5 src/sys/dev/acpi/acpi_verbose.c:1.6
--- src/sys/dev/acpi/acpi_verbose.c:1.5 Fri Aug 6 22:45:00 2010
+++ src/sys/dev/acpi/acpi_verbose.c Fri Aug 6 23:38:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_verbose.c,v 1.5 2010/08/06 22:45:00 jruoho Exp $ */
+/* $NetBSD: acpi_verbose.c,v 1.6 2010/08/06 23:38:34 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_verbose.c,v 1.5 2010/08/06 22:45:00 jruoho Exp $);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jmcneill
Date: Sat Aug 7 02:39:01 UTC 2010
Modified Files:
src/sys/dev/pci: ahcisata_pci.c
Log Message:
Add NVIDIA MCP77 to the quirk table, so ahcisata will attach when the
BIOS is set to 'RAID' mode.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/ahcisata_pci.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/ahcisata_pci.c
diff -u src/sys/dev/pci/ahcisata_pci.c:1.21 src/sys/dev/pci/ahcisata_pci.c:1.22
--- src/sys/dev/pci/ahcisata_pci.c:1.21 Tue Jul 27 22:27:52 2010
+++ src/sys/dev/pci/ahcisata_pci.c Sat Aug 7 02:39:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_pci.c,v 1.21 2010/07/27 22:27:52 jakllsch Exp $ */
+/* $NetBSD: ahcisata_pci.c,v 1.22 2010/08/07 02:39:01 jmcneill Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ahcisata_pci.c,v 1.21 2010/07/27 22:27:52 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: ahcisata_pci.c,v 1.22 2010/08/07 02:39:01 jmcneill Exp $);
#include sys/types.h
#include sys/malloc.h
@@ -66,6 +66,30 @@
AHCI_PCI_QUIRK_FORCE },
{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_AHCI_1,
AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_1,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_2,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_3,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_4,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_5,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_6,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_7,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_8,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_9,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_10,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_11,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_12,
+ AHCI_PCI_QUIRK_FORCE },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SE6121,
AHCI_PCI_QUIRK_FORCE },
/* ATI SB600 AHCI 64-bit DMA only works on some boards/BIOSes */
CVS commit: src/crypto/external/bsd/netpgp/dist/src/libmj
Module Name:src
Committed By: agc
Date: Sat Aug 7 04:13:57 UTC 2010
Added Files:
src/crypto/external/bsd/netpgp/dist/src/libmj: Makefile.am defs.h
libmj.3 mj.c mj.h
Log Message:
Move the minimalist JSON routines into their own library
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am \
src/crypto/external/bsd/netpgp/dist/src/libmj/defs.h \
src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3 \
src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c \
src/crypto/external/bsd/netpgp/dist/src/libmj/mj.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am:1.1
--- /dev/null Sat Aug 7 04:13:57 2010
+++ src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am Sat Aug 7 04:13:57 2010
@@ -0,0 +1,14 @@
+## $NetBSD: Makefile.am,v 1.1 2010/08/07 04:13:57 agc Exp $
+
+AM_CFLAGS = $(WARNCFLAGS)
+
+lib_LTLIBRARIES = libmj.la
+
+libmj_la_CPPFLAGS = -I$(top_srcdir)/include
+
+libmj_la_SOURCES = \
+ mj.c \
+
+man3_MANS = mj.3
+
+dist_man_MANS = mj.3
Index: src/crypto/external/bsd/netpgp/dist/src/libmj/defs.h
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/src/libmj/defs.h:1.1
--- /dev/null Sat Aug 7 04:13:57 2010
+++ src/crypto/external/bsd/netpgp/dist/src/libmj/defs.h Sat Aug 7 04:13:57 2010
@@ -0,0 +1,95 @@
+/* $NetBSD: defs.h,v 1.1 2010/08/07 04:13:57 agc Exp $ */
+
+/*-
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Alistair Crooks (a...@netbsd.org)
+ *
+ * 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.
+ */
+#ifndef DEFS_H_
+#define DEFS_H_
+
+#include sys/types.h
+#include sys/param.h
+
+#ifdef HAVE_INTTYPES_H
+#include inttypes.h
+#endif
+
+#ifdef HAVE_STDINT_H
+#include stdint.h
+#endif
+
+#include stdio.h
+#include stdlib.h
+#include string.h
+
+#define NEWARRAY(type,ptr,size,where,action) do { \
+ if ((ptr = calloc(sizeof(type), (unsigned)(size))) == NULL) { \
+ (void) fprintf(stderr, %s: can't allocate %lu bytes\n, \
+ where, (unsigned long)(size * sizeof(type))); \
+ action; \
+ }\
+} while( /* CONSTCOND */ 0)
+
+#define RENEW(type, _ptr, _size, _newsize, where, action) do { \
+ type *_newptr; \
+ _newptr = realloc(_ptr, (size_t)(_newsize) * sizeof(type)); \
+ if (_newptr == NULL) { \
+ (void) fprintf(stderr, %s: can't realloc %lu bytes\n, \
+ where, (unsigned long)((_newsize) * sizeof(type))); \
+ action; \
+ } else { \
+ (void) memset(_newptr[_size], 0x0, \
+ (_newsize - _size) * sizeof(type)); \
+ _ptr = _newptr; \
+ _size = _newsize; \
+ }\
+} while( /* CONSTCOND */ 0)
+
+#define NEW(type, ptr, where, action) NEWARRAY(type, ptr, 1, where, action)
+
+#define FREE(ptr) free(ptr)
+
+#define ALLOC(type, v, size, c, init, incr, where, action) do { \
+ uint32_t _newsize = size;\
+ if (size == 0) { \
+ _newsize = init; \
+ NEWARRAY(type, v, _newsize, where : new, action); \
+ } else if (c == size) { \
+ _newsize = size + incr; \
+ RENEW(type, v, size, _newsize, where : renew, action); \
+ }\
+ size = _newsize; \
+} while( /* CONSTCOND */ 0)
+
+#define DEFINE_ARRAY(name, type) \
+typedef struct name { \
+ uint32_t c; \
+ uint32_t size; \
+ type *v; \
+} name
+
+#endif /* !DEFS_H_ */
Index: src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3
diff -u /dev/null
CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src Committed By: agc Date: Sat Aug 7 04:16:41 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/include: Makefile.in netpgp.h src/crypto/external/bsd/netpgp/dist/src: Makefile.am Makefile.in src/crypto/external/bsd/netpgp/dist/src/lib: Makefile.in config.h.in keyring.c keyring.h netpgp.c packet-print.c version.h src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile Makefile.in src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: Makefile.in netpgpkeys.c src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile Makefile.in Log Message: Catch up the JSON routines being in their own library. Use the JSON routines to return all the text as a JSON-encoded string for all keys and sigs which are returned. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/netpgp/dist/include/Makefile.in cvs rdiff -u -r1.18 -r1.19 \ src/crypto/external/bsd/netpgp/dist/include/netpgp.h cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/src/Makefile.am cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/src/Makefile.in cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in \ src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in cvs rdiff -u -r1.39 -r1.40 \ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c cvs rdiff -u -r1.28 -r1.29 \ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h cvs rdiff -u -r1.65 -r1.66 \ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c cvs rdiff -u -r1.34 -r1.35 \ src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c cvs rdiff -u -r1.37 -r1.38 \ src/crypto/external/bsd/netpgp/dist/src/lib/version.h cvs rdiff -u -r1.16 -r1.17 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.in cvs rdiff -u -r1.14 -r1.15 \ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c cvs rdiff -u -r1.15 -r1.16 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/include/Makefile.in diff -u src/crypto/external/bsd/netpgp/dist/include/Makefile.in:1.3 src/crypto/external/bsd/netpgp/dist/include/Makefile.in:1.4 --- src/crypto/external/bsd/netpgp/dist/include/Makefile.in:1.3 Wed Jun 10 00:38:09 2009 +++ src/crypto/external/bsd/netpgp/dist/include/Makefile.in Sat Aug 7 04:16:40 2010 @@ -36,7 +36,8 @@ DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/ax_check_openssl.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -70,37 +71,43 @@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ +OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -108,6 +115,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -120,8 +128,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -152,6 +159,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@
CVS commit: src/crypto/external/bsd/netpgp/libmj
Module Name:src
Committed By: agc
Date: Sat Aug 7 04:17:49 UTC 2010
Added Files:
src/crypto/external/bsd/netpgp/libmj: Makefile shlib_version
Log Message:
NetBSD mk files for JSON functions
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/netpgp/libmj/Makefile \
src/crypto/external/bsd/netpgp/libmj/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/crypto/external/bsd/netpgp/libmj/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/libmj/Makefile:1.1
--- /dev/null Sat Aug 7 04:17:49 2010
+++ src/crypto/external/bsd/netpgp/libmj/Makefile Sat Aug 7 04:17:49 2010
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2010/08/07 04:17:49 agc Exp $
+
+.include bsd.own.mk
+
+USE_FORT?= yes
+
+LIB= mj
+SRCS= mj.c
+MAN= libmj.3
+WARNS=4
+
+EXTDIST=${.CURDIR}/../dist
+
+.PATH: ${EXTDIST}/include ${EXTDIST}/src/libmj
+
+INCS+= mj.h
+INCSDIR=/usr/include
+
+.include bsd.lib.mk
Index: src/crypto/external/bsd/netpgp/libmj/shlib_version
diff -u /dev/null src/crypto/external/bsd/netpgp/libmj/shlib_version:1.1
--- /dev/null Sat Aug 7 04:17:49 2010
+++ src/crypto/external/bsd/netpgp/libmj/shlib_version Sat Aug 7 04:17:49 2010
@@ -0,0 +1,2 @@
+major=0
+minor=0
CVS commit: src/crypto/external/bsd/netpgp
Module Name:src
Committed By: agc
Date: Sat Aug 7 04:18:54 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/lib: Makefile config.h
src/crypto/external/bsd/netpgp/netpgpkeys: Makefile
Log Message:
new directory structure - look in the right place for libraries
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/netpgp/lib/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/lib/config.h
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/netpgp/netpgpkeys/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/lib/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/Makefile:1.10 src/crypto/external/bsd/netpgp/lib/Makefile:1.11
--- src/crypto/external/bsd/netpgp/lib/Makefile:1.10 Mon Jul 26 06:40:38 2010
+++ src/crypto/external/bsd/netpgp/lib/Makefile Sat Aug 7 04:18:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/07/26 06:40:38 agc Exp $
+# $NetBSD: Makefile,v 1.11 2010/08/07 04:18:54 agc Exp $
.include bsd.own.mk
@@ -10,7 +10,6 @@
SRCS+= packet-print.c packet-show.c reader.c signature.c
SRCS+= symmetric.c validate.c writer.c
SRCS+= ssh2pgp.c fastctype.c bufgap.c
-SRCS+= mj.c
CPPFLAGS+= -I${.CURDIR} -I${EXTDIST}/include
MAN= libnetpgp.3
WARNS=5
@@ -22,6 +21,7 @@
INCS+= netpgp.h
INCSDIR=/usr/include
+LIBDPLIBS+= mj ${.CURDIR}/../libmj
LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
Index: src/crypto/external/bsd/netpgp/lib/config.h
diff -u src/crypto/external/bsd/netpgp/lib/config.h:1.6 src/crypto/external/bsd/netpgp/lib/config.h:1.7
--- src/crypto/external/bsd/netpgp/lib/config.h:1.6 Fri Jul 9 05:37:30 2010
+++ src/crypto/external/bsd/netpgp/lib/config.h Sat Aug 7 04:18:54 2010
@@ -125,19 +125,19 @@
#define PACKAGE_NAME netpgp
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING netpgp 20100707
+#define PACKAGE_STRING netpgp 20100708
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME netpgp
/* Define to the version of this package. */
-#define PACKAGE_VERSION 20100707
+#define PACKAGE_VERSION 20100708
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION 20100707
+#define VERSION 20100708
/* Define for Solaris 2.5.1 so the uint32_t typedef from sys/synch.h,
pthread.h, or semaphore.h is not used. If the typedef were allowed, the
Index: src/crypto/external/bsd/netpgp/netpgpkeys/Makefile
diff -u src/crypto/external/bsd/netpgp/netpgpkeys/Makefile:1.1 src/crypto/external/bsd/netpgp/netpgpkeys/Makefile:1.2
--- src/crypto/external/bsd/netpgp/netpgpkeys/Makefile:1.1 Wed Jun 10 00:38:10 2009
+++ src/crypto/external/bsd/netpgp/netpgpkeys/Makefile Sat Aug 7 04:18:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/10 00:38:10 agc Exp $
+# $NetBSD: Makefile,v 1.2 2010/08/07 04:18:54 agc Exp $
.include bsd.own.mk
@@ -11,6 +11,10 @@
LDADD+= -L${LIBNETPGPDIR} -lnetpgp
DPADD+= ${LIBNETPGPDIR}/libnetpgp.a
+LIBMJDIR!= cd ${.CURDIR}/../libmj ${PRINTOBJDIR}
+LDADD+= -L${LIBMJDIR} -lmj
+DPADD+= ${LIBMJDIR}/libmj.a
+
LDADD+= -lcrypto -lz -lbz2
DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src Committed By: agc Date: Sat Aug 7 04:23:56 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile.in Log Message: use any alternate location for openssl To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in:1.4 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in:1.3 Sat Aug 7 04:16:40 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in Sat Aug 7 04:23:56 2010 @@ -81,19 +81,26 @@ CANONICAL_HOST = @CANONICAL_HOST@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ @OPENSSL_INCLUDES@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@ @OPENSSL_INCLUDES@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ +ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ INSTALL = @INSTALL@ @@ -102,9 +109,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ @OPENSSL_LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ +LIBS = @LIBS@ @OPENSSL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -141,7 +148,9 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Sat Aug 7 04:25:19 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: Makefile.am Log Message: mj.c source file has moved To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am diff -u src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.5 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.6 --- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.5 Mon Jul 26 06:39:43 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am Sat Aug 7 04:25:19 2010 @@ -1,4 +1,4 @@ -## $NetBSD: Makefile.am,v 1.5 2010/07/26 06:39:43 agc Exp $ +## $NetBSD: Makefile.am,v 1.6 2010/08/07 04:25:19 agc Exp $ AM_CFLAGS = $(WARNCFLAGS) @@ -14,7 +14,6 @@ fastctype.c \ keyring.c \ misc.c \ - mj.c \ netpgp.c \ openssl_crypto.c \ packet-parse.c \
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Sat Aug 7 04:26:03 UTC 2010 Removed Files: src/crypto/external/bsd/netpgp/dist/src/lib: mj.c mj.h Log Message: mj.[ch] source files have moved To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/crypto/external/bsd/netpgp/dist/src/lib/mj.c cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/dist/src/lib/mj.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/netpgp
Module Name:src Committed By: agc Date: Sat Aug 7 04:34:03 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp: Makefile Log Message: Build libraries in the correct order, also waiting for prereqs to build first To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/netpgp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/Makefile diff -u src/crypto/external/bsd/netpgp/Makefile:1.3 src/crypto/external/bsd/netpgp/Makefile:1.4 --- src/crypto/external/bsd/netpgp/Makefile:1.3 Wed Jun 10 00:38:08 2009 +++ src/crypto/external/bsd/netpgp/Makefile Sat Aug 7 04:34:03 2010 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2009/06/10 00:38:08 agc Exp $ - -SUBDIR= lib .WAIT +# $NetBSD: Makefile,v 1.4 2010/08/07 04:34:03 agc Exp $ +SUBDIR= libmj .WAIT +SUBDIR+= lib .WAIT SUBDIR+= netpgp netpgpkeys netpgpverify .include bsd.subdir.mk
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify
Module Name:src Committed By: agc Date: Sat Aug 7 04:41:58 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.in Log Message: catch up with autoconf changes To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.4 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.5 --- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.4 Sat Aug 7 04:16:41 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in Sat Aug 7 04:41:58 2010 @@ -50,6 +50,7 @@ am_netpgpverify_OBJECTS = netpgpverify-verify.$(OBJEXT) netpgpverify_OBJECTS = $(am_netpgpverify_OBJECTS) netpgpverify_DEPENDENCIES = ../lib/libnetpgp.la +netpgpverify_LDADD = ../lib/libnetpgp.la DEFAULT_INCLUDES = -...@am__isrc@ -I$(top_builddir)/src/lib depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp am__depfiles_maybe = depfiles @@ -81,19 +82,26 @@ CANONICAL_HOST = @CANONICAL_HOST@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ @OPENSSL_INCLUDES@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@ @OPENSSL_INCLUDES@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ +ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ INSTALL = @INSTALL@ @@ -102,9 +110,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ @OPENSSL_LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ +LIBS = @LIBS@ @OPENSSL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -141,7 +149,9 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@
CVS commit: src/crypto/external/bsd/netpgp/dist/src
Module Name:src Committed By: agc Date: Sat Aug 7 04:45:56 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src: Makefile.in Log Message: catch up with autoconf changes To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/src/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/Makefile.in diff -u src/crypto/external/bsd/netpgp/dist/src/Makefile.in:1.4 src/crypto/external/bsd/netpgp/dist/src/Makefile.in:1.5 --- src/crypto/external/bsd/netpgp/dist/src/Makefile.in:1.4 Sat Aug 7 04:16:40 2010 +++ src/crypto/external/bsd/netpgp/dist/src/Makefile.in Sat Aug 7 04:45:56 2010 @@ -67,19 +67,26 @@ CANONICAL_HOST = @CANONICAL_HOST@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ @OPENSSL_INCLUDES@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@ @OPENSSL_INCLUDES@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ +ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ INSTALL = @INSTALL@ @@ -88,9 +95,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ @OPENSSL_LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ +LIBS = @LIBS@ @OPENSSL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -127,7 +134,9 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@
CVS commit: src/crypto/external/bsd/netpgp/dist/src/libmj
Module Name:src Committed By: agc Date: Sat Aug 7 04:50:35 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/libmj: mj.c Log Message: re-fix this typo once again... To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c diff -u src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c:1.1 src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c:1.2 --- src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c:1.1 Sat Aug 7 04:13:57 2010 +++ src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c Sat Aug 7 04:50:35 2010 @@ -274,7 +274,7 @@ case MJ_NULL: case MJ_FALSE: case MJ_TRUE: - atom-c = (unsigned)to; + atom-c = (unsigned)*to; return gettok(s, from, to, tok); case MJ_OPEN_BRACKET: mj_create(atom, array);
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: agc Date: Sat Aug 7 05:53:21 UTC 2010 Modified Files: src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi Log Message: merge conflicts this isn't how this was planned, but needed for releases to build. will be revisited later To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/comp/ad.mips64eb \ src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.61 -r1.62 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1490 -r1.1491 src/distrib/sets/lists/comp/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/ad.mips64eb diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.9 src/distrib/sets/lists/comp/ad.mips64eb:1.10 --- src/distrib/sets/lists/comp/ad.mips64eb:1.9 Sun Jul 11 12:37:52 2010 +++ src/distrib/sets/lists/comp/ad.mips64eb Sat Aug 7 05:53:20 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.9 2010/07/11 12:37:52 mrg Exp $ +# $NetBSD: ad.mips64eb,v 1.10 2010/08/07 05:53:20 agc Exp $ ./usr/bin/elf2aoutcomp-obsolete obsolete ./usr/bin/elf2ecoffcomp-sysutil-bin ./usr/include/mipscomp-c-include @@ -352,6 +352,10 @@ ./usr/lib/64/libmenu.sobase-sys-shlib compat,pic ./usr/lib/64/libmenu_p.a comp-c-proflib compat,profile ./usr/lib/64/libmenu_pic.a comp-c-piclib compat,pic +./usr/lib/64/libmj.acomp-c-lib compat,crypto +./usr/lib/64/libmj.socomp-sys-shlib compat,crypto,pic +./usr/lib/64/libmj_p.acomp-c-proflib compat,crypto,profile +./usr/lib/64/libmj_pic.a comp-c-piclib compat,crypto,pic ./usr/lib/64/libnetpgp.a comp-c-lib compat,crypto ./usr/lib/64/libnetpgp.so comp-sys-shlib compat,crypto,pic ./usr/lib/64/libnetpgp_p.a comp-c-proflib compat,crypto,profile @@ -817,6 +821,10 @@ ./usr/lib/o32/libmenu.so base-sys-shlib compat,pic ./usr/lib/o32/libmenu_p.a comp-c-proflib compat,profile ./usr/lib/o32/libmenu_pic.a comp-c-piclib compat,pic +./usr/lib/o32/libmj.acomp-c-lib compat,crypto +./usr/lib/o32/libmj.socomp-sys-shlib compat,crypto,pic +./usr/lib/o32/libmj_p.acomp-c-proflib compat,crypto,profile +./usr/lib/o32/libmj_pic.a comp-c-piclib compat,crypto,pic ./usr/lib/o32/libnetpgp.a comp-c-lib compat,crypto ./usr/lib/o32/libnetpgp.so comp-sys-shlib compat,crypto,pic ./usr/lib/o32/libnetpgp_p.a comp-c-proflib compat,crypto,profile Index: src/distrib/sets/lists/comp/ad.mips64el diff -u src/distrib/sets/lists/comp/ad.mips64el:1.9 src/distrib/sets/lists/comp/ad.mips64el:1.10 --- src/distrib/sets/lists/comp/ad.mips64el:1.9 Sun Jul 11 12:37:52 2010 +++ src/distrib/sets/lists/comp/ad.mips64el Sat Aug 7 05:53:20 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.9 2010/07/11 12:37:52 mrg Exp $ +# $NetBSD: ad.mips64el,v 1.10 2010/08/07 05:53:20 agc Exp $ ./usr/bin/elf2aoutcomp-obsolete obsolete ./usr/bin/elf2ecoffcomp-sysutil-bin ./usr/include/mipscomp-c-include @@ -352,6 +352,10 @@ ./usr/lib/64/libmenu.sobase-sys-shlib compat,pic ./usr/lib/64/libmenu_p.a comp-c-proflib compat,profile ./usr/lib/64/libmenu_pic.a comp-c-piclib compat,pic +./usr/lib/64/libmj.acomp-c-lib compat,crypto +./usr/lib/64/libmj.socomp-sys-shlib compat,crypto,pic +./usr/lib/64/libmj_p.acomp-c-proflib compat,crypto,profile +./usr/lib/64/libmj_pic.a comp-c-piclib compat,crypto,pic ./usr/lib/64/libnetpgp.a comp-c-lib compat,crypto ./usr/lib/64/libnetpgp.so comp-sys-shlib compat,crypto,pic ./usr/lib/64/libnetpgp_p.a comp-c-proflib compat,crypto,profile @@ -817,6 +821,10 @@ ./usr/lib/o32/libmenu.so base-sys-shlib compat,pic ./usr/lib/o32/libmenu_p.a comp-c-proflib compat,profile ./usr/lib/o32/libmenu_pic.a comp-c-piclib compat,pic +./usr/lib/o32/libmj.acomp-c-lib compat,crypto +./usr/lib/o32/libmj.socomp-sys-shlib compat,crypto,pic +./usr/lib/o32/libmj_p.acomp-c-proflib compat,crypto,profile +./usr/lib/o32/libmj_pic.a comp-c-piclib compat,crypto,pic ./usr/lib/o32/libnetpgp.a comp-c-lib compat,crypto ./usr/lib/o32/libnetpgp.so comp-sys-shlib compat,crypto,pic ./usr/lib/o32/libnetpgp_p.a comp-c-proflib compat,crypto,profile Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.72 src/distrib/sets/lists/comp/md.amd64:1.73 --- src/distrib/sets/lists/comp/md.amd64:1.72 Sat Jul 31 21:47:52 2010 +++ src/distrib/sets/lists/comp/md.amd64 Sat Aug 7 05:53:20 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.72 2010/07/31 21:47:52 joerg Exp $ +# $NetBSD: md.amd64,v 1.73 2010/08/07 05:53:20 agc Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -602,6 +602,11 @@ ./usr/lib/i386/libmenu_g.a comp-c-proflib compat,debuglib
