CVS commit: src/usr.sbin/wake
Module Name:src
Committed By: mbalmer
Date: Mon Dec 21 08:42:39 UTC 2009
Modified Files:
src/usr.sbin/wake: wake.8 wake.c
Log Message:
Fix synopsis to make it clear that at least one lladdr is required.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/wake/wake.8
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/wake/wake.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/wake/wake.8
diff -u src/usr.sbin/wake/wake.8:1.3 src/usr.sbin/wake/wake.8:1.4
--- src/usr.sbin/wake/wake.8:1.3 Thu Aug 6 22:01:36 2009
+++ src/usr.sbin/wake/wake.8 Mon Dec 21 08:42:39 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: wake.8,v 1.3 2009/08/06 22:01:36 wiz Exp $
+.\ $NetBSD: wake.8,v 1.4 2009/12/21 08:42:39 mbalmer Exp $
.\
.\ Copyright (c) 2009 Marc Balmer m...@msys.ch
.\
@@ -14,7 +14,7 @@
.\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\
-.Dd February 2, 2009
+.Dd December 21, 2009
.Dt WAKE 8
.Os
.Sh NAME
@@ -23,6 +23,7 @@
.Sh SYNOPSIS
.Nm
.Ar interface
+.Ar lladdr
.Op Ar lladdr ...
.Sh DESCRIPTION
The
Index: src/usr.sbin/wake/wake.c
diff -u src/usr.sbin/wake/wake.c:1.8 src/usr.sbin/wake/wake.c:1.9
--- src/usr.sbin/wake/wake.c:1.8 Sat Jul 18 08:35:19 2009
+++ src/usr.sbin/wake/wake.c Mon Dec 21 08:42:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wake.c,v 1.8 2009/07/18 08:35:19 mbalmer Exp $ */
+/* $NetBSD: wake.c,v 1.9 2009/12/21 08:42:39 mbalmer Exp $ */
/*
* Copyright (C) 2006, 2007, 2008, 2009 Marc Balmer m...@msys.ch
@@ -69,7 +69,8 @@
static void
usage(void)
{
- (void)fprintf(stderr, usage: %s interface lladdr\n, getprogname());
+ (void)fprintf(stderr, usage: %s interface lladdr [lladdr ...]\n,
+ getprogname());
exit(EXIT_FAILURE);
}
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Mon Dec 21 09:42:08 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1200 To generate a diff of this commit: cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.33 src/doc/CHANGES-5.0.2:1.1.2.34 --- src/doc/CHANGES-5.0.2:1.1.2.33 Fri Dec 18 05:34:18 2009 +++ src/doc/CHANGES-5.0.2 Mon Dec 21 09:42:08 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.33 2009/12/18 05:34:18 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.34 2009/12/21 09:42:08 sborrill Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -890,3 +890,10 @@ defaults to 16*mq_def_maxmsg [tron, ticket #1188] +sys/kern/vfs_syscalls.c1.400 + + Use the kernel space version of the vfs name, not the + original userspace pointer. Avoids crashes on archs with + completely separate userspace VA. + [martin, ticket #1200] +
CVS commit: src/distrib/landisk/ramdisk
Module Name:src Committed By: nonaka Date: Mon Dec 21 11:22:41 UTC 2009 Modified Files: src/distrib/landisk/ramdisk: list Log Message: Added dmesg, mount_msdos. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/distrib/landisk/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/landisk/ramdisk/list diff -u src/distrib/landisk/ramdisk/list:1.12 src/distrib/landisk/ramdisk/list:1.13 --- src/distrib/landisk/ramdisk/list:1.12 Sun Sep 20 23:19:53 2009 +++ src/distrib/landisk/ramdisk/list Mon Dec 21 11:22:41 2009 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.12 2009/09/20 23:19:53 abs Exp $ +# $NetBSD: list,v 1.13 2009/12/21 11:22:41 nonaka Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -20,6 +20,7 @@ PROG bin/sync PROG sbin/disklabel +PROG sbin/dmesg PROG sbin/fdisk PROG sbin/fsck PROG sbin/fsck_ffs @@ -29,6 +30,7 @@ PROG sbin/mount PROG sbin/mount_cd9660 PROG sbin/mount_ffs +PROG sbin/mount_msdos PROG sbin/mount_nfs PROG sbin/newfs sbin/mount_mfs PROG sbin/ping
CVS commit: src/bin/pax
Module Name:src
Committed By: christos
Date: Mon Dec 21 12:44:48 UTC 2009
Modified Files:
src/bin/pax: sel_subs.c
Log Message:
Remove unnecessary casts.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/bin/pax/sel_subs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/sel_subs.c
diff -u src/bin/pax/sel_subs.c:1.22 src/bin/pax/sel_subs.c:1.23
--- src/bin/pax/sel_subs.c:1.22 Mon Dec 21 04:17:37 2009
+++ src/bin/pax/sel_subs.c Mon Dec 21 07:44:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sel_subs.c,v 1.22 2009/12/21 09:17:37 wiz Exp $ */
+/* $NetBSD: sel_subs.c,v 1.23 2009/12/21 12:44:48 christos Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)sel_subs.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: sel_subs.c,v 1.22 2009/12/21 09:17:37 wiz Exp $);
+__RCSID($NetBSD: sel_subs.c,v 1.23 2009/12/21 12:44:48 christos Exp $);
#endif
#endif /* not lint */
@@ -378,7 +378,7 @@
/*
* allocate space for the time range and store the limits
*/
- if ((pt = (TIME_RNG *)malloc(sizeof(TIME_RNG))) == NULL) {
+ if ((pt = malloc(sizeof(TIME_RNG))) == NULL) {
tty_warn(1, Unable to allocate memory for time range);
return -1;
}
@@ -404,7 +404,7 @@
default:
tty_warn(1, Bad option %c with time range %s,
*flgpt, str);
-(void)free((char *)pt);
+free(pt);
goto out;
}
++flgpt;
@@ -421,7 +421,7 @@
*/
if (str_sec(str, (pt-low_time)) 0) {
tty_warn(1, Illegal lower time range %s, str);
- (void)free((char *)pt);
+ free(pt);
goto out;
}
pt-flgs |= HASLOW;
@@ -433,7 +433,7 @@
*/
if (str_sec(up_pt, (pt-high_time)) 0) {
tty_warn(1, Illegal upper time range %s, up_pt);
- (void)free((char *)pt);
+ free(pt);
goto out;
}
pt-flgs |= HASHIGH;
@@ -446,7 +446,7 @@
tty_warn(1,
Upper %s and lower %s time overlap,
up_pt, str);
-(void)free((char *)pt);
+free(pt);
return -1;
}
}
CVS commit: src/sys/compat/common
Module Name:src
Committed By: njoly
Date: Mon Dec 21 15:13:13 UTC 2009
Modified Files:
src/sys/compat/common: compat_mod.c
Log Message:
Remove SYS_compat_50_mq_timedreceive/SYS_compat_50_mq_timedsend
duplicate entries.
Fix a KASSERT when unloading the compat kernel module.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/compat/common/compat_mod.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/compat/common/compat_mod.c
diff -u src/sys/compat/common/compat_mod.c:1.9 src/sys/compat/common/compat_mod.c:1.10
--- src/sys/compat/common/compat_mod.c:1.9 Sun Nov 22 19:09:16 2009
+++ src/sys/compat/common/compat_mod.c Mon Dec 21 15:13:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_mod.c,v 1.9 2009/11/22 19:09:16 mbalmer Exp $ */
+/* $NetBSD: compat_mod.c,v 1.10 2009/12/21 15:13:13 njoly Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: compat_mod.c,v 1.9 2009/11/22 19:09:16 mbalmer Exp $);
+__KERNEL_RCSID(0, $NetBSD: compat_mod.c,v 1.10 2009/12/21 15:13:13 njoly Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -231,8 +231,6 @@
# endif
{ SYS_compat_50___fhstat40, 0, (sy_call_t *)compat_50_sys___fhstat40 },
{ SYS_compat_50_aio_suspend, 0, (sy_call_t *)compat_50_sys_aio_suspend },
- { SYS_compat_50_mq_timedreceive, 0, (sy_call_t *)compat_50_sys_mq_timedreceive },
- { SYS_compat_50_mq_timedsend, 0, (sy_call_t *)compat_50_sys_mq_timedsend },
#endif
{ 0, 0, NULL },
};
CVS commit: src/distrib/sets
Module Name:src
Committed By: uebayasi
Date: Mon Dec 21 15:37:25 UTC 2009
Modified Files:
src/distrib/sets: sets.subr
Log Message:
s/sed/${SED}/; s/xargs/${XARGS}/
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/distrib/sets/sets.subr
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/sets.subr
diff -u src/distrib/sets/sets.subr:1.117 src/distrib/sets/sets.subr:1.118
--- src/distrib/sets/sets.subr:1.117 Tue Dec 15 06:18:07 2009
+++ src/distrib/sets/sets.subr Mon Dec 21 15:37:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.117 2009/12/15 06:18:07 uebayasi Exp $
+# $NetBSD: sets.subr,v 1.118 2009/12/21 15:37:25 uebayasi Exp $
#
#
@@ -55,6 +55,7 @@
: ${TSORT:=tsort}
: ${UNAME:=uname}
: ${WC:=wc}
+: ${XARGS:=xargs}
#
# If printf is a shell builtin command, then we can
@@ -124,7 +125,7 @@
IFS=$oIFS
-MKVARS=$( ${MAKE} -B -f ${rundir}/mkvars.mk mkvars | sed -e 's,=.*,,' | xargs )
+MKVARS=$( ${MAKE} -B -f ${rundir}/mkvars.mk mkvars | ${SED} -e 's,=.*,,' | ${XARGS} )
#
@@ -166,7 +167,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.117 2009/12/15 06:18:07 uebayasi Exp $
+# # $NetBSD: sets.subr,v 1.118 2009/12/21 15:37:25 uebayasi Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -471,7 +472,7 @@
echo 2 DEBUG: list_set_files: $l
fi
done
- done | xargs ${SED} ${SUBST}
+ done | ${XARGS} ${SED} ${SUBST}
}
# arch_to_cpu mach
CVS commit: src/usr.sbin/wake
Module Name:src Committed By: mbalmer Date: Mon Dec 21 15:48:33 UTC 2009 Modified Files: src/usr.sbin/wake: wake.8 Log Message: Better wording. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/wake/wake.8 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/wake/wake.8 diff -u src/usr.sbin/wake/wake.8:1.4 src/usr.sbin/wake/wake.8:1.5 --- src/usr.sbin/wake/wake.8:1.4 Mon Dec 21 08:42:39 2009 +++ src/usr.sbin/wake/wake.8 Mon Dec 21 15:48:33 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: wake.8,v 1.4 2009/12/21 08:42:39 mbalmer Exp $ +.\ $NetBSD: wake.8,v 1.5 2009/12/21 15:48:33 mbalmer Exp $ .\ .\ Copyright (c) 2009 Marc Balmer m...@msys.ch .\ @@ -36,7 +36,7 @@ having physical access to them. .Pp .Ar interface -is the network interface of the local machine. +is a network interface of the local machine. .Ar lladdr is the link layer address of the remote machine. This can be specified as the actual hardware address
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: njoly Date: Mon Dec 21 16:18:17 UTC 2009 Modified Files: src/sys/compat/netbsd32: netbsd32_compat_50.c Log Message: Do not include fs_lfs.h unless _KERNEL_OPT is defined. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/compat/netbsd32/netbsd32_compat_50.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/compat/netbsd32/netbsd32_compat_50.c diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.7 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.8 --- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.7 Wed Nov 11 09:48:51 2009 +++ src/sys/compat/netbsd32/netbsd32_compat_50.c Mon Dec 21 16:18:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_50.c,v 1.7 2009/11/11 09:48:51 rmind Exp $ */ +/* $NetBSD: netbsd32_compat_50.c,v 1.8 2009/12/21 16:18:17 njoly Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -36,13 +36,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_compat_50.c,v 1.7 2009/11/11 09:48:51 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: netbsd32_compat_50.c,v 1.8 2009/12/21 16:18:17 njoly Exp $); #if defined(_KERNEL_OPT) #include opt_sysv.h -#endif #include fs_lfs.h +#endif #include sys/param.h #include sys/systm.h
CVS commit: src
Module Name:src
Committed By: thorpej
Date: Mon Dec 21 18:21:18 UTC 2009
Modified Files:
src/external/bsd/libelf/dist: libelf.h
src/tools: Makefile Makefile.disklabel
Added Files:
src/tools/libelf: Makefile libelf.inc
Log Message:
Add support for building libelf in a host-tool environment.
XXX Makefile.disklabel is really mis-named, but I'm not going to tackle
that problem right now.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libelf/dist/libelf.h
cvs rdiff -u -r1.129 -r1.130 src/tools/Makefile
cvs rdiff -u -r1.13 -r1.14 src/tools/Makefile.disklabel
cvs rdiff -u -r0 -r1.1 src/tools/libelf/Makefile src/tools/libelf/libelf.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libelf/dist/libelf.h
diff -u src/external/bsd/libelf/dist/libelf.h:1.4 src/external/bsd/libelf/dist/libelf.h:1.5
--- src/external/bsd/libelf/dist/libelf.h:1.4 Sun Dec 20 05:52:15 2009
+++ src/external/bsd/libelf/dist/libelf.h Mon Dec 21 18:21:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: libelf.h,v 1.4 2009/12/20 05:52:15 thorpej Exp $ */
+/* $NetBSD: libelf.h,v 1.5 2009/12/21 18:21:17 thorpej Exp $ */
/*-
* Copyright (c) 2006 Joseph Koshy
@@ -33,17 +33,23 @@
#include sys/types.h
#include sys/queue.h
+#include inttypes.h
-#if defined(__NetBSD__)
+#if HAVE_NBTOOL_CONFIG_H
+# include nbinclude/sys/exec_elf.h
+# define __LIBELF_HAVE_ELF_CAP 1
+# define __LIBELF_HAVE_ELF_MOVE 1
+# define __LIBELF_HAVE_ELF_NOTE 1
+# define __LIBELF_HAVE_ELF_SYMINFO 1
+# define __LIBELF_HAVE_ELF_VERS 1
+#elif defined(__NetBSD__)
# include sys/exec_elf.h
# define __LIBELF_HAVE_ELF_CAP 1
# define __LIBELF_HAVE_ELF_MOVE 1
# define __LIBELF_HAVE_ELF_NOTE 1
# define __LIBELF_HAVE_ELF_SYMINFO 1
# define __LIBELF_HAVE_ELF_VERS 1
-#endif /* __NetBSD__ */
-
-#if defined(__FreeBSD__)
+#elif defined(__FreeBSD__)
# include sys/elf32.h
# include sys/elf64.h
# include osreldate.h
@@ -56,7 +62,7 @@
# if __FreeBSD_version = 79
# define __LIBELF_HAVE_ELF_VERS 1
# endif /* __FreeBSD_version = 79 */
-#endif /* __FreeBSD__ */
+#endif
/* Library private data structures */
typedef struct _Elf Elf;
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.129 src/tools/Makefile:1.130
--- src/tools/Makefile:1.129 Thu Oct 29 13:07:12 2009
+++ src/tools/Makefile Mon Dec 21 18:21:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2009/10/29 13:07:12 christos Exp $
+# $NetBSD: Makefile,v 1.130 2009/12/21 18:21:17 thorpej Exp $
.include bsd.own.mk
@@ -43,6 +43,7 @@
yacc .WAIT \
awk .WAIT \
lex .WAIT \
+ libelf .WAIT \
${TOOLCHAIN_BITS} \
asn1_compile atf-compile cat cksum compile_et config db \
file lint1 \
Index: src/tools/Makefile.disklabel
diff -u src/tools/Makefile.disklabel:1.13 src/tools/Makefile.disklabel:1.14
--- src/tools/Makefile.disklabel:1.13 Mon Sep 14 13:44:05 2009
+++ src/tools/Makefile.disklabel Mon Dec 21 18:21:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.disklabel,v 1.13 2009/09/14 13:44:05 he Exp $
+# $NetBSD: Makefile.disklabel,v 1.14 2009/12/21 18:21:17 thorpej Exp $
# NOxxx definitions are copied from Makefile.host, and are
# required before .include bsd.own.mk. The include of bsd.own.mk
@@ -29,7 +29,8 @@
_INCS= disktab.h
_SYSINCS= bootblock.h \
disklabel.h disklabel_acorn.h disklabel_gpt.h disklabel_rdb.h \
- dkbad.h
+ dkbad.h \
+ exec_elf.h
HOST_CPPFLAGS+= -I${TOOLDIR}/include
Added files:
Index: src/tools/libelf/Makefile
diff -u /dev/null src/tools/libelf/Makefile:1.1
--- /dev/null Mon Dec 21 18:21:18 2009
+++ src/tools/libelf/Makefile Mon Dec 21 18:21:18 2009
@@ -0,0 +1,79 @@
+# $NetBSD: Makefile,v 1.1 2009/12/21 18:21:18 thorpej Exp $
+
+HOSTLIB= elf
+
+SRCS= elf_begin.c \
+ elf_cntl.c \
+ elf_end.c elf_errmsg.c elf_errno.c \
+ elf_data.c \
+ elf_fill.c elf_flag.c \
+ elf_getarhdr.c elf_getarsym.c elf_getbase.c \
+ elf_getident.c \
+ elf_hash.c \
+ elf_kind.c \
+ elf_memory.c \
+ elf_next.c \
+ elf_rand.c elf_rawfile.c\
+ elf_phnum.c \
+ elf_shnum.c elf_shstrndx.c elf_scn.c elf_strptr.c \
+ elf_update.c \
+ elf_version.c \
+ gelf_cap.c \
+ gelf_checksum.c \
+ gelf_dyn.c \
+ gelf_ehdr.c \
+ gelf_getclass.c \
+ gelf_fsize.c \
+ gelf_move.c \
+ gelf_phdr.c \
+ gelf_rel.c gelf_rela.c \
+ gelf_shdr.c gelf_sym.c gelf_syminfo.c gelf_symshndx.c \
+ gelf_xlate.c \
+ libelf.c \
+ libelf_align.c libelf_allocate.c libelf_ar.c \
+ libelf_checksum.c \
+ libelf_data.c \
+ libelf_ehdr.c libelf_extended.c\
+ libelf_phdr.c \
+ libelf_shdr.c \
+ libelf_xlate.c \
+ ${LIBELF_GENSRCS}
+
+LIBELF_GENSRCS= libelf_fsize.c libelf_msize.c libelf_convert.c
+
+LIBELF_DIR= ${.CURDIR}/../../external/bsd/libelf/dist
+
CVS commit: src/external/bsd/libelf/dist
Module Name:src Committed By: thorpej Date: Mon Dec 21 18:27:48 UTC 2009 Modified Files: src/external/bsd/libelf/dist: elf.3 Log Message: Note when this appeared in NetBSD. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/libelf/dist/elf.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/libelf/dist/elf.3 diff -u src/external/bsd/libelf/dist/elf.3:1.1.1.1 src/external/bsd/libelf/dist/elf.3:1.2 --- src/external/bsd/libelf/dist/elf.3:1.1.1.1 Sat Dec 19 05:43:39 2009 +++ src/external/bsd/libelf/dist/elf.3 Mon Dec 21 18:27:48 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: elf.3,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $ +.\ $NetBSD: elf.3,v 1.2 2009/12/21 18:27:48 thorpej Exp $ .\ .\ Copyright (c) 2006,2007 Joseph Koshy. All rights reserved. .\ @@ -573,8 +573,10 @@ .Xr elf 5 .Sh HISTORY The original ELF(3) API was developed for Unix System V. -The current implementation of the ELF(3) API appeared in -.Fx 7.0 . +This implementation first appeared in +.Fx 7.0 +and +.Nx 6.0 . .Sh AUTHORS The ELF library was written by .An Joseph Koshy
CVS commit: src/share/man/man4
Module Name:src Committed By: gdt Date: Mon Dec 21 19:04:36 UTC 2009 Modified Files: src/share/man/man4: ugen.4 Log Message: In the introduction, point out that RA_WB is intended for recurring fixed-sized transfers. Clarification requested by po...@. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/share/man/man4/ugen.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/ugen.4 diff -u src/share/man/man4/ugen.4:1.27 src/share/man/man4/ugen.4:1.28 --- src/share/man/man4/ugen.4:1.27 Fri Apr 10 15:07:08 2009 +++ src/share/man/man4/ugen.4 Mon Dec 21 19:04:36 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: ugen.4,v 1.27 2009/04/10 15:07:08 joerg Exp $ +.\ $NetBSD: ugen.4,v 1.28 2009/12/21 19:04:36 gdt Exp $ .\ .\ Copyright (c) 1999 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -118,6 +118,8 @@ .Xr ioctl 2 calls are available, and enable read-ahead and write-behind buffering respectively. +This buffering supports fixed-sized USB transfers and is intended for +devices with regular and continuing data transfers. When read-ahead or write-behind are enabled, the file descriptor may be set to use non-blocking IO. .Pp
CVS commit: src/share/man/man9
Module Name:src Committed By: matt Date: Mon Dec 21 20:57:31 UTC 2009 Modified Files: src/share/man/man9: uvm.9 Log Message: uvm_page_physload takes paddr_t's not vaddr_t's. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/share/man/man9/uvm.9 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/man9/uvm.9 diff -u src/share/man/man9/uvm.9:1.100 src/share/man/man9/uvm.9:1.101 --- src/share/man/man9/uvm.9:1.100 Wed Oct 21 22:18:37 2009 +++ src/share/man/man9/uvm.9 Mon Dec 21 20:57:31 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: uvm.9,v 1.100 2009/10/21 22:18:37 wiz Exp $ +.\ $NetBSD: uvm.9,v 1.101 2009/12/21 20:57:31 matt Exp $ .\ .\ Copyright (c) 1998 Matthew R. Green .\ All rights reserved. @@ -24,7 +24,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd October 22, 2009 +.Dd December 21, 2009 .Dt UVM 9 .Os .Sh NAME @@ -557,7 +557,7 @@ .It Ft void .Fn uvm_pglistfree struct pglist *list ; .It Ft void -.Fn uvm_page_physload vaddr_t start vaddr_t end vaddr_t avail_start vaddr_t avail_end int free_list ; +.Fn uvm_page_physload paddr_t start paddr_t end paddr_t avail_start paddr_t avail_end int free_list ; .El .Pp .Fn uvm_pagealloc
CVS commit: src/tools
Module Name:src
Committed By: mrg
Date: Mon Dec 21 20:57:36 UTC 2009
Modified Files:
src/tools: Makefile
Log Message:
move the build of pax before libelf. fixes my build of tools/libelf,
though i didn't look to see why libelf needs pax.
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.130 src/tools/Makefile:1.131
--- src/tools/Makefile:1.130 Mon Dec 21 18:21:17 2009
+++ src/tools/Makefile Mon Dec 21 20:57:36 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.130 2009/12/21 18:21:17 thorpej Exp $
+# $NetBSD: Makefile,v 1.131 2009/12/21 20:57:36 mrg Exp $
.include bsd.own.mk
@@ -43,12 +43,12 @@
yacc .WAIT \
awk .WAIT \
lex .WAIT \
+ pax .WAIT \
libelf .WAIT \
${TOOLCHAIN_BITS} \
asn1_compile atf-compile cat cksum compile_et config db \
file lint1 \
makefs menuc mkcsmapper mkesdb mklocale mknod msgc \
- pax .WAIT \
disklabel .WAIT \
paxctl .WAIT \
fdisk .WAIT \
CVS commit: src/distrib/sets/lists/comp
Module Name:src
Committed By: dyoung
Date: Mon Dec 21 21:09:42 UTC 2009
Modified Files:
src/distrib/sets/lists/comp: mi
Log Message:
Fix MKDEBUGLIB=yes builds: add entries
/usr/lib/lib{avl,nvpair,umem,uutil,zfs,zpool}_g.a with keywords
'zfs' and 'debuglib'. Add the keyword 'binutils' to entries
/usr/lib/lib{bfd,iberty,opcodes}_g.a.
To generate a diff of this commit:
cvs rdiff -u -r1.1350 -r1.1351 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/mi
diff -u src/distrib/sets/lists/comp/mi:1.1350 src/distrib/sets/lists/comp/mi:1.1351
--- src/distrib/sets/lists/comp/mi:1.1350 Sun Dec 20 05:53:34 2009
+++ src/distrib/sets/lists/comp/mi Mon Dec 21 21:09:41 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1350 2009/12/20 05:53:34 thorpej Exp $
+# $NetBSD: mi,v 1.1351 2009/12/21 21:09:41 dyoung Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -2305,9 +2305,10 @@
./usr/lib/libatf.acomp-obsolete obsolete
./usr/lib/libatf_p.acomp-obsolete obsolete
./usr/lib/libavl.acomp-zfs-lib zfs
+./usr/lib/libavl_g.a-unknown- debuglib,zfs
./usr/lib/libavl_p.acomp-zfs-proflib profile,zfs
./usr/lib/libbfd.acomp-obsolete obsolete
-./usr/lib/libbfd_g.a-unknown- debuglib
+./usr/lib/libbfd_g.a-unknown- debuglib,binutils
./usr/lib/libbind9.acomp-bind-lib
./usr/lib/libbind9_g.a-unknown- debuglib
./usr/lib/libbind9_p.acomp-bind-proflib profile
@@ -2411,7 +2412,7 @@
./usr/lib/libhx509.acomp-krb5-lib kerberos
./usr/lib/libhx509_g.a-unknown- debuglib,kerberos
./usr/lib/libhx509_p.acomp-krb5-proflib profile,kerberos
-./usr/lib/libiberty_g.a-unknown- debuglib
+./usr/lib/libiberty_g.a-unknown- debuglib,binutils
./usr/lib/libintl.acomp-c-lib
./usr/lib/libintl_g.a-unknown- debuglib
./usr/lib/libintl_p.acomp-c-proflib profile
@@ -2485,11 +2486,12 @@
./usr/lib/libntp_p.acomp-obsolete obsolete
./usr/lib/libntp_pic.acomp-obsolete obsolete
./usr/lib/libnvpair.acomp-zfs-lib zfs
+./usr/lib/libnvpair_g.a-unknown- debuglib,zfs
./usr/lib/libnvpair_p.acomp-zfs-proflib profile,zfs
./usr/lib/libobjc.acomp-objc-lib
./usr/lib/libobjc_g.a-unknown- debuglib
./usr/lib/libobjc_p.acomp-objc-proflib profile
-./usr/lib/libopcodes_g.a -unknown- debuglib
+./usr/lib/libopcodes_g.a comp-obsolete debuglib,binutils
./usr/lib/libopenpgpsdk.a comp-obsolete obsolete
./usr/lib/libopenpgpsdk_g.a comp-obsolete obsolete
./usr/lib/libopenpgpsdk_p.a comp-obsolete obsolete
@@ -2687,6 +2689,7 @@
./usr/lib/libukfs_g.a-unknown- debuglib
./usr/lib/libukfs_p.acomp-c-proflib profile
./usr/lib/libumem.acomp-zfs-lib zfs
+./usr/lib/libumem_g.a-unknown- debuglib,zfs
./usr/lib/libumem_p.acomp-zfs-proflib profile,zfs
./usr/lib/libusb.acomp-obsolete obsolete
./usr/lib/libusb_p.acomp-obsolete obsolete
@@ -2698,6 +2701,7 @@
./usr/lib/libutil_g.a-unknown- debuglib
./usr/lib/libutil_p.acomp-c-proflib profile
./usr/lib/libuutil.acomp-zfs-lib zfs
+./usr/lib/libuutil_g.a-unknown- debuglib,zfs
./usr/lib/libuutil_p.acomp-zfs-proflib profile,zfs
./usr/lib/libvers_g.a-unknown- kerberos,debuglib
./usr/lib/libwrap.acomp-c-lib
@@ -2710,8 +2714,10 @@
./usr/lib/libz_g.a-unknown- debuglib
./usr/lib/libz_p.acomp-c-proflib profile
./usr/lib/libzfs.acomp-zfs-lib zfs
+./usr/lib/libzfs_g.a-unknown- debuglib,zfs
./usr/lib/libzfs_p.acomp-zfs-proflib profile,zfs
./usr/lib/libzpool.acomp-zfs-lib zfs
+./usr/lib/libzpool_g.a-unknown- debuglib,zfs
./usr/lib/libzpool_p.acomp-zfs-proflib profile,zfs
./usr/lib/pkgconfigcomp-c-lib
./usr/lib/pkgconfig/atf-c++.pc comp-atf-lib atf
CVS commit: src/share/man/man9
Module Name:src Committed By: dyoung Date: Mon Dec 21 22:49:18 UTC 2009 Modified Files: src/share/man/man9: vmem.9 Log Message: Describe arguments allocfn, freefn, and source of vmem_create(9) in more detail. Describe vmem_add(9). Write a new BUGS section that warns about aspects of vmem(9) behavior that may surprise first-time users. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man9/vmem.9 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/man9/vmem.9 diff -u src/share/man/man9/vmem.9:1.6 src/share/man/man9/vmem.9:1.7 --- src/share/man/man9/vmem.9:1.6 Mon Aug 3 23:15:29 2009 +++ src/share/man/man9/vmem.9 Mon Dec 21 22:49:18 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: vmem.9,v 1.6 2009/08/03 23:15:29 rmind Exp $ +.\ $NetBSD: vmem.9,v 1.7 2009/12/21 22:49:18 dyoung Exp $ .\ .\ Copyright (c)2006 YAMAMOTO Takashi, .\ All rights reserved. @@ -25,7 +25,7 @@ .\ SUCH DAMAGE. .\ .\ -.Dd August 3, 2009 +.Dd December 21, 2009 .Dt VMEM 9 .Os .\ @@ -44,6 +44,10 @@ vmem_t *source vmem_size_t qcache_max vm_flag_t flags int ipl .\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .Ft vmem_addr_t +.Fn vmem_add \ +vmem_t *vm vmem_addr_t addr vmem_size_t size vm_flag_t flags +.\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +.Ft vmem_addr_t .Fn vmem_xalloc \ vmem_t *vm vmem_size_t size vmem_size_t align \ vmem_size_t phase vmem_size_t nocross vmem_addr_t minaddr \ @@ -86,10 +90,70 @@ The smallest unit of allocation. .It Fa allocfn The callback function used to import spans from the backend arena. +Set both +.Fa allocfn +and +.Fa freefn +to +.Dv NULL +to disable automatic imports. +.Nm +calls +.Fo (*allocfn) +.Fa source +.Fa size +.Fa actualsize +.Fa flags +.Fc +to import a span of size at least +.Fa size . +.Fa allocfn +should accept the same +.Fa flags +as +.Fn vmem_alloc . +.Fa allocfn +must return +.Dv VMEM_ADDR_NULL +to indicate failure, or +else the starting address of the imported span. +If +.Fa allocfn +succeeds, it must write the actual size of the allocation to +.Fa actualsize . +The actual size will always be greater than or equal to the requested size. .It Fa freefn The callback function used to free spans to the backend arena. +.Fa freefn +may not be +.Dv NULL +unless +.Fa allocfn +is +.Dv NULL . +.Nm +calls +.Fn (*freefn) source addr size +to return to +.Fa source +a span of size +.Fa size , +starting at +.Fa addr , +that was previously allocated by +.Fa allocfn . .It Fa source The backend arena. +.Fa source +may be +.Dv NULL . +.Nm +passes +.Fa source +as the first argument of +.Fa allocfn +and +.Fa freefn . .It Fa qcache_max The largest size of allocations which can be served by quantum cache. It is merely a hint and can be ignored. @@ -109,6 +173,28 @@ .El .Pp .\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +.Fn vmem_add +adds a span of size +.Fa size +starting at +.Fa addr +to the arena. +Returns +.Fa addr +on success. +.Fa flags +should be one of: +.Bl -tag -width VM_NOSLEEP +.It Dv VM_SLEEP +Can sleep until enough resources are available. +.It Dv VM_NOSLEEP +Don't sleep. +Immediately return +.Dv VMEM_ADDR_NULL +if there are not enough resources available. +.El +.Pp +.\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .Fn vmem_xalloc allocates a resource from the arena. .Pp @@ -171,7 +257,7 @@ .\ .Fn vmem_xfree frees resource allocated by -.Fa vmem_xalloc +.Fn vmem_xalloc to the arena. .Pp .Bl -tag -width addr @@ -227,7 +313,7 @@ .\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .Fn vmem_free frees resource allocated by -.Fa vmem_alloc +.Fn vmem_alloc to the arena. .Pp .Bl -tag -width addr @@ -300,6 +386,27 @@ .%D 2001 .Re .\ +.Sh BUGS +.Nm +cannot manage a resource that starts at 0, because it reserves the +address +.Dv VMEM_ADDR_NULL +.Pq 0 +for indicating errors. +.Pp +.Nm +cannot manage a resource that ends at the maximum +.Vt vmem_addr_t . +This is an implementation limitation. +.Pp +.Nm +relies on +.Xr malloc 9 , +.Xr pool 9 , +and +.Xr RUN_ONCE 9 , +so it cannot be used as early during system bootstrap as +.Xr extent 9 . .Sh AUTHORS This implementation of .Nm
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/include
Module Name:src Committed By: matt Date: Tue Dec 22 00:01:52 UTC 2009 Modified Files: src/sys/arch/mips/include [matt-nb5-mips64]: mips1_pte.h mips3_pte.h Log Message: Add multiple inclusion protection. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.38.1 src/sys/arch/mips/include/mips1_pte.h cvs rdiff -u -r1.23.38.2 -r1.23.38.3 src/sys/arch/mips/include/mips3_pte.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/arch/mips/include/mips1_pte.h diff -u src/sys/arch/mips/include/mips1_pte.h:1.17 src/sys/arch/mips/include/mips1_pte.h:1.17.38.1 --- src/sys/arch/mips/include/mips1_pte.h:1.17 Wed Oct 17 19:55:37 2007 +++ src/sys/arch/mips/include/mips1_pte.h Tue Dec 22 00:01:52 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: mips1_pte.h,v 1.17 2007/10/17 19:55:37 garbled Exp $ */ +/* $NetBSD: mips1_pte.h,v 1.17.38.1 2009/12/22 00:01:52 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -76,6 +76,8 @@ * @(#)pte.h 8.1 (Berkeley) 6/10/93 */ +#ifndef _MIPS_MIPS1_PTE_H_ +#define _MIPS_MIPS1_PTE_H_ /* * R2000 hardware page table entry */ @@ -132,3 +134,5 @@ #define MIPS1_PTE_TO_PADDR(pte) ((unsigned)(pte) MIPS1_PG_FRAME) #define MIPS1_PAGE_IS_RDONLY(pte,va) ((int)(pte) MIPS1_PG_RO) + +#endif /* !_MIPS_MIPS1_PTE_H_ */ Index: src/sys/arch/mips/include/mips3_pte.h diff -u src/sys/arch/mips/include/mips3_pte.h:1.23.38.2 src/sys/arch/mips/include/mips3_pte.h:1.23.38.3 --- src/sys/arch/mips/include/mips3_pte.h:1.23.38.2 Tue Sep 8 07:54:53 2009 +++ src/sys/arch/mips/include/mips3_pte.h Tue Dec 22 00:01:52 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: mips3_pte.h,v 1.23.38.2 2009/09/08 07:54:53 matt Exp $ */ +/* $NetBSD: mips3_pte.h,v 1.23.38.3 2009/12/22 00:01:52 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -76,6 +76,8 @@ * from: @(#)pte.h 8.1 (Berkeley) 6/10/93 */ +#ifndef _MIPS_MIPS3_PTE_H_ +#define _MIPS_MIPS3_PTE_H_ /* * R4000 hardware page table entry */ @@ -213,3 +215,4 @@ #define MIPS4100_PG_SIZE_TO_MASK(pg_size) \ pg_size) * 2) - 1) ~0x07ff) +#endif /* !_MIPS_MIPS3_PTE_H_ */
CVS commit: [matt-nb5-mips64] src/share/mk
Module Name:src
Committed By: mrg
Date: Tue Dec 22 04:47:26 UTC 2009
Modified Files:
src/share/mk [matt-nb5-mips64]: bsd.kmod.mk bsd.kmodule.mk bsd.prog.mk
Log Message:
use ${CC} -r not -Wl,-r, from -current.
To generate a diff of this commit:
cvs rdiff -u -r1.89.6.1 -r1.89.6.2 src/share/mk/bsd.kmod.mk
cvs rdiff -u -r1.13.2.1.2.1.2.1 -r1.13.2.1.2.1.2.2 \
src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.239.2.1.2.1.2.1 -r1.239.2.1.2.1.2.2 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmod.mk
diff -u src/share/mk/bsd.kmod.mk:1.89.6.1 src/share/mk/bsd.kmod.mk:1.89.6.2
--- src/share/mk/bsd.kmod.mk:1.89.6.1 Sat Sep 5 03:38:23 2009
+++ src/share/mk/bsd.kmod.mk Tue Dec 22 04:47:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmod.mk,v 1.89.6.1 2009/09/05 03:38:23 matt Exp $
+# $NetBSD: bsd.kmod.mk,v 1.89.6.2 2009/12/22 04:47:25 mrg Exp $
.include bsd.init.mk
.include bsd.klinks.mk
@@ -46,7 +46,7 @@
${MACHINE_CPU} == powerpc
${KMOD}_tmp.o: ${OBJS} ${DPADD}
${_MKTARGET_COMPILE}
- ${CC} ${LDFLAGS} -nostdlib -Wl,-r -o tmp.o ${OBJS}
+ ${CC} ${LDFLAGS} -r -nostdlib -Wl -o tmp.o ${OBJS}
mv tmp.o ${.TARGET}
${KMOD}_tramp.S: ${KMOD}_tmp.o $S/lkm/arch/${MACHINE_CPU}/lkmtramp.awk
@@ -58,7 +58,7 @@
${PROG}: ${KMOD}_tmp.o ${KMOD}_tramp.o
${_MKTARGET_LINK}
- ${CC} ${LDFLAGS} -nostdlib -Wl,-r \
+ ${CC} ${LDFLAGS} -nostdlib -r \
`${OBJDUMP} --syms --reloc ${KMOD}_tmp.o | \
${TOOL_AWK} -f $S/lkm/arch/${MACHINE_CPU}/lkmwrap.awk` \
-o tmp.o ${KMOD}_tmp.o ${KMOD}_tramp.o
@@ -73,7 +73,7 @@
.else
${PROG}: ${OBJS} ${DPADD}
${_MKTARGET_LINK}
- ${CC} ${LDFLAGS} -nostdlib -Wl,-r -o tmp.o ${OBJS}
+ ${CC} ${LDFLAGS} -nostdlib -r -o tmp.o ${OBJS}
mv tmp.o ${.TARGET}
.endif
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.13.2.1.2.1.2.1 src/share/mk/bsd.kmodule.mk:1.13.2.1.2.1.2.2
--- src/share/mk/bsd.kmodule.mk:1.13.2.1.2.1.2.1 Sat Sep 5 03:38:23 2009
+++ src/share/mk/bsd.kmodule.mk Tue Dec 22 04:47:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.13.2.1.2.1.2.1 2009/09/05 03:38:23 matt Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.13.2.1.2.1.2.2 2009/12/22 04:47:25 mrg Exp $
.include bsd.init.mk
.include bsd.klinks.mk
@@ -40,7 +40,7 @@
${PROG}: ${OBJS} ${DPADD}
${_MKTARGET_LINK}
- ${CC} ${LDFLAGS} -nostdlib -Wl,-T,${KMODSCRIPT},-r,-d \
+ ${CC} ${LDFLAGS} -nostdlib -r -Wl,-T,${KMODSCRIPT},-d \
-o ${.TARGET} ${OBJS}
# Install rules
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.239.2.1.2.1.2.1 src/share/mk/bsd.prog.mk:1.239.2.1.2.1.2.2
--- src/share/mk/bsd.prog.mk:1.239.2.1.2.1.2.1 Sat Sep 5 03:38:23 2009
+++ src/share/mk/bsd.prog.mk Tue Dec 22 04:47:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.239.2.1.2.1.2.1 2009/09/05 03:38:23 matt Exp $
+# $NetBSD: bsd.prog.mk,v 1.239.2.1.2.1.2.2 2009/12/22 04:47:26 mrg Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -316,7 +316,7 @@
${_P}.ro: ${OBJS.${_P}} ${DPADD}
${_MKTARGET_LINK}
- ${CC} ${LDFLAGS} -nostdlib -Wl,-r,-dc -o ${.TARGET} ${OBJS.${_P}}
+ ${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
.if defined(_PROGDEBUG.${_P})
${_PROGDEBUG.${_P}}: ${_P}
CVS commit: [matt-nb5-mips64] src/lib/libc/gmon
Module Name:src
Committed By: mrg
Date: Tue Dec 22 04:50:13 UTC 2009
Modified Files:
src/lib/libc/gmon [matt-nb5-mips64]: Makefile.inc
Log Message:
pullup from -current:
revision 1.9
date: 2009/12/17 06:54:51; author: mrg; state: Exp; lines: +3 -2
don't warn about mcount on mips64* as well.
XXX: someone really should fix mips profile.h's MCOUNT!
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.12.1 src/lib/libc/gmon/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gmon/Makefile.inc
diff -u src/lib/libc/gmon/Makefile.inc:1.8 src/lib/libc/gmon/Makefile.inc:1.8.12.1
--- src/lib/libc/gmon/Makefile.inc:1.8 Tue Jul 29 14:20:12 2008
+++ src/lib/libc/gmon/Makefile.inc Tue Dec 22 04:50:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2008/07/29 14:20:12 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.8.12.1 2009/12/22 04:50:13 mrg Exp $
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
# gmon sources
@@ -10,7 +10,8 @@
MAN+= moncontrol.3
MLINKS+=moncontrol.3 monstartup.3
-.if (${MACHINE_ARCH} == mipseb) || (${MACHINE_ARCH} == mipsel)
+.if (${MACHINE_ARCH} == mipseb) || (${MACHINE_ARCH} == mipsel) || \
+(${MACHINE_ARCH} == mips64eb) || (${MACHINE_ARCH} == mips64el)
# Turn off as(1) warnings on MIPS, since warnings are fatal with WARNS0
# and mcount.c causes warnings from as(1).
# mcount.c should be fixed and this test removed.
CVS commit: [matt-nb5-mips64] src/gnu/lib/crtstuff4
Module Name:src
Committed By: mrg
Date: Tue Dec 22 04:51:26 UTC 2009
Modified Files:
src/gnu/lib/crtstuff4 [matt-nb5-mips64]: Makefile
Log Message:
pullup from -current:
revision 1.4
date: 2009/12/17 07:24:06; author: mrg; state: Exp; lines: +10 -1
copy across a hack from the mips libc/mcount build. self documenting:
+.if (${MACHINE_ARCH} == mips64eb) || (${MACHINE_ARCH} == mips64el)
+# Turn off as(1) warnings on MIPS, since warnings are fatal with WARNS0
+# and GCC configury passes -finhibit-size-directive which causes mips-gas
+# to barf. Don't know what the real fix for this is...
+#
+# XXX should be COPTS, but that's too early
+CPUFLAGS+=-Wa,--no-warn
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.10.1 src/gnu/lib/crtstuff4/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/lib/crtstuff4/Makefile
diff -u src/gnu/lib/crtstuff4/Makefile:1.3 src/gnu/lib/crtstuff4/Makefile:1.3.10.1
--- src/gnu/lib/crtstuff4/Makefile:1.3 Mon Aug 4 04:53:22 2008
+++ src/gnu/lib/crtstuff4/Makefile Tue Dec 22 04:51:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/04 04:53:22 lukem Exp $
+# $NetBSD: Makefile,v 1.3.10.1 2009/12/22 04:51:26 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -66,6 +66,15 @@
${CC} ${CPPFLAGS} ${GCFLAGS} ${CPUFLAGS} -c ${.IMPSRC} -o ${.TARGET}.o
mv ${.TARGET}.o ${.TARGET}
+.if (${MACHINE_ARCH} == mips64eb) || (${MACHINE_ARCH} == mips64el)
+# Turn off as(1) warnings on MIPS, since warnings are fatal with WARNS0
+# and GCC configury passes -finhibit-size-directive which causes mips-gas
+# to barf. Don't know what the real fix for this is...
+#
+# XXX should be COPTS, but that's too early
+CPUFLAGS+=-Wa,--no-warn
+.endif
+
.else
.include bsd.prog.mk # do nothing
CVS commit: src/crypto/external/bsd/netpgp
Module Name:src Committed By: agc Date: Tue Dec 22 06:03:25 UTC 2009 Modified Files: src/crypto/external/bsd/netpgp/dist: TODO configure configure.ac src/crypto/external/bsd/netpgp/dist/include: netpgp.h src/crypto/external/bsd/netpgp/dist/src/lib: Makefile.in crypto.c crypto.h libnetpgp.3 netpgp.c signature.c ssh2pgp.c validate.c validate.h version.h src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile netpgp.1 netpgp.c src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile src/crypto/external/bsd/netpgp/lib: config.h Log Message: Netpgp changes to 1.99.15/20091221 + some ssh host keys do not have the username of the generator included in the key itself. If there is no username in there, create one. + added netpgp_encrypt_memory() and netpgp_decrypt_memory() + overhaul netpgp(1) to work with stdin/stdout if no filenames specified: % netpgp --encrypt a | netpgp --decrypt b netpgp: default key set to C0596823 netpgp: default key set to C0596823 pub 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 uid Alistair Crooks a...@netbsd.org uid Alistair Crooks a...@pkgsrc.org uid Alistair Crooks a...@alistaircrooks.com uid Alistair Crooks alist...@hockley-crooks.com netpgp passphrase: % diff a b % ls -al a b -rw-r--r-- 1 agc agc 15243 Dec 20 08:55 a -rw-r--r-- 1 agc agc 15243 Dec 21 17:15 b % % netpgp --sign a | netpgp --cat b netpgp: default key set to C0596823 netpgp: default key set to C0596823 pub 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 uid Alistair Crooks a...@netbsd.org uid Alistair Crooks a...@pkgsrc.org uid Alistair Crooks a...@alistaircrooks.com uid Alistair Crooks alist...@hockley-crooks.com netpgp passphrase: Good signature for stdin made Mon Dec 21 18:25:02 2009 using RSA (Encrypt or Sign) key 1b68dcfcc0596823 pub 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 uid Alistair Crooks alist...@hockley-crooks.com uid Alistair Crooks a...@pkgsrc.org uid Alistair Crooks a...@netbsd.org uid Alistair Crooks a...@alistaircrooks.com uid Alistair Crooks (Yahoo!) agcro...@yahoo-inc.com % + add explanations of memory-based operations to manual pages To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/netpgp/dist/TODO cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/netpgp/dist/configure cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/netpgp/dist/configure.ac cvs rdiff -u -r1.13 -r1.14 \ src/crypto/external/bsd/netpgp/dist/include/netpgp.h cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in cvs rdiff -u -r1.17 -r1.18 \ src/crypto/external/bsd/netpgp/dist/src/lib/crypto.c cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3 \ src/crypto/external/bsd/netpgp/dist/src/lib/validate.h cvs rdiff -u -r1.33 -r1.34 \ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c cvs rdiff -u -r1.23 -r1.24 \ src/crypto/external/bsd/netpgp/dist/src/lib/signature.c cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c cvs rdiff -u -r1.24 -r1.25 \ src/crypto/external/bsd/netpgp/dist/src/lib/validate.c cvs rdiff -u -r1.21 -r1.22 \ src/crypto/external/bsd/netpgp/dist/src/lib/version.h cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile \ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/lib/config.h 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/TODO diff -u src/crypto/external/bsd/netpgp/dist/TODO:1.27 src/crypto/external/bsd/netpgp/dist/TODO:1.28 --- src/crypto/external/bsd/netpgp/dist/TODO:1.27 Mon Dec 14 23:29:56 2009 +++ src/crypto/external/bsd/netpgp/dist/TODO Tue Dec 22 06:03:24 2009 @@ -10,10 +10,8 @@ separate from libcrypto? 64-bit offsets thresholds -Multiple recipients for encryption - default compression when signing? elgamal enc/decryption? -convert tests from ./tst to the autotest ./tests/ hkpd Done @@ -76,3 +74,7 @@ don't complain if no .gnupg dir (even when using --homedir) make it work with ssh host keys regex matching for names
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src
Committed By: agc
Date: Tue Dec 22 06:51:31 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.c
Log Message:
Fix error in merge of previous change shown up by regression tests.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.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/netpgp/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.9 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.10
--- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.9 Tue Dec 22 06:03:25 2009
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c Tue Dec 22 06:51:31 2009
@@ -220,7 +220,6 @@
{
int cc;
int n;
- int i;
if (size = 0) {
(void) fprintf(stderr, %s\n, header);
@@ -311,7 +310,10 @@
free(out);
return ret;
}
- return netpgp_verify_file(netpgp, f, NULL, p-armour);
+ return netpgp_verify_file(netpgp, f,
+(p-cmd == VERIFY) ? NULL :
+ (p-output) ? p-output : -,
+p-armour);
case LIST_PACKETS:
return nonnull(f, p-progname)
netpgp_list_packets(netpgp, f, p-armour, NULL);
CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src
Committed By: agc
Date: Tue Dec 22 06:53:26 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist: tst
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c
Log Message:
Modify regression test suite behaviour - remove the (error) tests for
commands with no file arguments, as input will now be taken from stdin,
and output will go to stdout, if no file arguments are given on the
command line.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/netpgp/dist/tst
cvs rdiff -u -r1.34 -r1.35 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.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/tst
diff -u src/crypto/external/bsd/netpgp/dist/tst:1.16 src/crypto/external/bsd/netpgp/dist/tst:1.17
--- src/crypto/external/bsd/netpgp/dist/tst:1.16 Mon Dec 14 23:29:56 2009
+++ src/crypto/external/bsd/netpgp/dist/tst Tue Dec 22 06:53:26 2009
@@ -31,7 +31,7 @@
su root -c make install'
passed=0
-total=25
+total=21
echo == sign/verify 180938 file
cp configure a
/usr/bin/netpgp --sign a
@@ -82,14 +82,6 @@
diff a a3 passed=$(expr $passed + 1)
echo == list keys
/usr/bin/netpgpkeys --list-keys passed=$(expr $passed + 1)
-echo == null file to verify
-/usr/bin/netpgp --verify || passed=$(expr $passed + 1)
-echo == null file to sign
-/usr/bin/netpgp --sign || passed=$(expr $passed + 1)
-echo == null file to encrypt
-/usr/bin/netpgp --encrypt || passed=$(expr $passed + 1)
-echo == null file to decrypt
-/usr/bin/netpgp --decrypt || passed=$(expr $passed + 1)
echo == version information
/usr/bin/netpgpverify --version
echo == find specific key information
Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.34 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.35
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.34 Tue Dec 22 06:03:24 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Tue Dec 22 06:53:26 2009
@@ -34,7 +34,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: netpgp.c,v 1.34 2009/12/22 06:03:24 agc Exp $);
+__RCSID($NetBSD: netpgp.c,v 1.35 2009/12/22 06:53:26 agc Exp $);
#endif
#include sys/types.h
@@ -1103,3 +1103,57 @@
return 1;
}
+#if 0
+#include sshkey.h
+
+int
+netpgp_pgpkey_to_sshkey(netpgp_t *netpgp, char *name, SSHKey *sshkey)
+{
+ const __ops_key_t *pgpkey;
+ unsigned k;
+
+ k = 0;
+ pgpkey = __ops_getnextkeybyname(netpgp-io, netpgp-pubring, name, k);
+ if (pgpkey == NULL) {
+ pgpkey = __ops_getkeybyname(io, netpgp-pubring, userid);
+ }
+ if (pgpkey == NULL) {
+ (void) fprintf(stderr, No key matching '%s'\n, name);
+ return 0;
+ }
+ switch(pgpkey-key.pubkey.alg) {
+ case OPS_PKA_RSA:
+ sshkey-type = KEY_RSA;
+ sshkey-rsa = calloc(1, sizeof(*sshkey-rsa);
+ if (sshkey-rsa == NULL) {
+ (void) fprintf(stderr, RSA memory problems\n);
+ return 0;
+ }
+ sshkey-rsa-n = pgpkey-key.pubkey.key.rsa.n;
+ sshkey-rsa-e = pgpkey-key.pubkey.key.rsa.e;
+ sshkey-rsa-d = pgpkey-key.seckey.key.rsa.d;
+ sshkey-rsa-p = pgpkey-key.seckey.key.rsa.p;
+ sshkey-rsa-q = pgpkey-key.seckey.key.rsa.q;
+ sshkey-rsa-iqmp = pgpkey-key.seckey.key.rsa.u;
+ break;
+ case OPS_PKA_DSA:
+ sshkey-type = KEY_DSA;
+ sshkey-dsa = calloc(1, sizeof(*sshkey-dsa);
+ if (sshkey-dsa == NULL) {
+ (void) fprintf(stderr, DSA memory problems\n);
+ return 0;
+ }
+ sshkey-rsa-n = pgpkey-key.pubkey.key.rsa.n;
+ key-dsa-p = pgpkey-key.pubkey.key.dsa.p;
+ key-dsa-q = pgpkey-key.pubkey.key.dsa.q;
+ key-dsa-g = pgpkey-key.pubkey.key.dsa.g;
+ key-dsa-pub_key = pgpkey-key.pubkey.key.dsa.y;
+ key-dsa-priv_key = pgpkey-key.seckey.key.dsa.x;
+ break;
+ default:
+ (void) fprintf(stderr, weird type\n);
+ return 0;
+ }
+ return 1;
+}
+#endif
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src
Committed By: agc
Date: Tue Dec 22 06:55:03 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c
Log Message:
Remove a code excerpt which is not ready for primetime just yet
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.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/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.35 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.36
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.35 Tue Dec 22 06:53:26 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Tue Dec 22 06:55:03 2009
@@ -34,7 +34,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: netpgp.c,v 1.35 2009/12/22 06:53:26 agc Exp $);
+__RCSID($NetBSD: netpgp.c,v 1.36 2009/12/22 06:55:03 agc Exp $);
#endif
#include sys/types.h
@@ -1103,57 +1103,3 @@
return 1;
}
-#if 0
-#include sshkey.h
-
-int
-netpgp_pgpkey_to_sshkey(netpgp_t *netpgp, char *name, SSHKey *sshkey)
-{
- const __ops_key_t *pgpkey;
- unsigned k;
-
- k = 0;
- pgpkey = __ops_getnextkeybyname(netpgp-io, netpgp-pubring, name, k);
- if (pgpkey == NULL) {
- pgpkey = __ops_getkeybyname(io, netpgp-pubring, userid);
- }
- if (pgpkey == NULL) {
- (void) fprintf(stderr, No key matching '%s'\n, name);
- return 0;
- }
- switch(pgpkey-key.pubkey.alg) {
- case OPS_PKA_RSA:
- sshkey-type = KEY_RSA;
- sshkey-rsa = calloc(1, sizeof(*sshkey-rsa);
- if (sshkey-rsa == NULL) {
- (void) fprintf(stderr, RSA memory problems\n);
- return 0;
- }
- sshkey-rsa-n = pgpkey-key.pubkey.key.rsa.n;
- sshkey-rsa-e = pgpkey-key.pubkey.key.rsa.e;
- sshkey-rsa-d = pgpkey-key.seckey.key.rsa.d;
- sshkey-rsa-p = pgpkey-key.seckey.key.rsa.p;
- sshkey-rsa-q = pgpkey-key.seckey.key.rsa.q;
- sshkey-rsa-iqmp = pgpkey-key.seckey.key.rsa.u;
- break;
- case OPS_PKA_DSA:
- sshkey-type = KEY_DSA;
- sshkey-dsa = calloc(1, sizeof(*sshkey-dsa);
- if (sshkey-dsa == NULL) {
- (void) fprintf(stderr, DSA memory problems\n);
- return 0;
- }
- sshkey-rsa-n = pgpkey-key.pubkey.key.rsa.n;
- key-dsa-p = pgpkey-key.pubkey.key.dsa.p;
- key-dsa-q = pgpkey-key.pubkey.key.dsa.q;
- key-dsa-g = pgpkey-key.pubkey.key.dsa.g;
- key-dsa-pub_key = pgpkey-key.pubkey.key.dsa.y;
- key-dsa-priv_key = pgpkey-key.seckey.key.dsa.x;
- break;
- default:
- (void) fprintf(stderr, weird type\n);
- return 0;
- }
- return 1;
-}
-#endif
CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src
Committed By: agc
Date: Tue Dec 22 07:09:39 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist: tst
Log Message:
Add tests for memory encryption and decryption, and signing and verification
(by pipes).
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/netpgp/dist/tst
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/tst
diff -u src/crypto/external/bsd/netpgp/dist/tst:1.17 src/crypto/external/bsd/netpgp/dist/tst:1.18
--- src/crypto/external/bsd/netpgp/dist/tst:1.17 Tue Dec 22 06:53:26 2009
+++ src/crypto/external/bsd/netpgp/dist/tst Tue Dec 22 07:09:39 2009
@@ -31,7 +31,7 @@
su root -c make install'
passed=0
-total=21
+total=23
echo == sign/verify 180938 file
cp configure a
/usr/bin/netpgp --sign a
@@ -103,5 +103,11 @@
sudo /usr/bin/netpgp --ssh-keys --sshkeyfile=/etc/ssh/ssh_host_rsa_key.pub --sign a
sudo chmod 644 a.gpg
/usr/bin/netpgp --verify --ssh-keys --sshkeyfile=/etc/ssh/ssh_host_rsa_key.pub a.gpg passed=$(expr $passed + 1)
-rm -f a a.gpg b b.gpg c c.gpg d d.gpg e f f.sig g g.asc a2 a3
+echo == pipeline and memory encrypt/decrypt
+/usr/bin/netpgp --encrypt a | /usr/bin/netpgp --decrypt a4
+diff a a4 passed=$(expr $passed + 1)
+echo == pipeline and memory sign/verify
+/usr/bin/netpgp --sign a | /usr/bin/netpgp --cat a5
+diff a a5 passed=$(expr $passed + 1)
+rm -f a a.gpg b b.gpg c c.gpg d d.gpg e f f.sig g g.asc a2 a3 a4 a5
echo Passed ${passed}/${total} tests
