Re: CVS commit: src/lib/libperfuse
Hi Christos, I think that didn't quite work the tree from this morning gives me this: lcc1: warnings being treated as errors /fs/raid1a/src/NetBSD/cur/src/lib/libperfuse/ops.c: In function 'perfuse_node_read': /fs/raid1a/src/NetBSD/cur/src/lib/libperfuse/ops.c:2838:22: error: comparison between signed and unsigned integer expressions /fs/raid1a/src/NetBSD/cur/src/lib/libperfuse/ops.c: In function 'perfuse_node_write': /fs/raid1a/src/NetBSD/cur/src/lib/libperfuse/ops.c:2945:22: error: comparison between signed and unsigned integer expressions Frank On 09/10/11 00:51, Christos Zoulas wrote: Module Name:src Committed By: christos Date: Fri Sep 9 22:51:44 UTC 2011 Modified Files: src/lib/libperfuse: ops.c perfuse.c Log Message: make this build on amd64 and remove redundant and unused code. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/lib/libperfuse/ops.c cvs rdiff -u -r1.19 -r1.20 src/lib/libperfuse/perfuse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/lib/libperfuse
On Sep 10, 8:31am, kar...@netbsd.org (Frank Kardel) wrote: -- Subject: Re: CVS commit: src/lib/libperfuse | Hi Christos, | | I think that didn't quite work the tree from this morning gives me this: | lcc1: warnings being treated as errors | /fs/raid1a/src/NetBSD/cur/src/lib/libperfuse/ops.c: In function | 'perfuse_node_read': | /fs/raid1a/src/NetBSD/cur/src/lib/libperfuse/ops.c:2838:22: error: | comparison between signed and unsigned integer expressions | /fs/raid1a/src/NetBSD/cur/src/lib/libperfuse/ops.c: In function | 'perfuse_node_write': | /fs/raid1a/src/NetBSD/cur/src/lib/libperfuse/ops.c:2945:22: error: | comparison between signed and unsigned integer expressions Older compiler, sorry. Tron fixed it in the meantime though. christos
CVS commit: src/sys/modules
Module Name:src
Committed By: mbalmer
Date: Sat Sep 10 08:27:07 UTC 2011
Modified Files:
src/sys/modules: Makefile.inc
Log Message:
Include sysctl descriptions when building modules.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/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/sys/modules/Makefile.inc
diff -u src/sys/modules/Makefile.inc:1.4 src/sys/modules/Makefile.inc:1.5
--- src/sys/modules/Makefile.inc:1.4 Sun Aug 28 15:40:50 2011
+++ src/sys/modules/Makefile.inc Sat Sep 10 08:27:06 2011
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.4 2011/08/28 15:40:50 jmcneill Exp $
+# $NetBSD: Makefile.inc,v 1.5 2011/09/10 08:27:06 mbalmer Exp $
S!= cd ${.PARSEDIR}/..;pwd
-CPPFLAGS+= -I${NETBSDSRCDIR}/common/include
+CPPFLAGS+= -I${NETBSDSRCDIR}/common/include -DSYSCTL_INCLUDE_DESCR
USE_FORT= no
WARNS?= 3
CVS commit: src/lib/libperfuse
Module Name:src
Committed By: tron
Date: Sat Sep 10 10:06:10 UTC 2011
Modified Files:
src/lib/libperfuse: ops.c
Log Message:
Avoid comparison between signed and unsigned integer expressions by
casting the offset to a unsigned type. This fixes the NetBSD/i386
and hopefully the NetBSD/amd64 build.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/lib/libperfuse/ops.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/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.41 src/lib/libperfuse/ops.c:1.42
--- src/lib/libperfuse/ops.c:1.41 Fri Sep 9 22:51:44 2011
+++ src/lib/libperfuse/ops.c Sat Sep 10 10:06:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.41 2011/09/09 22:51:44 christos Exp $ */
+/* $NetBSD: ops.c,v 1.42 2011/09/10 10:06:10 tron Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -2835,7 +2835,7 @@
vap = puffs_pn_getvap((struct puffs_node *)opc);
pm = NULL;
- if (offset + *resid vap-va_size)
+ if ((u_quad_t)offset + *resid vap-va_size)
DWARNX(%s %p read %lld@%zu beyond EOF % PRIu64 \n,
__func__, (void *)opc, (long long)offset,
*resid, vap-va_size);
@@ -2942,7 +2942,7 @@
/*
* Serialize size access, see comment in perfuse_node_setattr().
*/
- if (offset + *resid vap-va_size) {
+ if ((u_quad_t)offset + *resid vap-va_size) {
while (pnd-pnd_flags PND_INRESIZE)
requeue_request(pu, opc, PCQ_RESIZE);
pnd-pnd_flags |= PND_INRESIZE;
CVS commit: src/sys/arch/usermode/usermode
Module Name:src Committed By: reinoud Date: Sat Sep 10 10:29:39 UTC 2011 Modified Files: src/sys/arch/usermode/usermode: trap.c Log Message: The illegal instruction handler can exist on the usermodes stack and the stackframe will disappear when its switched back. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/usermode/usermode/trap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/usermode/usermode/trap.c diff -u src/sys/arch/usermode/usermode/trap.c:1.38 src/sys/arch/usermode/usermode/trap.c:1.39 --- src/sys/arch/usermode/usermode/trap.c:1.38 Fri Sep 9 12:21:57 2011 +++ src/sys/arch/usermode/usermode/trap.c Sat Sep 10 10:29:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.38 2011/09/09 12:21:57 reinoud Exp $ */ +/* $NetBSD: trap.c,v 1.39 2011/09/10 10:29:39 reinoud Exp $ */ /*- * Copyright (c) 2011 Reinoud Zandijk rein...@netbsd.org @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.38 2011/09/09 12:21:57 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.39 2011/09/10 10:29:39 reinoud Exp $); #include sys/types.h #include sys/param.h @@ -89,7 +89,7 @@ if (thunk_sigaction(SIGBUS, sa, NULL) == -1) panic(couldn't register SIGBUS handler : %d, thunk_geterrno()); - sa.sa_flags = SA_RESTART | SA_SIGINFO | SA_ONSTACK; + sa.sa_flags = SA_RESTART | SA_SIGINFO; sa.sa_sigaction = illegal_instruction_handler; thunk_sigemptyset(sa.sa_mask); thunk_sigaddset(sa.sa_mask, SIGALRM);
CVS commit: src/sys/arch/usermode/dev
Module Name:src
Committed By: reinoud
Date: Sat Sep 10 10:37:06 UTC 2011
Modified Files:
src/sys/arch/usermode/dev: cpu.c
Log Message:
Make cpu_lwp_trampo only jump once and make successive jumps go to the func
only
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/usermode/dev/cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/usermode/dev/cpu.c
diff -u src/sys/arch/usermode/dev/cpu.c:1.44 src/sys/arch/usermode/dev/cpu.c:1.45
--- src/sys/arch/usermode/dev/cpu.c:1.44 Fri Sep 9 20:14:33 2011
+++ src/sys/arch/usermode/dev/cpu.c Sat Sep 10 10:37:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.44 2011/09/09 20:14:33 reinoud Exp $ */
+/* $NetBSD: cpu.c,v 1.45 2011/09/10 10:37:06 reinoud Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -30,7 +30,7 @@
#include opt_hz.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.44 2011/09/09 20:14:33 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.45 2011/09/10 10:37:06 reinoud Exp $);
#include sys/param.h
#include sys/conf.h
@@ -187,15 +187,16 @@
#endif /* !CPU_DEBUG */
ci-ci_stash = oldlwp;
- curlwp = newlwp;
if (oldpcb) {
oldpcb-pcb_errno = thunk_geterrno();
thunk_seterrno(newpcb-pcb_errno);
+ curlwp = newlwp;
if (thunk_swapcontext(oldpcb-pcb_ucp, newpcb-pcb_ucp))
panic(swapcontext failed);
} else {
thunk_seterrno(newpcb-pcb_errno);
+ curlwp = newlwp;
if (thunk_setcontext(newpcb-pcb_ucp))
panic(setcontext failed);
}
@@ -273,6 +274,11 @@
free(pcb-pcb_ucp.uc_stack.ss_sp, M_TEMP);
pcb-pcb_ucp.uc_stack.ss_sp = NULL;
pcb-pcb_ucp.uc_stack.ss_size = 0;
+
+ free(pcb-pcb_syscall_ucp.uc_stack.ss_sp, M_TEMP);
+ pcb-pcb_syscall_ucp.uc_stack.ss_sp = NULL;
+ pcb-pcb_syscall_ucp.uc_stack.ss_size = 0;
+
pcb-pcb_needfree = false;
}
}
@@ -286,11 +292,9 @@
/* init lwp */
lwp_startup(curcpu()-ci_stash, curlwp);
- /* adjust context so the next switch bypasses the trampoline */
+ /* actual jump */
thunk_makecontext(ucp, (void (*)(void)) func, 1, arg, NULL, NULL);
-
- /* issue for the 1st time */
- func(arg);
+ thunk_setcontext(ucp);
}
void
@@ -299,6 +303,7 @@
{
struct pcb *pcb1 = lwp_getpcb(l1);
struct pcb *pcb2 = lwp_getpcb(l2);
+ void *stack_ucp, *stack_syscall_ucp;
#ifdef CPU_DEBUG
printf(cpu_lwp_fork [%s/%p] - [%s/%p] stack=%p stacksize=%d\n,
@@ -307,32 +312,34 @@
stack, (int)stacksize);
#endif
+ if (stack)
+ panic(%s: stack passed, can't handle\n, __func__);
+
/* copy the PCB and its switchframes from parent */
memcpy(pcb2, pcb1, sizeof(struct pcb));
- /* XXXJDM */
- if (stack == NULL) {
- stack = malloc(PAGE_SIZE, M_TEMP, M_NOWAIT);
- stacksize = PAGE_SIZE;
- pcb2-pcb_needfree = true;
- } else
- pcb2-pcb_needfree = false;
+ stacksize = PAGE_SIZE;
+ stack_ucp = malloc(PAGE_SIZE, M_TEMP, M_NOWAIT);
+ stack_syscall_ucp = malloc(PAGE_SIZE, M_TEMP, M_NOWAIT);
+ pcb2-pcb_needfree = true;
if (thunk_getcontext(pcb2-pcb_ucp))
panic(getcontext failed);
/* set up the ucontext for the userland switch */
- pcb2-pcb_ucp.uc_stack.ss_sp = stack;
+ pcb2-pcb_ucp.uc_stack.ss_sp = stack_ucp;
pcb2-pcb_ucp.uc_stack.ss_size = stacksize;
pcb2-pcb_ucp.uc_link = pcb2-pcb_userland_ucp;
pcb2-pcb_ucp.uc_flags = _UC_STACK | _UC_CPU;
- thunk_makecontext(pcb2-pcb_ucp, (void (*)(void)) cpu_lwp_trampoline,
+ thunk_makecontext(pcb2-pcb_ucp,
+ (void (*)(void)) cpu_lwp_trampoline,
3, pcb2-pcb_ucp, func, arg);
/* set up the ucontext for the syscall */
+ pcb2-pcb_syscall_ucp.uc_stack.ss_sp = stack_syscall_ucp;
+ pcb2-pcb_syscall_ucp.uc_stack.ss_size = stacksize;
pcb2-pcb_syscall_ucp.uc_flags = _UC_CPU;
pcb2-pcb_syscall_ucp.uc_link = pcb2-pcb_userland_ucp;
- pcb2-pcb_syscall_ucp.uc_stack.ss_size = 0; /* no stack move */
thunk_makecontext(pcb2-pcb_syscall_ucp, (void (*)(void)) syscall,
0, NULL, NULL, NULL);
}
@@ -366,7 +373,6 @@
/* init trapframe (going nowhere!), maybe a panic func? */
memcpy(lwp0pcb.pcb_userland_ucp, lwp0pcb.pcb_ucp, sizeof(ucontext_t));
memcpy(lwp0pcb.pcb_syscall_ucp, lwp0pcb.pcb_ucp, sizeof(ucontext_t));
-// thunk_makecontext_trapframe2go(lwp0pcb.pcb_userland_ucp, NULL, NULL);
}
void
CVS commit: src/doc
Module Name:src Committed By: tron Date: Sat Sep 10 11:44:34 UTC 2011 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Postfix has been been updated to version 2.8.5. To generate a diff of this commit: cvs rdiff -u -r1.865 -r1.866 src/doc/3RDPARTY cvs rdiff -u -r1.1600 -r1.1601 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.865 src/doc/3RDPARTY:1.866 --- src/doc/3RDPARTY:1.865 Wed Sep 7 17:55:12 2011 +++ src/doc/3RDPARTY Sat Sep 10 11:44:34 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.865 2011/09/07 17:55:12 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.866 2011/09/10 11:44:34 tron Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -901,8 +901,8 @@ and more. Package: postfix -Version: 2.8.4 -Current Vers: 2.8.4 +Version: 2.8.5 +Current Vers: 2.8.5 Maintainer: Wietse Venema wie...@porcupine.org Archive Site: ftp://postfix.cloud9.net/official/ Home Page: http://www.postfix.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1600 src/doc/CHANGES:1.1601 --- src/doc/CHANGES:1.1600 Wed Sep 7 17:55:12 2011 +++ src/doc/CHANGES Sat Sep 10 11:44:34 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1600 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1601 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1112,3 +1112,4 @@ libc: Apply tzcode2011i [christos 20110904] zoneinfo: Import tzdata2011i. [christos 20110904] openssh: Import 5.9. [christos 20110907] + postfix(1): Import version 2.8.5 [tron 20110910]
CVS commit: src/share/mk
Module Name:src
Committed By: apb
Date: Sat Sep 10 16:57:36 UTC 2011
Modified Files:
src/share/mk: bsd.README bsd.dep.mk bsd.files.mk bsd.hostlib.mk
bsd.hostprog.mk bsd.info.mk bsd.kmodule.mk bsd.lib.mk bsd.man.mk
bsd.nls.mk bsd.prog.mk bsd.rpc.mk bsd.test.mk bsd.x11.mk
Added Files:
src/share/mk: bsd.clean.mk
Log Message:
Move all clean and cleandir processing to a new bsd.clean.mk
file, as proposed in tech-toolchain.
To generate a diff of this commit:
cvs rdiff -u -r1.285 -r1.286 src/share/mk/bsd.README
cvs rdiff -u -r0 -r1.1 src/share/mk/bsd.clean.mk
cvs rdiff -u -r1.72 -r1.73 src/share/mk/bsd.dep.mk
cvs rdiff -u -r1.41 -r1.42 src/share/mk/bsd.files.mk
cvs rdiff -u -r1.15 -r1.16 src/share/mk/bsd.hostlib.mk
cvs rdiff -u -r1.63 -r1.64 src/share/mk/bsd.hostprog.mk
cvs rdiff -u -r1.39 -r1.40 src/share/mk/bsd.info.mk
cvs rdiff -u -r1.31 -r1.32 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.315 -r1.316 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.108 -r1.109 src/share/mk/bsd.man.mk
cvs rdiff -u -r1.46 -r1.47 src/share/mk/bsd.nls.mk
cvs rdiff -u -r1.266 -r1.267 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.11 -r1.12 src/share/mk/bsd.rpc.mk
cvs rdiff -u -r1.18 -r1.19 src/share/mk/bsd.test.mk
cvs rdiff -u -r1.102 -r1.103 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.285 src/share/mk/bsd.README:1.286
--- src/share/mk/bsd.README:1.285 Fri Sep 9 10:08:14 2011
+++ src/share/mk/bsd.README Sat Sep 10 16:57:35 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.285 2011/09/09 10:08:14 apb Exp $
+# $NetBSD: bsd.README,v 1.286 2011/09/10 16:57:35 apb Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make include files for the NetBSD
@@ -809,6 +809,33 @@
they use the same default owners etc. as the rest of the tree.
+=-=-=-=-= bsd.clean.mk =-=-=-=-=
+
+The include file bsd.clean.mk defines the clean and cleandir
+targets. It uses the following variables:
+
+CLEANFILES Files to remove for both the clean and cleandir targets.
+
+CLEANDIRFILES Files to remove for the cleandir target, but not for
+ the clean target.
+
+If ${.OBJDIR} and ${.CURDIR} are different, then the clean and cleandir
+targets will delete files from both those directories. Deleting files
+from ${.OBJDIR} is the traditional behaviour. Deleting files from
+${.CURDIR} is intended to remove output files that had been left in
+the source directory by an earlier build that had used ${.OBJDIR} ==
+${.CURDIR}.
+
+To use the clean and cleandir targets defined in bsd.clean.mk, other
+Makefiles or bsd.*.mk files should append file names to the CLEANFILES
+or CLEANDIRFILES variables. For example:
+
+ CLEANFILES+= a.out
+ CLEANDIRFILES+= .depend
+
+ .include bsd.clean.mk
+
+
=-=-=-=-= bsd.dep.mk =-=-=-=-=
The include file bsd.dep.mk contains the default targets for building
@@ -1253,6 +1280,8 @@
BINMODE Binary mode.
+CLEANDIRFILES Additional files to remove for the cleandir target.
+
CLEANFILES Additional files to remove for the clean and cleandir targets.
COPTS Additional flags to the compiler when creating C objects.
@@ -1648,8 +1677,6 @@
If ${MAN} or ${PROG} is set and ${MKMAN} != no,
these rules convert from X11's manual page source
into an mdoc.old source file.
- cleanx11man:
- Clean up the mdoc.old files generated by the above.
It sets the following variables:
Index: src/share/mk/bsd.dep.mk
diff -u src/share/mk/bsd.dep.mk:1.72 src/share/mk/bsd.dep.mk:1.73
--- src/share/mk/bsd.dep.mk:1.72 Sun Apr 10 16:52:36 2011
+++ src/share/mk/bsd.dep.mk Sat Sep 10 16:57:35 2011
@@ -1,7 +1,6 @@
-# $NetBSD: bsd.dep.mk,v 1.72 2011/04/10 16:52:36 joerg Exp $
+# $NetBSD: bsd.dep.mk,v 1.73 2011/09/10 16:57:35 apb Exp $
# Basic targets
-cleandir: cleandepend
realdepend: beforedepend .depend afterdepend
.ORDER: beforedepend .depend afterdepend
@@ -62,9 +61,8 @@
.endif # defined(SRCS) # }
# Clean rules
-cleandepend: .PHONY
.if defined(SRCS)
- rm -f .depend ${__DPSRCS.d} ${.CURDIR}/tags ${CLEANDEPEND}
+CLEANDIRFILES+= .depend ${__DPSRCS.d} ${.CURDIR}/tags ${CLEANDEPEND}
.endif
# Custom rules
@@ -75,3 +73,6 @@
${TOOL_SED} s;\${.CURDIR}/;; tags
.endif
.endif
+
+# Pull in related .mk logic
+.include bsd.clean.mk
Index: src/share/mk/bsd.files.mk
diff -u src/share/mk/bsd.files.mk:1.41 src/share/mk/bsd.files.mk:1.42
--- src/share/mk/bsd.files.mk:1.41 Wed Feb 3 15:34:44 2010
+++ src/share/mk/bsd.files.mk Sat Sep 10 16:57:35 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.files.mk,v 1.41 2010/02/03 15:34:44 roy Exp $
+# $NetBSD: bsd.files.mk,v 1.42 2011/09/10 16:57:35 apb Exp $
.if !defined(_BSD_FILES_MK_)
_BSD_FILES_MK_=1
@@ -118,9 +118,7 @@
realall: ${BUILDSYMLINKS.t}
-cleandir: cleanbuildsymlinks
-cleanbuildsymlinks: .PHONY
- rm -f
CVS commit: src/etc/mtree
Module Name:src
Committed By: apb
Date: Sat Sep 10 17:02:46 UTC 2011
Modified Files:
src/etc/mtree: Makefile
Log Message:
Revert previous now that make cleandir uses bsd.clean.mk to clean
both the obj dir and the src dir.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/etc/mtree/Makefile
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/Makefile
diff -u src/etc/mtree/Makefile:1.21 src/etc/mtree/Makefile:1.22
--- src/etc/mtree/Makefile:1.21 Mon Sep 5 09:57:02 2011
+++ src/etc/mtree/Makefile Sat Sep 10 17:02:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2011/09/05 09:57:02 apb Exp $
+# $NetBSD: Makefile,v 1.22 2011/09/10 17:02:46 apb Exp $
.include bsd.own.mk
@@ -26,13 +26,12 @@
EXTRA_DIST_FILES+= ${.CURDIR}/NetBSD.dist.extsrc
.endif
-NetBSD.dist.tmp= ${.OBJDIR}/NetBSD.dist.tmp
-NetBSD.dist: ${NetBSD.dist.tmp}
- cmp -s ${NetBSD.dist.tmp} ${.TARGET} || { \
+NetBSD.dist: NetBSD.dist.tmp
+ cmp -s NetBSD.dist.tmp NetBSD.dist || { \
echo Updating NetBSD.dist; \
- mv ${NetBSD.dist.tmp} ${.TARGET}; \
+ mv NetBSD.dist.tmp NetBSD.dist; \
}
-${NetBSD.dist.tmp}::
+NetBSD.dist.tmp::
${TOOL_CAT} ${.CURDIR}/NetBSD.dist.base ${EXTRA_DIST_FILES} \
${.TARGET}
@@ -72,6 +71,6 @@
.endif # MKUNPRIVED # }
.endif # DISTRIBUTION_DONE # }
-CLEANFILES+= NetBSD.dist ${NetBSD.dist.tmp}
+CLEANFILES+= NetBSD.dist NetBSD.dist.tmp
.include bsd.prog.mk
CVS commit: src/usr.bin/fstat
Module Name:src
Committed By: christos
Date: Sat Sep 10 18:34:40 UTC 2011
Modified Files:
src/usr.bin/fstat: misc.c
Log Message:
add all the possible fileops here, and if there is one we know about
print that instead of the passed name.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/fstat/misc.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.bin/fstat/misc.c
diff -u src/usr.bin/fstat/misc.c:1.7 src/usr.bin/fstat/misc.c:1.8
--- src/usr.bin/fstat/misc.c:1.7 Mon Jul 13 17:44:32 2009
+++ src/usr.bin/fstat/misc.c Sat Sep 10 14:34:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.7 2009/07/13 21:44:32 christos Exp $ */
+/* $NetBSD: misc.c,v 1.8 2011/09/10 18:34:40 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: misc.c,v 1.7 2009/07/13 21:44:32 christos Exp $);
+__RCSID($NetBSD: misc.c,v 1.8 2011/09/10 18:34:40 christos Exp $);
#define _KMEMUSER
#include stdbool.h
@@ -59,23 +59,41 @@
#include fstat.h
static struct nlist nl[] = {
-#define NL_KQUEUE 0
+#define NL_BPF 0
+{ .n_name = bpf_fileops, },
+#define NL_CRYPTO 1
+{ .n_name = cryptofops },
+#define NL_DMIO 2
+{ .n_name = dmio_fileops, },
+#define NL_DRVCTL 3
+{ .n_name = drvctl_fileops, },
+#define NL_DTV_DEMUX 4
+{ .n_name = dtv_demux_fileops, },
+#define NL_FILEMON 5
+{ .n_name = filemon_fileops, },
+#define NL_KQUEUE 6
{ .n_name = kqueueops },
-#define NL_MQUEUE 1
+#define NL_MQUEUE 7
{ .n_name = mqops },
-#define NL_PIPE 2
+#define NL_PIPE 8
{ .n_name = pipeops },
-#define NL_SOCKET 3
+#define NL_PUTTER 9
+{ .n_name = putter_fileops, },
+#define NL_SEM 10
+{ .n_name = semops, },
+#define NL_SOCKET 11
{ .n_name = socketops },
-#define NL_VNOPS 4
-{ .n_name = vnops },
-#define NL_CRYPTO 5
-{ .n_name = cryptofops },
-#define NL_BPF 6
-{ .n_name = bpf_fileops, },
-#define NL_TAP 7
+#define NL_SVR4_NET 12
+{ .n_name = svr4_netops },
+#define NL_SVR4_32_NET 13
+{ .n_name = svr4_32_netops },
+#define NL_TAP 14
{ .n_name = tap_fileops, },
-#define NL_MAX 8
+#define NL_VNOPS 15
+{ .n_name = vnops },
+#define NL_XENEVT 16
+{ .n_name = xenevt_fileops },
+#define NL_MAX 17
{ .n_name = NULL }
};
@@ -166,8 +184,11 @@
case NL_CRYPTO:
printf(* crypto %p\n, f-f_data);
return 0;
- default:
+ case NL_MAX:
printf(* %s %p\n, name, f-f_data);
return 0;
+ default:
+ printf(* %s %p\n, nl[i].n_name, f-f_data);
+ return 0;
}
}
CVS commit: src/usr.bin/fstat
Module Name:src
Committed By: christos
Date: Sat Sep 10 18:34:54 UTC 2011
Modified Files:
src/usr.bin/fstat: Makefile
Log Message:
add libutil.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/fstat/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/fstat/Makefile
diff -u src/usr.bin/fstat/Makefile:1.22 src/usr.bin/fstat/Makefile:1.23
--- src/usr.bin/fstat/Makefile:1.22 Tue Apr 14 18:15:20 2009
+++ src/usr.bin/fstat/Makefile Sat Sep 10 14:34:54 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/04/14 22:15:20 lukem Exp $
+# $NetBSD: Makefile,v 1.23 2011/09/10 18:34:54 christos Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
.include bsd.own.mk
@@ -17,4 +17,7 @@
CPPFLAGS+=-DINET6
.endif
+LDADD+=-lutil
+DPADD+=${LIBUTIL}
+
.include bsd.prog.mk
CVS commit: src/usr.bin/fstat
Module Name:src
Committed By: christos
Date: Sat Sep 10 18:35:28 UTC 2011
Modified Files:
src/usr.bin/fstat: fstat.c
Log Message:
- remove bogus casts
- print recycled vnode flags
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/usr.bin/fstat/fstat.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.bin/fstat/fstat.c
diff -u src/usr.bin/fstat/fstat.c:1.91 src/usr.bin/fstat/fstat.c:1.92
--- src/usr.bin/fstat/fstat.c:1.91 Sat Sep 3 09:24:19 2011
+++ src/usr.bin/fstat/fstat.c Sat Sep 10 14:35:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fstat.c,v 1.91 2011/09/03 13:24:19 christos Exp $ */
+/* $NetBSD: fstat.c,v 1.92 2011/09/10 18:35:28 christos Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)fstat.c 8.3 (Berkeley) 5/2/95;
#else
-__RCSID($NetBSD: fstat.c,v 1.91 2011/09/03 13:24:19 christos Exp $);
+__RCSID($NetBSD: fstat.c,v 1.92 2011/09/10 18:35:28 christos Exp $);
#endif
#endif /* not lint */
@@ -106,6 +106,7 @@
#include string.h
#include unistd.h
#include err.h
+#include util.h
#include fstat.h
@@ -358,7 +359,7 @@
* ktrace vnode, if one
*/
if (p-p_tracep)
- ftrans((struct file *)(intptr_t)p-p_tracep, TRACE);
+ ftrans(p-p_tracep, TRACE);
#endif
/*
* open files
@@ -398,15 +399,15 @@
}
switch (file.f_type) {
case DTYPE_VNODE:
- vtrans((struct vnode *)file.f_data, i, file.f_flag);
+ vtrans(file.f_data, i, file.f_flag);
break;
case DTYPE_SOCKET:
if (checkfile == 0)
- socktrans((struct socket *)file.f_data, i);
+ socktrans(file.f_data, i);
break;
case DTYPE_PIPE:
if (checkfile == 0)
- ptrans(file, (struct pipe *)file.f_data, i);
+ ptrans(file, file.f_data, i);
break;
case DTYPE_MISC:
case DTYPE_KQUEUE:
@@ -423,17 +424,22 @@
}
}
+static const char dead[] = dead;
+
static const char *
vfilestat(struct vnode *vp, struct filestat *fsp)
{
const char *badtype = NULL;
- if (vp-v_type == VNON || vp-v_tag == VT_NON)
+ if (vp-v_type == VNON)
badtype = none;
else if (vp-v_type == VBAD)
badtype = bad;
else
switch (vp-v_tag) {
+ case VT_NON:
+ badtype = dead;
+ break;
case VT_UFS:
case VT_LFS:
case VT_MFS:
@@ -502,7 +508,7 @@
int fsmatch = 0;
DEVS *d;
- if (badtype)
+ if (badtype badtype != dead)
return;
for (d = devs; d != NULL; d = d-next)
if (d-fsid == fst.fsid) {
@@ -516,7 +522,13 @@
return;
}
PREFIX(i);
- if (badtype) {
+ if (badtype == dead) {
+ char buf[1024];
+ (void)snprintb(buf, sizeof(buf), VNODE_FLAGBITS,
+ vn.v_iflag | vn.v_vflag | vn.v_uflag);
+ (void)printf( flags %s\n, buf);
+ return;
+ } else if (badtype) {
(void)printf( - - %10s-\n, badtype);
return;
}
CVS commit: src/sys/dev/pckbport
Module Name:src
Committed By: jakllsch
Date: Sat Sep 10 18:38:20 UTC 2011
Modified Files:
src/sys/dev/pckbport: synaptics.c synapticsreg.h synapticsvar.h
Log Message:
Correct and improve some comments. Collect unused variables. Add a define.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pckbport/synaptics.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pckbport/synapticsreg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pckbport/synapticsvar.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/pckbport/synaptics.c
diff -u src/sys/dev/pckbport/synaptics.c:1.27 src/sys/dev/pckbport/synaptics.c:1.28
--- src/sys/dev/pckbport/synaptics.c:1.27 Fri Sep 9 14:29:47 2011
+++ src/sys/dev/pckbport/synaptics.c Sat Sep 10 18:38:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.27 2011/09/09 14:29:47 jakllsch Exp $ */
+/* $NetBSD: synaptics.c,v 1.28 2011/09/10 18:38:20 jakllsch Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
#include opt_pms.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: synaptics.c,v 1.27 2011/09/09 14:29:47 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: synaptics.c,v 1.28 2011/09/10 18:38:20 jakllsch Exp $);
#include sys/param.h
#include sys/systm.h
@@ -93,7 +93,7 @@
static void pms_sysctl_synaptics(struct sysctllog **);
static int pms_sysctl_synaptics_verify(SYSCTLFN_ARGS);
-/* Controled by sysctl. */
+/* Controlled by sysctl. */
static int synaptics_up_down_emul = 2;
static int synaptics_up_down_motion_delta = 1;
static int synaptics_gesture_move = 200;
@@ -136,7 +136,7 @@
{
struct pms_softc *psc = vsc;
struct synaptics_softc *sc = psc-u.synaptics;
- u_char cmd[2], resp[3];
+ u_char cmd[1], resp[3];
int res, ver_minor, ver_major;
struct sysctllog *clog = NULL;
@@ -724,7 +724,7 @@
struct timeval diff;
if (!psc-sc_enabled) {
- /* Interrupts are not expected. Discard the byte. */
+ /* Interrupts are not expected. Discard the byte. */
return;
}
@@ -775,7 +775,7 @@
if ((psc-packet[0] 0xfc) == 0x84
(psc-packet[3] 0xcc) == 0xc4) {
- /* PS/2 passthrough */
+ /* W = SYNAPTICS_WIDTH_PASSTHROUGH, PS/2 passthrough */
pms_synaptics_passthrough(psc);
} else {
pms_synaptics_parse(psc);
Index: src/sys/dev/pckbport/synapticsreg.h
diff -u src/sys/dev/pckbport/synapticsreg.h:1.6 src/sys/dev/pckbport/synapticsreg.h:1.7
--- src/sys/dev/pckbport/synapticsreg.h:1.6 Sun Mar 21 19:53:52 2010
+++ src/sys/dev/pckbport/synapticsreg.h Sat Sep 10 18:38:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: synapticsreg.h,v 1.6 2010/03/21 19:53:52 plunky Exp $ */
+/* $NetBSD: synapticsreg.h,v 1.7 2011/09/10 18:38:20 jakllsch Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -95,6 +95,8 @@
#define SYNAPTICS_WIDTH_TWO_FINGERS 0
#define SYNAPTICS_WIDTH_THREE_OR_MORE 1
#define SYNAPTICS_WIDTH_PEN 2
+#define SYNAPTICS_WIDTH_ADVANCEDGESTURE 2
+#define SYNAPTICS_WIDTH_PASSTHROUGH 3
#define SYNAPTICS_WIDTH_FINGER_MIN 4
#define SYNAPTICS_WIDTH_FINGER_NORMAL 5
#define SYNAPTICS_WIDTH_FINGER_MAX 7
Index: src/sys/dev/pckbport/synapticsvar.h
diff -u src/sys/dev/pckbport/synapticsvar.h:1.4 src/sys/dev/pckbport/synapticsvar.h:1.5
--- src/sys/dev/pckbport/synapticsvar.h:1.4 Sun Dec 11 12:23:22 2005
+++ src/sys/dev/pckbport/synapticsvar.h Sat Sep 10 18:38:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: synapticsvar.h,v 1.4 2005/12/11 12:23:22 christos Exp $ */
+/* $NetBSD: synapticsvar.h,v 1.5 2011/09/10 18:38:20 jakllsch Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -39,14 +39,13 @@
#define _DEV_PCKBCPORT_SYNAPTICSVAR_H_
struct synaptics_softc {
- struct proc *syn_thread;
int caps;
int flags;
#define SYN_FLAG_HAS_MIDDLE_BUTTON (1 0)
#define SYN_FLAG_HAS_BUTTONS_4_5 (1 1)
#define SYN_FLAG_HAS_UP_DOWN_BUTTONS (1 2)
-#define SYN_FLAG_HAS_PASSTHROUGH (1 3) /* Not yet supported */
+#define SYN_FLAG_HAS_PASSTHROUGH (1 3)
#define SYN_FLAG_HAS_PALM_DETECT (1 4)
#define SYN_FLAG_HAS_MULTI_FINGER (1 5)
CVS commit: src/share/mk
Module Name:src Committed By: apb Date: Sat Sep 10 19:25:10 UTC 2011 Modified Files: src/share/mk: bsd.clean.mk Log Message: Don't automatically load .depend files during make clean or make cleandir. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/mk/bsd.clean.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.clean.mk diff -u src/share/mk/bsd.clean.mk:1.1 src/share/mk/bsd.clean.mk:1.2 --- src/share/mk/bsd.clean.mk:1.1 Sat Sep 10 16:57:35 2011 +++ src/share/mk/bsd.clean.mk Sat Sep 10 19:25:10 2011 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.clean.mk,v 1.1 2011/09/10 16:57:35 apb Exp $ +# $NetBSD: bsd.clean.mk,v 1.2 2011/09/10 19:25:10 apb Exp $ # bsd.clean.mk # @@ -57,4 +57,10 @@ fi } .endfor +# Don't automatically load .depend files during make clean +# or make cleandir. +.if make(clean) || make(cleandir) +.MAKE.DEPENDFILE := .depend.no-such-file +.endif + .endif # !defined(_BSD_CLEAN_MK)
CVS commit: src/external/gpl3/binutils/usr.bin/ld
Module Name:src
Committed By: apb
Date: Sat Sep 10 19:26:18 UTC 2011
Modified Files:
src/external/gpl3/binutils/usr.bin/ld: Makefile
Log Message:
Don't include .depend.* files during make clean or make cleandir
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/usr.bin/ld/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/usr.bin/ld/Makefile
diff -u src/external/gpl3/binutils/usr.bin/ld/Makefile:1.9 src/external/gpl3/binutils/usr.bin/ld/Makefile:1.10
--- src/external/gpl3/binutils/usr.bin/ld/Makefile:1.9 Tue Apr 5 10:48:47 2011
+++ src/external/gpl3/binutils/usr.bin/ld/Makefile Sat Sep 10 19:26:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/04/05 10:48:47 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2011/09/10 19:26:18 apb Exp $
.include bsd.own.mk
@@ -51,7 +51,7 @@
${PROG}.info: configdoc.texi bfdver.texi
.for f in ${G_EMULATION_OFILES:S/^e//:R}
-.if exists(.depend.${f})
+.if exists(.depend.${f}) !(make(clean) || make(cleandir))
.include .depend.${f}
.endif
CVS commit: src/sbin/ping
Module Name:src Committed By: christos Date: Sat Sep 10 20:04:28 UTC 2011 Modified Files: src/sbin/ping: ping.8 ping.c Log Message: PR/45257: Instead of passing a 32bit sec and 32 bit usec timestamp in little endian format by default, pass a struct timespec in native host format. Add -C flag to produce a compatible timestamp like before. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sbin/ping/ping.8 cvs rdiff -u -r1.98 -r1.99 src/sbin/ping/ping.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/ping/ping.8 diff -u src/sbin/ping/ping.8:1.47 src/sbin/ping/ping.8:1.48 --- src/sbin/ping/ping.8:1.47 Tue Mar 21 17:54:46 2006 +++ src/sbin/ping/ping.8 Sat Sep 10 16:04:28 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: ping.8,v 1.47 2006/03/21 22:54:46 pavel Exp $ +.\ $NetBSD: ping.8,v 1.48 2011/09/10 20:04:28 christos Exp $ .\ .\ Copyright (c) 1985, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)ping.8 8.2 (Berkeley) 12/11/93 .\ -.Dd March 21, 2006 +.Dd September 10, 2011 .Dt PING 8 .Os .Sh NAME @@ -40,7 +40,7 @@ .Sh SYNOPSIS .Nm .Bk -words -.Op Fl adDfLnoPqQrRv +.Op Fl aCdDfLnoPqQrRv .Ek .Bk -words .Op Fl c Ar count @@ -93,7 +93,7 @@ .Tn ICMP header, followed by a -.Dq struct timeval +.Dq struct timespec and then an arbitrary number of ``pad'' bytes used to fill out the packet. The options are as follows: @@ -108,6 +108,10 @@ .Ar count .Tn ECHO_RESPONSE packets. +.It Fl C +Send timestamps in compat format; two 32 bit words in little endian format, +the first one representing seconds, and the second one representing +microseconds. .It Fl d Set the .Dv SO_DEBUG @@ -322,12 +326,20 @@ .Tn ICMP header). .Pp -If the data space is at least eight bytes large, +If the data space is at least +.Dv sizeof(struct timespec) +(16) large, +.Nm +uses the first +.Dv sizeof(struct timespec) +byres to include a timestamp to compute round trip times. +Otherwise if the data space is at least eight bytes large (or the +.Fl C +flag is specified), .Nm uses the first eight bytes of this space to include a timestamp to compute round trip times. -If less than eight bytes of pad are specified, -no round trip times are given. +If there are not enough bytes of pad no round trip times are given. .Sh DUPLICATE AND DAMAGED PACKETS .Nm will report duplicate and damaged packets. Index: src/sbin/ping/ping.c diff -u src/sbin/ping/ping.c:1.98 src/sbin/ping/ping.c:1.99 --- src/sbin/ping/ping.c:1.98 Sat Aug 27 14:40:18 2011 +++ src/sbin/ping/ping.c Sat Sep 10 16:04:28 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ping.c,v 1.98 2011/08/27 18:40:18 joerg Exp $ */ +/* $NetBSD: ping.c,v 1.99 2011/09/10 20:04:28 christos Exp $ */ /* * Copyright (c) 1989, 1993 @@ -58,7 +58,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: ping.c,v 1.98 2011/08/27 18:40:18 joerg Exp $); +__RCSID($NetBSD: ping.c,v 1.99 2011/09/10 20:04:28 christos Exp $); #endif #include stdio.h @@ -113,6 +113,7 @@ #define F_MCAST 0x2000 /* multicast target */ #define F_MCAST_NOLOOP 0x4000 /* no multicast loopback */ #define F_AUDIBLE 0x8000 /* audible output */ +#define F_TIMING64 0x1 /* 64 bit time, nanoseconds */ #ifdef IPSEC #ifdef IPSEC_POLICY_IPSEC #define F_POLICY 0x1 @@ -151,11 +152,13 @@ static int s; /* Socket file descriptor */ static int sloop;/* Socket file descriptor/loopback */ -#define PHDR_LEN sizeof(struct tv32) /* size of timestamp header */ +#define PHDR_LEN sizeof(struct tv32) /* size of timestamp header */ +#define PHDR64_LEN sizeof(struct timespec) /* size of timestamp header */ static struct sockaddr_in whereto, send_addr; /* Who to ping */ static struct sockaddr_in src_addr; /* from where */ static struct sockaddr_in loc_addr; /* 127.1 */ -static int datalen = 64 - PHDR_LEN; /* How much data */ +static int datalen;/* How much data */ +static int phdrlen; #ifndef __NetBSD__ static char *progname; @@ -187,7 +190,7 @@ static int nreceived;/* # of packets we got back */ static double interval; /* interval between packets */ -static struct timeval interval_tv; +static struct timespec interval_tv; static double tmin = 9.0; static double tmax = 0.0; static double tsum = 0.0; /* sum of all times */ @@ -196,11 +199,11 @@ static int bufspace = IP_MAXPACKET; -static struct timeval now, clear_cache, last_tx, next_tx, first_tx; -static struct timeval last_rx, first_rx; +static struct timespec now, clear_cache, last_tx, next_tx, first_tx; +static struct timespec last_rx, first_rx; static int lastrcvd = 1; /* last ping sent has been received */ -static struct timeval jiggle_time; +static struct timespec jiggle_time; static int jiggle_cnt, total_jiggled, jiggle_direction = -1; __dead static void doit(void); @@ -211,10 +214,12 @@ static void pinger(void); static
CVS commit: src/gnu/dist/gettext
Module Name:src Committed By: apb Date: Sat Sep 10 20:35:43 UTC 2011 Modified Files: src/gnu/dist/gettext/autoconf-lib-link: Makefile.in src/gnu/dist/gettext/gettext-runtime: Makefile.in Log Message: Disable rebuilding files in the source tree. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/gnu/dist/gettext/autoconf-lib-link/Makefile.in cvs rdiff -u -r1.4 -r1.5 src/gnu/dist/gettext/gettext-runtime/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/gnu/dist/gettext/autoconf-lib-link/Makefile.in diff -u src/gnu/dist/gettext/autoconf-lib-link/Makefile.in:1.1.1.1 src/gnu/dist/gettext/autoconf-lib-link/Makefile.in:1.2 --- src/gnu/dist/gettext/autoconf-lib-link/Makefile.in:1.1.1.1 Fri Apr 29 14:56:49 2005 +++ src/gnu/dist/gettext/autoconf-lib-link/Makefile.in Sat Sep 10 20:35:42 2011 @@ -634,6 +634,8 @@ all-local: $(srcdir)/../build-aux/config.rpath $(srcdir)/../build-aux/config.rpath: $(srcdir)/config.rpath + @echo NOT REBUILDING $@ +NetBSD_DISABLED_build-aux_config.rpath: cp $(srcdir)/config.rpath $(srcdir)/../build-aux/config.rpath # The AC_CONFIG_AUX_DIR argument in the tests/rpath*/configure.ac files is Index: src/gnu/dist/gettext/gettext-runtime/Makefile.in diff -u src/gnu/dist/gettext/gettext-runtime/Makefile.in:1.4 src/gnu/dist/gettext/gettext-runtime/Makefile.in:1.5 --- src/gnu/dist/gettext/gettext-runtime/Makefile.in:1.4 Fri Jul 15 07:04:52 2011 +++ src/gnu/dist/gettext/gettext-runtime/Makefile.in Sat Sep 10 20:35:43 2011 @@ -780,6 +780,8 @@ all-local: ABOUT-NLS ABOUT-NLS: $(srcdir)/doc/nls.texi $(srcdir)/doc/matrix.texi + @echo NOT REBUILDING $@ +NetBSD_DISABLED_ABOUT-NLS: rm -f $(srcdir)/ABOUT-NLS \ $(MAKEINFO) --output=$(srcdir)/ABOUT-NLS --no-header \ -I $(srcdir)/doc --no-validate nls.texi
CVS commit: src/sbin/ping
Module Name:src Committed By: wiz Date: Sat Sep 10 20:46:43 UTC 2011 Modified Files: src/sbin/ping: ping.8 ping.c Log Message: Sort options and descriptions in standard order. Remove unecessary Bk/Ek in SYNOPSIS. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sbin/ping/ping.8 cvs rdiff -u -r1.99 -r1.100 src/sbin/ping/ping.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/ping/ping.8 diff -u src/sbin/ping/ping.8:1.48 src/sbin/ping/ping.8:1.49 --- src/sbin/ping/ping.8:1.48 Sat Sep 10 20:04:28 2011 +++ src/sbin/ping/ping.8 Sat Sep 10 20:46:43 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: ping.8,v 1.48 2011/09/10 20:04:28 christos Exp $ +.\ $NetBSD: ping.8,v 1.49 2011/09/10 20:46:43 wiz Exp $ .\ .\ Copyright (c) 1985, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -39,45 +39,19 @@ packets to network hosts .Sh SYNOPSIS .Nm -.Bk -words -.Op Fl aCdDfLnoPqQrRv -.Ek -.Bk -words +.Op Fl aCDdfLnoPQqRrv .Op Fl c Ar count -.Ek -.Bk -words .Op Fl E Ar policy -.Ek -.Bk -words .Op Fl g Ar gateway -.Ek -.Bk -words .Op Fl h Ar host -.Ek -.Bk -words .Op Fl i Ar interval -.Ek -.Bk -words .Op Fl I Ar srcaddr -.Ek -.Bk -words .Op Fl l Ar preload -.Ek -.Bk -words .Op Fl p Ar pattern -.Ek -.Bk -words .Op Fl s Ar packetsize -.Ek -.Bk -words -.Op Fl t Ar tos -.Ek -.Bk -words .Op Fl T Ar ttl -.Ek -.Bk -words +.Op Fl t Ar tos .Op Fl w Ar deadline -.Ek .Ar host .Sh DESCRIPTION .Nm @@ -103,24 +77,24 @@ standard error output) after each non-duplicate response is received. This is disabled for flood pings as it would probably cause temporary insanity. +.It Fl C +Send timestamps in compat format; two 32 bit words in little endian format, +the first one representing seconds, and the second one representing +microseconds. .It Fl c Ar count Stop after sending (and waiting the specified delay to receive) .Ar count .Tn ECHO_RESPONSE packets. -.It Fl C -Send timestamps in compat format; two 32 bit words in little endian format, -the first one representing seconds, and the second one representing -microseconds. -.It Fl d -Set the -.Dv SO_DEBUG -option on the socket being used. .It Fl D Set the .Dv Don't Fragment bit in the IP header. This can be used to determine the path MTU. +.It Fl d +Set the +.Dv SO_DEBUG +option on the socket being used. .It Fl E Ar policy Use IPsec policy specification string .Ar policy @@ -151,6 +125,14 @@ .It Fl g Ar gateway Use Loose Source Routing to send the ECHO_REQUEST packets via .Ar gateway . +.It Fl h Ar host +is an alternate way of specifying the target host instead of as the +last argument. +.It Fl I Ar srcaddr +Set the source IP address to +.Ar srcaddr +which can be a hostname or an IP number. +For multicast datagrams, it also specifies the outgoing interface. .It Fl i Ar interval Wait .Ar interval @@ -158,14 +140,9 @@ .Em between sending each packet . The default is to wait for one second between each packet, except when the -f option is used the wait interval is 0.01 seconds. -.It Fl I Ar srcaddr -Set the source IP address to -.Ar srcaddr -which can be a hostname or an IP number. -For multicast datagrams, it also specifies the outgoing interface. -.It Fl h Ar host -is an alternate way of specifying the target host instead of as the -last argument. +.It Fl L +Disable loopback when sending to multicast destinations, +so the transmitting host doesn't see the ICMP requests. .It Fl l Ar preload If .Ar preload @@ -174,14 +151,15 @@ sends that many packets as fast as possible before falling into its normal mode of behavior. Only the super-user may use this option. -.It Fl L -Disable loopback when sending to multicast destinations, -so the transmitting host doesn't see the ICMP requests. .It Fl n Numeric output only. No attempt will be made to look up symbolic names for host addresses. .It Fl o Exit successfully after receiving one reply packet. +.It Fl P +Use a pseudo-random sequence for the data instead of the default, +fixed sequence of incrementing 8-bit integers. +This is useful to foil compression on PPP and other links. .It Fl p Ar pattern You may specify up to 16 ``pad'' bytes to fill out the packet you send. This is useful for diagnosing data-dependent problems in a network. @@ -189,24 +167,13 @@ .Dq Li \-p ff will cause the sent packet to be filled with all ones. -.It Fl P -Use a pseudo-random sequence for the data instead of the default, -fixed sequence of incrementing 8-bit integers. -This is useful to foil compression on PPP and other links. +.It Fl Q +Do not display responses such as Network Unreachable ICMP messages +concerning the ECHO_REQUESTs sent. .It Fl q Quiet output. Nothing is displayed except the summary lines at startup time and when finished. -.It Fl Q -Do not display responses such as Network Unreachable ICMP messages -concerning the ECHO_REQUESTs sent.
CVS commit: src/sbin/ping
Module Name:src Committed By: wiz Date: Sat Sep 10 20:47:33 UTC 2011 Modified Files: src/sbin/ping: ping.8 Log Message: Another option order fix. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sbin/ping/ping.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/ping/ping.8 diff -u src/sbin/ping/ping.8:1.49 src/sbin/ping/ping.8:1.50 --- src/sbin/ping/ping.8:1.49 Sat Sep 10 20:46:43 2011 +++ src/sbin/ping/ping.8 Sat Sep 10 20:47:33 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: ping.8,v 1.49 2011/09/10 20:46:43 wiz Exp $ +.\ $NetBSD: ping.8,v 1.50 2011/09/10 20:47:33 wiz Exp $ .\ .\ Copyright (c) 1985, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -44,8 +44,8 @@ .Op Fl E Ar policy .Op Fl g Ar gateway .Op Fl h Ar host -.Op Fl i Ar interval .Op Fl I Ar srcaddr +.Op Fl i Ar interval .Op Fl l Ar preload .Op Fl p Ar pattern .Op Fl s Ar packetsize
CVS commit: src/external/bsd/wpa/dist
Module Name:src Committed By: christos Date: Sat Sep 10 20:56:00 UTC 2011 Update of /cvsroot/src/external/bsd/wpa/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12221 Log Message: Import wpa_supplicant and hostapd Status: Vendor Tag: MALINEN Release Tags: v0_7_3 U src/external/bsd/wpa/dist/COPYING U src/external/bsd/wpa/dist/README U src/external/bsd/wpa/dist/patches/openssl-0.9.9-session-ticket.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8g-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8h-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8i-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8e-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8d-tls-extensions.patch U src/external/bsd/wpa/dist/hostapd/config_file.c U src/external/bsd/wpa/dist/hostapd/.gitignore U src/external/bsd/wpa/dist/hostapd/ChangeLog U src/external/bsd/wpa/dist/hostapd/Makefile U src/external/bsd/wpa/dist/hostapd/README U src/external/bsd/wpa/dist/hostapd/README-WPS U src/external/bsd/wpa/dist/hostapd/hlr_auc_gw.milenage_db U src/external/bsd/wpa/dist/hostapd/config_file.h U src/external/bsd/wpa/dist/hostapd/ctrl_iface.c U src/external/bsd/wpa/dist/hostapd/ctrl_iface.h U src/external/bsd/wpa/dist/hostapd/defconfig U src/external/bsd/wpa/dist/hostapd/dump_state.c U src/external/bsd/wpa/dist/hostapd/dump_state.h U src/external/bsd/wpa/dist/hostapd/eap_register.c U src/external/bsd/wpa/dist/hostapd/eap_register.h U src/external/bsd/wpa/dist/hostapd/eap_testing.txt U src/external/bsd/wpa/dist/hostapd/hlr_auc_gw.c U src/external/bsd/wpa/dist/hostapd/hostapd.accept U src/external/bsd/wpa/dist/hostapd/hostapd.8 U src/external/bsd/wpa/dist/hostapd/hostapd.eap_user U src/external/bsd/wpa/dist/hostapd/main.c U src/external/bsd/wpa/dist/hostapd/hostapd.conf U src/external/bsd/wpa/dist/hostapd/hostapd.deny U src/external/bsd/wpa/dist/hostapd/hostapd.radius_clients U src/external/bsd/wpa/dist/hostapd/hostapd.sim_db U src/external/bsd/wpa/dist/hostapd/hostapd.vlan U src/external/bsd/wpa/dist/hostapd/hostapd.wpa_psk U src/external/bsd/wpa/dist/hostapd/hostapd_cli.1 C src/external/bsd/wpa/dist/hostapd/hostapd_cli.c U src/external/bsd/wpa/dist/hostapd/nt_password_hash.c U src/external/bsd/wpa/dist/hostapd/wired.conf U src/external/bsd/wpa/dist/hostapd/logwatch/hostapd.conf U src/external/bsd/wpa/dist/hostapd/logwatch/README U src/external/bsd/wpa/dist/hostapd/logwatch/hostapd U src/external/bsd/wpa/dist/src/Makefile U src/external/bsd/wpa/dist/src/lib.rules U src/external/bsd/wpa/dist/src/ap/drv_callbacks.c C src/external/bsd/wpa/dist/src/ap/wpa_auth.c U src/external/bsd/wpa/dist/src/ap/hostapd.c U src/external/bsd/wpa/dist/src/ap/ieee802_1x.h U src/external/bsd/wpa/dist/src/ap/ieee802_11_auth.h U src/external/bsd/wpa/dist/src/ap/sta_info.c U src/external/bsd/wpa/dist/src/ap/Makefile U src/external/bsd/wpa/dist/src/ap/tkip_countermeasures.c U src/external/bsd/wpa/dist/src/ap/ieee802_11_auth.c U src/external/bsd/wpa/dist/src/ap/hw_features.c U src/external/bsd/wpa/dist/src/ap/wpa_auth_ie.c U src/external/bsd/wpa/dist/src/ap/preauth_auth.c U src/external/bsd/wpa/dist/src/ap/wpa_auth_ie.h U src/external/bsd/wpa/dist/src/ap/vlan_init.c U src/external/bsd/wpa/dist/src/ap/ap_config.c U src/external/bsd/wpa/dist/src/ap/hw_features.h U src/external/bsd/wpa/dist/src/ap/ieee802_1x.c U src/external/bsd/wpa/dist/src/ap/tkip_countermeasures.h U src/external/bsd/wpa/dist/src/ap/ap_config.h U src/external/bsd/wpa/dist/src/ap/sta_info.h U src/external/bsd/wpa/dist/src/ap/pmksa_cache_auth.h U src/external/bsd/wpa/dist/src/ap/ieee802_11_ht.c U src/external/bsd/wpa/dist/src/ap/wpa_auth_i.h U src/external/bsd/wpa/dist/src/ap/iapp.c U src/external/bsd/wpa/dist/src/ap/ieee802_11.c U src/external/bsd/wpa/dist/src/ap/beacon.c U src/external/bsd/wpa/dist/src/ap/wmm.c U src/external/bsd/wpa/dist/src/ap/wpa_auth_ft.c U src/external/bsd/wpa/dist/src/ap/wpa_auth_glue.c U src/external/bsd/wpa/dist/src/ap/ap_drv_ops.h U src/external/bsd/wpa/dist/src/ap/accounting.h U src/external/bsd/wpa/dist/src/ap/wpa_auth.h U src/external/bsd/wpa/dist/src/ap/wmm.h U src/external/bsd/wpa/dist/src/ap/ap_mlme.h U src/external/bsd/wpa/dist/src/ap/ap_mlme.c U src/external/bsd/wpa/dist/src/ap/utils.c U src/external/bsd/wpa/dist/src/ap/ctrl_iface_ap.h U src/external/bsd/wpa/dist/src/ap/ap_list.h U src/external/bsd/wpa/dist/src/ap/accounting.c U src/external/bsd/wpa/dist/src/ap/peerkey_auth.c U src/external/bsd/wpa/dist/src/ap/authsrv.h U src/external/bsd/wpa/dist/src/ap/wps_hostapd.h U src/external/bsd/wpa/dist/src/ap/iapp.h U src/external/bsd/wpa/dist/src/ap/vlan_init.h U src/external/bsd/wpa/dist/src/ap/ap_drv_ops.c U src/external/bsd/wpa/dist/src/ap/pmksa_cache_auth.c U src/external/bsd/wpa/dist/src/ap/wpa_auth_glue.h U src/external/bsd/wpa/dist/src/ap/ctrl_iface_ap.c U
CVS commit: src/external/bsd/wpa/dist
Module Name:src
Committed By: christos
Date: Sat Sep 10 20:59:03 UTC 2011
Modified Files:
src/external/bsd/wpa/dist/hostapd: hostapd_cli.c
src/external/bsd/wpa/dist/src/ap: wpa_auth.c
Log Message:
merge 0.7.3
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/hostapd/hostapd_cli.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/src/ap/wpa_auth.c
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/wpa/dist/hostapd/hostapd_cli.c
diff -u src/external/bsd/wpa/dist/hostapd/hostapd_cli.c:1.2 src/external/bsd/wpa/dist/hostapd/hostapd_cli.c:1.3
--- src/external/bsd/wpa/dist/hostapd/hostapd_cli.c:1.2 Wed Aug 4 13:12:34 2010
+++ src/external/bsd/wpa/dist/hostapd/hostapd_cli.c Sat Sep 10 16:59:03 2011
@@ -94,6 +94,7 @@
#ifdef CONFIG_WPS_OOB
wps_oob type path method use WPS with out-of-band (UFD)\n
#endif /* CONFIG_WPS_OOB */
+ wps_ap_pin cmd [params..] enable/disable AP PIN\n
#endif /* CONFIG_WPS */
help show this usage help\n
interface [ifname] show interfaces/select interface\n
@@ -405,6 +406,27 @@
return wpa_ctrl_command(ctrl, cmd);
}
#endif /* CONFIG_WPS_OOB */
+
+
+static int hostapd_cli_cmd_wps_ap_pin(struct wpa_ctrl *ctrl, int argc,
+ char *argv[])
+{
+ char buf[64];
+ if (argc 1) {
+ printf(Invalid 'wps_ap_pin' command - at least one argument
+ is required.\n);
+ return -1;
+ }
+ if (argc 2)
+ snprintf(buf, sizeof(buf), WPS_AP_PIN %s %s %s,
+ argv[0], argv[1], argv[2]);
+ else if (argc 1)
+ snprintf(buf, sizeof(buf), WPS_AP_PIN %s %s,
+ argv[0], argv[1]);
+ else
+ snprintf(buf, sizeof(buf), WPS_AP_PIN %s, argv[0]);
+ return wpa_ctrl_command(ctrl, buf);
+}
#endif /* CONFIG_WPS */
@@ -567,6 +589,7 @@
#ifdef CONFIG_WPS_OOB
{ wps_oob, hostapd_cli_cmd_wps_oob },
#endif /* CONFIG_WPS_OOB */
+ { wps_ap_pin, hostapd_cli_cmd_wps_ap_pin },
#endif /* CONFIG_WPS */
{ help, hostapd_cli_cmd_help },
{ interface, hostapd_cli_cmd_interface },
Index: src/external/bsd/wpa/dist/src/ap/wpa_auth.c
diff -u src/external/bsd/wpa/dist/src/ap/wpa_auth.c:1.2 src/external/bsd/wpa/dist/src/ap/wpa_auth.c:1.3
--- src/external/bsd/wpa/dist/src/ap/wpa_auth.c:1.2 Sun Feb 27 13:07:42 2011
+++ src/external/bsd/wpa/dist/src/ap/wpa_auth.c Sat Sep 10 16:59:03 2011
@@ -1274,6 +1274,24 @@
break;
case WPA_REAUTH:
case WPA_REAUTH_EAPOL:
+ if (!sm-started) {
+ /*
+ * When using WPS, we may end up here if the STA
+ * manages to re-associate without the previous STA
+ * entry getting removed. Consequently, we need to make
+ * sure that the WPA state machines gets initialized
+ * properly at this point.
+ */
+ wpa_printf(MSG_DEBUG, WPA state machine had not been
+ started - initialize now);
+ sm-started = 1;
+ sm-Init = TRUE;
+ if (wpa_sm_step(sm) == 1)
+return 1; /* should not really happen */
+ sm-Init = FALSE;
+ sm-AuthenticationRequest = TRUE;
+ break;
+ }
if (sm-GUpdateStationKeys) {
/*
* Reauthentication cancels the pending group key
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Sep 10 21:03:37 UTC 2011 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new wpa To generate a diff of this commit: cvs rdiff -u -r1.866 -r1.867 src/doc/3RDPARTY cvs rdiff -u -r1.1601 -r1.1602 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.866 src/doc/3RDPARTY:1.867 --- src/doc/3RDPARTY:1.866 Sat Sep 10 07:44:34 2011 +++ src/doc/3RDPARTY Sat Sep 10 17:03:36 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.866 2011/09/10 11:44:34 tron Exp $ +# $NetBSD: 3RDPARTY,v 1.867 2011/09/10 21:03:36 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1100,8 +1100,8 @@ upstream but there is too much inertia to apply them. Package: wpa_supplicant/hostapd -Version: 0.7.2 -Current Vers: 0.7.2 +Version: 0.7.3 +Current Vers: 0.7.3 Maintainer: Jouni Malinen jkmal...@cc.hut.fi Archive Site: http://hostap.epitest.fi/releases/ Home Page: http://hostap.epitest.fi/wpa_supplicant/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1601 src/doc/CHANGES:1.1602 --- src/doc/CHANGES:1.1601 Sat Sep 10 07:44:34 2011 +++ src/doc/CHANGES Sat Sep 10 17:03:36 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1601 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1602 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1113,3 +1113,4 @@ zoneinfo: Import tzdata2011i. [christos 20110904] openssh: Import 5.9. [christos 20110907] postfix(1): Import version 2.8.5 [tron 20110910] + wpa: New wpa_supplicant and hostapd 0.7.3 [christos 20110910]
CVS commit: src/external/bsd/byacc
Module Name:src Committed By: christos Date: Sat Sep 10 21:18:00 UTC 2011 Modified Files: src/external/bsd/byacc: byacc2netbsd Log Message: fix pasto; generalize date To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/byacc/byacc2netbsd 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/byacc/byacc2netbsd diff -u src/external/bsd/byacc/byacc2netbsd:1.1 src/external/bsd/byacc/byacc2netbsd:1.2 --- src/external/bsd/byacc/byacc2netbsd:1.1 Wed Oct 28 20:56:35 2009 +++ src/external/bsd/byacc/byacc2netbsd Sat Sep 10 17:18:00 2011 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: byacc2netbsd,v 1.1 2009/10/29 00:56:35 christos Exp $ +# $NetBSD: byacc2netbsd,v 1.2 2011/09/10 21:18:00 christos Exp $ # # Copyright (c) 2000 The NetBSD Foundation, Inc. # All rights reserved. @@ -34,10 +34,10 @@ # # $ cd /some/where/temporary # $ tar xpfz /new/byacc/release/tar/file -# $ sh /usr/src/external/bsd/byacc/dist/byacc2netbsd byacc-20091027 `pwd` +# $ sh /usr/src/external/bsd/byacc/dist/byacc2netbsd byacc-MMDD `pwd` # $ cd src/external/bsd/byacc/dist -# $ cvs import -m Import byacc 20091027 src/external/bsd/byacc/dist FLEX byacc-20091027 -# $ cd ../../../../../byacc-20091027 +# $ cvs import -m Import byacc MMDD src/external/bsd/byacc/dist DICKEY byacc-MMDD +# $ cd ../../../../../byacc-MMDD # $ run ./configure # $ run make # check the config file and copy it to /usr/src/external/bsd/byacc/include
CVS commit: src/external/bsd/byacc/dist
Module Name:src Committed By: christos Date: Sat Sep 10 21:19:16 UTC 2011 Update of /cvsroot/src/external/bsd/byacc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9942 Log Message: Import byacc 20110908 Status: Vendor Tag: DICKEY Release Tags: byacc-20110908 U src/external/bsd/byacc/dist/ACKNOWLEDGEMENTS U src/external/bsd/byacc/dist/vmsbuild.com U src/external/bsd/byacc/dist/VERSION U src/external/bsd/byacc/dist/README C src/external/bsd/byacc/dist/error.c C src/external/bsd/byacc/dist/lr0.c U src/external/bsd/byacc/dist/AUTHORS C src/external/bsd/byacc/dist/output.c U src/external/bsd/byacc/dist/NO_WARRANTY C src/external/bsd/byacc/dist/graph.c U src/external/bsd/byacc/dist/configure C src/external/bsd/byacc/dist/symtab.c C src/external/bsd/byacc/dist/defs.h U src/external/bsd/byacc/dist/NOTES C src/external/bsd/byacc/dist/warshall.c C src/external/bsd/byacc/dist/skeleton.c U src/external/bsd/byacc/dist/NEW_FEATURES C src/external/bsd/byacc/dist/verbose.c C src/external/bsd/byacc/dist/config_h.in C src/external/bsd/byacc/dist/lalr.c U src/external/bsd/byacc/dist/makefile.in U src/external/bsd/byacc/dist/config.guess U src/external/bsd/byacc/dist/descrip.mms C src/external/bsd/byacc/dist/closure.c C src/external/bsd/byacc/dist/mkpar.c C src/external/bsd/byacc/dist/yacc.1 U src/external/bsd/byacc/dist/config.sub U src/external/bsd/byacc/dist/CHANGES C src/external/bsd/byacc/dist/reader.c U src/external/bsd/byacc/dist/aclocal.m4 U src/external/bsd/byacc/dist/install-sh U src/external/bsd/byacc/dist/configure.in C src/external/bsd/byacc/dist/main.c U src/external/bsd/byacc/dist/test/calc.tab.c U src/external/bsd/byacc/dist/test/error.y U src/external/bsd/byacc/dist/test/pure_calc.tab.c C src/external/bsd/byacc/dist/test/error.tab.c U src/external/bsd/byacc/dist/test/calc3.tab.c C src/external/bsd/byacc/dist/test/README U src/external/bsd/byacc/dist/test/pure_error.output U src/external/bsd/byacc/dist/test/code_error.tab.h U src/external/bsd/byacc/dist/test/pure_error.tab.c U src/external/bsd/byacc/dist/test/code_error.tab.c U src/external/bsd/byacc/dist/test/run_lint.sh U src/external/bsd/byacc/dist/test/code_calc.y U src/external/bsd/byacc/dist/test/run_test.sh U src/external/bsd/byacc/dist/test/grammar.output U src/external/bsd/byacc/dist/test/calc3.tab.h U src/external/bsd/byacc/dist/test/code_calc.code.c U src/external/bsd/byacc/dist/test/pure_error.tab.h C src/external/bsd/byacc/dist/test/error.tab.h U src/external/bsd/byacc/dist/test/grammar.tab.h U src/external/bsd/byacc/dist/test/pure_error.y C src/external/bsd/byacc/dist/test/ftp.y U src/external/bsd/byacc/dist/test/calc2.output U src/external/bsd/byacc/dist/test/error.output U src/external/bsd/byacc/dist/test/pure_calc.tab.h U src/external/bsd/byacc/dist/test/code_error.output U src/external/bsd/byacc/dist/test/ftp.output U src/external/bsd/byacc/dist/test/calc.tab.h U src/external/bsd/byacc/dist/test/code_error.code.c C src/external/bsd/byacc/dist/test/ftp.tab.c U src/external/bsd/byacc/dist/test/code_calc.output U src/external/bsd/byacc/dist/test/run_make.sh U src/external/bsd/byacc/dist/test/calc.output U src/external/bsd/byacc/dist/test/grammar.y U src/external/bsd/byacc/dist/test/calc2.y U src/external/bsd/byacc/dist/test/calc3.y U src/external/bsd/byacc/dist/test/calc1.tab.c C src/external/bsd/byacc/dist/test/ftp.tab.h U src/external/bsd/byacc/dist/test/pure_calc.output U src/external/bsd/byacc/dist/test/calc1.output U src/external/bsd/byacc/dist/test/calc2.tab.c U src/external/bsd/byacc/dist/test/calc.y U src/external/bsd/byacc/dist/test/code_calc.tab.h U src/external/bsd/byacc/dist/test/calc1.y U src/external/bsd/byacc/dist/test/code_error.y U src/external/bsd/byacc/dist/test/calc3.output U src/external/bsd/byacc/dist/test/code_calc.tab.c U src/external/bsd/byacc/dist/test/calc2.tab.h U src/external/bsd/byacc/dist/test/grammar.tab.c U src/external/bsd/byacc/dist/test/calc1.tab.h U src/external/bsd/byacc/dist/test/pure_calc.y U src/external/bsd/byacc/dist/package/byacc.spec U src/external/bsd/byacc/dist/package/pkgsrc/DESCR U src/external/bsd/byacc/dist/package/pkgsrc/PLIST U src/external/bsd/byacc/dist/package/pkgsrc/distinfo U src/external/bsd/byacc/dist/package/pkgsrc/Makefile U src/external/bsd/byacc/dist/package/debian/copyright U src/external/bsd/byacc/dist/package/debian/compat U src/external/bsd/byacc/dist/package/debian/rules U src/external/bsd/byacc/dist/package/debian/prerm U src/external/bsd/byacc/dist/package/debian/control U src/external/bsd/byacc/dist/package/debian/postinst U src/external/bsd/byacc/dist/package/debian/changelog U src/external/bsd/byacc/dist/package/debian/watch U src/external/bsd/byacc/dist/package/debian/docs U src/external/bsd/byacc/dist/package/debian/source/format 22 conflicts created by this import. Use the following command to help the merge: cvs checkout -jDICKEY:yesterday -jDICKEY src/external/bsd/byacc/dist
CVS commit: src/external/bsd/byacc/dist
Module Name:src Committed By: christos Date: Sat Sep 10 21:22:12 UTC 2011 Update of /cvsroot/src/external/bsd/byacc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21392 Log Message: Import byacc 20110908 Status: Vendor Tag: DICKEY Release Tags: byacc-20110908 U src/external/bsd/byacc/dist/ACKNOWLEDGEMENTS U src/external/bsd/byacc/dist/AUTHORS U src/external/bsd/byacc/dist/CHANGES U src/external/bsd/byacc/dist/NEW_FEATURES U src/external/bsd/byacc/dist/NOTES U src/external/bsd/byacc/dist/NO_WARRANTY U src/external/bsd/byacc/dist/README U src/external/bsd/byacc/dist/VERSION U src/external/bsd/byacc/dist/aclocal.m4 C src/external/bsd/byacc/dist/closure.c U src/external/bsd/byacc/dist/config.guess U src/external/bsd/byacc/dist/config.sub C src/external/bsd/byacc/dist/config_h.in U src/external/bsd/byacc/dist/configure U src/external/bsd/byacc/dist/configure.in C src/external/bsd/byacc/dist/defs.h U src/external/bsd/byacc/dist/descrip.mms C src/external/bsd/byacc/dist/error.c C src/external/bsd/byacc/dist/graph.c U src/external/bsd/byacc/dist/install-sh C src/external/bsd/byacc/dist/lalr.c C src/external/bsd/byacc/dist/lr0.c C src/external/bsd/byacc/dist/main.c U src/external/bsd/byacc/dist/makefile.in C src/external/bsd/byacc/dist/mkpar.c C src/external/bsd/byacc/dist/output.c C src/external/bsd/byacc/dist/skeleton.c C src/external/bsd/byacc/dist/reader.c C src/external/bsd/byacc/dist/symtab.c C src/external/bsd/byacc/dist/verbose.c U src/external/bsd/byacc/dist/vmsbuild.com C src/external/bsd/byacc/dist/warshall.c C src/external/bsd/byacc/dist/yacc.1 U src/external/bsd/byacc/dist/package/byacc.spec U src/external/bsd/byacc/dist/package/pkgsrc/DESCR U src/external/bsd/byacc/dist/package/pkgsrc/PLIST U src/external/bsd/byacc/dist/package/pkgsrc/distinfo U src/external/bsd/byacc/dist/package/pkgsrc/Makefile U src/external/bsd/byacc/dist/package/debian/copyright U src/external/bsd/byacc/dist/package/debian/compat U src/external/bsd/byacc/dist/package/debian/rules U src/external/bsd/byacc/dist/package/debian/prerm U src/external/bsd/byacc/dist/package/debian/control U src/external/bsd/byacc/dist/package/debian/postinst U src/external/bsd/byacc/dist/package/debian/changelog U src/external/bsd/byacc/dist/package/debian/watch U src/external/bsd/byacc/dist/package/debian/docs U src/external/bsd/byacc/dist/package/debian/source/format U src/external/bsd/byacc/dist/test/pure_calc.tab.c U src/external/bsd/byacc/dist/test/calc.tab.c U src/external/bsd/byacc/dist/test/error.y U src/external/bsd/byacc/dist/test/pure_error.output C src/external/bsd/byacc/dist/test/error.tab.c U src/external/bsd/byacc/dist/test/calc3.tab.c C src/external/bsd/byacc/dist/test/README U src/external/bsd/byacc/dist/test/pure_calc.tab.h U src/external/bsd/byacc/dist/test/code_error.tab.h U src/external/bsd/byacc/dist/test/pure_error.tab.c U src/external/bsd/byacc/dist/test/code_error.tab.c U src/external/bsd/byacc/dist/test/run_lint.sh U src/external/bsd/byacc/dist/test/code_calc.y U src/external/bsd/byacc/dist/test/run_test.sh U src/external/bsd/byacc/dist/test/grammar.output U src/external/bsd/byacc/dist/test/calc3.tab.h U src/external/bsd/byacc/dist/test/code_calc.code.c U src/external/bsd/byacc/dist/test/pure_error.tab.h C src/external/bsd/byacc/dist/test/error.tab.h U src/external/bsd/byacc/dist/test/grammar.tab.h U src/external/bsd/byacc/dist/test/ftp.output U src/external/bsd/byacc/dist/test/pure_error.y U src/external/bsd/byacc/dist/test/calc2.output U src/external/bsd/byacc/dist/test/error.output C src/external/bsd/byacc/dist/test/ftp.y U src/external/bsd/byacc/dist/test/run_make.sh U src/external/bsd/byacc/dist/test/calc2.y U src/external/bsd/byacc/dist/test/code_error.output U src/external/bsd/byacc/dist/test/calc.tab.h U src/external/bsd/byacc/dist/test/code_error.code.c C src/external/bsd/byacc/dist/test/ftp.tab.c U src/external/bsd/byacc/dist/test/code_calc.output U src/external/bsd/byacc/dist/test/grammar.y U src/external/bsd/byacc/dist/test/calc.output U src/external/bsd/byacc/dist/test/calc3.y U src/external/bsd/byacc/dist/test/calc1.tab.c C src/external/bsd/byacc/dist/test/ftp.tab.h U src/external/bsd/byacc/dist/test/calc2.tab.c U src/external/bsd/byacc/dist/test/calc.y U src/external/bsd/byacc/dist/test/pure_calc.output U src/external/bsd/byacc/dist/test/calc1.output U src/external/bsd/byacc/dist/test/code_calc.tab.h U src/external/bsd/byacc/dist/test/calc1.y U src/external/bsd/byacc/dist/test/code_error.y U src/external/bsd/byacc/dist/test/code_calc.tab.c U src/external/bsd/byacc/dist/test/calc3.output U src/external/bsd/byacc/dist/test/calc2.tab.h U src/external/bsd/byacc/dist/test/grammar.tab.c U src/external/bsd/byacc/dist/test/calc1.tab.h U src/external/bsd/byacc/dist/test/pure_calc.y 22 conflicts created by this import. Use the following command to help the merge: cvs checkout -jDICKEY:yesterday -jDICKEY src/external/bsd/byacc/dist
CVS commit: src/external/bsd/byacc/dist
Module Name:src Committed By: christos Date: Sat Sep 10 21:29:04 UTC 2011 Modified Files: src/external/bsd/byacc/dist: closure.c defs.h error.c lalr.c lr0.c main.c mkpar.c output.c reader.c skeleton.c symtab.c verbose.c warshall.c yacc.1 src/external/bsd/byacc/dist/test: error.tab.c error.tab.h ftp.tab.c ftp.tab.h ftp.y Log Message: merge changes. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/byacc/dist/closure.c \ src/external/bsd/byacc/dist/lr0.c src/external/bsd/byacc/dist/mkpar.c \ src/external/bsd/byacc/dist/symtab.c \ src/external/bsd/byacc/dist/verbose.c \ src/external/bsd/byacc/dist/warshall.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/byacc/dist/defs.h \ src/external/bsd/byacc/dist/lalr.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/byacc/dist/error.c \ src/external/bsd/byacc/dist/main.c src/external/bsd/byacc/dist/reader.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/byacc/dist/output.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/byacc/dist/skeleton.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/dist/yacc.1 cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/dist/test/error.tab.c \ src/external/bsd/byacc/dist/test/ftp.tab.c \ src/external/bsd/byacc/dist/test/ftp.y cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/dist/test/error.tab.h \ src/external/bsd/byacc/dist/test/ftp.tab.h 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/byacc/dist/closure.c diff -u src/external/bsd/byacc/dist/closure.c:1.5 src/external/bsd/byacc/dist/closure.c:1.6 --- src/external/bsd/byacc/dist/closure.c:1.5 Sat Dec 25 18:43:30 2010 +++ src/external/bsd/byacc/dist/closure.c Sat Sep 10 17:29:04 2011 @@ -1,10 +1,11 @@ -/* $NetBSD: closure.c,v 1.5 2010/12/25 23:43:30 christos Exp $ */ +/* $NetBSD: closure.c,v 1.6 2011/09/10 21:29:04 christos Exp $ */ + /* Id: closure.c,v 1.9 2010/06/09 08:21:47 tom Exp */ #include defs.h #include sys/cdefs.h -__RCSID($NetBSD: closure.c,v 1.5 2010/12/25 23:43:30 christos Exp $); +__RCSID($NetBSD: closure.c,v 1.6 2011/09/10 21:29:04 christos Exp $); Value_t *itemset; Value_t *itemsetend; Index: src/external/bsd/byacc/dist/lr0.c diff -u src/external/bsd/byacc/dist/lr0.c:1.5 src/external/bsd/byacc/dist/lr0.c:1.6 --- src/external/bsd/byacc/dist/lr0.c:1.5 Sat Dec 25 18:43:30 2010 +++ src/external/bsd/byacc/dist/lr0.c Sat Sep 10 17:29:04 2011 @@ -1,10 +1,10 @@ -/* $NetBSD: lr0.c,v 1.5 2010/12/25 23:43:30 christos Exp $ */ +/* $NetBSD: lr0.c,v 1.6 2011/09/10 21:29:04 christos Exp $ */ /* Id: lr0.c,v 1.12 2010/06/09 08:53:17 tom Exp */ #include defs.h #include sys/cdefs.h -__RCSID($NetBSD: lr0.c,v 1.5 2010/12/25 23:43:30 christos Exp $); +__RCSID($NetBSD: lr0.c,v 1.6 2011/09/10 21:29:04 christos Exp $); static core *new_state(int symbol); static Value_t get_state(int symbol); Index: src/external/bsd/byacc/dist/mkpar.c diff -u src/external/bsd/byacc/dist/mkpar.c:1.5 src/external/bsd/byacc/dist/mkpar.c:1.6 --- src/external/bsd/byacc/dist/mkpar.c:1.5 Sat Dec 25 18:43:30 2010 +++ src/external/bsd/byacc/dist/mkpar.c Sat Sep 10 17:29:04 2011 @@ -1,10 +1,10 @@ -/* $NetBSD: mkpar.c,v 1.5 2010/12/25 23:43:30 christos Exp $ */ +/* $NetBSD: mkpar.c,v 1.6 2011/09/10 21:29:04 christos Exp $ */ /* Id: mkpar.c,v 1.11 2010/06/09 08:53:17 tom Exp */ #include defs.h #include sys/cdefs.h -__RCSID($NetBSD: mkpar.c,v 1.5 2010/12/25 23:43:30 christos Exp $); +__RCSID($NetBSD: mkpar.c,v 1.6 2011/09/10 21:29:04 christos Exp $); static action *add_reduce(action *actions, int ruleno, int symbol); static action *add_reductions(int stateno, action *actions); Index: src/external/bsd/byacc/dist/symtab.c diff -u src/external/bsd/byacc/dist/symtab.c:1.5 src/external/bsd/byacc/dist/symtab.c:1.6 --- src/external/bsd/byacc/dist/symtab.c:1.5 Sat Dec 25 18:43:30 2010 +++ src/external/bsd/byacc/dist/symtab.c Sat Sep 10 17:29:04 2011 @@ -1,10 +1,10 @@ -/* $NetBSD: symtab.c,v 1.5 2010/12/25 23:43:30 christos Exp $ */ +/* $NetBSD: symtab.c,v 1.6 2011/09/10 21:29:04 christos Exp $ */ /* Id: symtab.c,v 1.9 2010/11/24 15:12:29 tom Exp */ #include defs.h #include sys/cdefs.h -__RCSID($NetBSD: symtab.c,v 1.5 2010/12/25 23:43:30 christos Exp $); +__RCSID($NetBSD: symtab.c,v 1.6 2011/09/10 21:29:04 christos Exp $); /* TABLE_SIZE is the number of entries in the symbol table. */ /* TABLE_SIZE must be a power of two. */ Index: src/external/bsd/byacc/dist/verbose.c diff -u src/external/bsd/byacc/dist/verbose.c:1.5 src/external/bsd/byacc/dist/verbose.c:1.6 --- src/external/bsd/byacc/dist/verbose.c:1.5 Sat Dec 25 18:43:30 2010 +++ src/external/bsd/byacc/dist/verbose.c Sat Sep 10 17:29:04 2011 @@ -1,10 +1,10 @@ -/* $NetBSD: verbose.c,v 1.5 2010/12/25 23:43:30 christos Exp $ */ +/* $NetBSD: verbose.c,v 1.6 2011/09/10 21:29:04 christos Exp $ */ /* Id: verbose.c,v 1.9
CVS commit: src/external/bsd/byacc
Module Name:src Committed By: christos Date: Sat Sep 10 21:32:25 UTC 2011 Modified Files: src/external/bsd/byacc: byacc2netbsd src/external/bsd/byacc/include: config.h Log Message: update config.h and what we do to it. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/byacc2netbsd cvs rdiff -u -r1.1 -r1.2 src/external/bsd/byacc/include/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/external/bsd/byacc/byacc2netbsd diff -u src/external/bsd/byacc/byacc2netbsd:1.2 src/external/bsd/byacc/byacc2netbsd:1.3 --- src/external/bsd/byacc/byacc2netbsd:1.2 Sat Sep 10 17:18:00 2011 +++ src/external/bsd/byacc/byacc2netbsd Sat Sep 10 17:32:25 2011 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: byacc2netbsd,v 1.2 2011/09/10 21:18:00 christos Exp $ +# $NetBSD: byacc2netbsd,v 1.3 2011/09/10 21:32:25 christos Exp $ # # Copyright (c) 2000 The NetBSD Foundation, Inc. # All rights reserved. @@ -41,6 +41,7 @@ # $ run ./configure # $ run make # check the config file and copy it to /usr/src/external/bsd/byacc/include +# remove the version from SYSTEM_NAME # check the manual page against our copy if there are new options and # update Index: src/external/bsd/byacc/include/config.h diff -u src/external/bsd/byacc/include/config.h:1.1 src/external/bsd/byacc/include/config.h:1.2 --- src/external/bsd/byacc/include/config.h:1.1 Wed Oct 28 20:56:35 2009 +++ src/external/bsd/byacc/include/config.h Sat Sep 10 17:32:25 2011 @@ -1,6 +1,10 @@ /* config.h. Generated automatically by configure. */ /* @configure_input@ */ -/* $Id: config.h,v 1.1 2009/10/29 00:56:35 christos Exp $ */ +/* $Id: config.h,v 1.2 2011/09/10 21:32:25 christos Exp $ */ #define SYSTEM_NAME netbsd +#define MIXEDCASE_FILENAMES 1 #define CC_HAS_PROTOS 1 +#define HAVE_FCNTL_H 1 +#define HAVE_ATEXIT 1 +#define HAVE_MKSTEMP 1
CVS commit: src/external/bsd/byacc/bin
Module Name:src Committed By: christos Date: Sat Sep 10 21:38:59 UTC 2011 Modified Files: src/external/bsd/byacc/bin: yacc.1 Log Message: document -i To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/bin/yacc.1 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/byacc/bin/yacc.1 diff -u src/external/bsd/byacc/bin/yacc.1:1.3 src/external/bsd/byacc/bin/yacc.1:1.4 --- src/external/bsd/byacc/bin/yacc.1:1.3 Fri Dec 24 18:28:14 2010 +++ src/external/bsd/byacc/bin/yacc.1 Sat Sep 10 17:38:59 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: yacc.1,v 1.3 2010/12/24 23:28:14 christos Exp $ +.\ $NetBSD: yacc.1,v 1.4 2011/09/10 21:38:59 christos Exp $ .\ .\ Copyright (c) 1989, 1990 The Regents of the University of California. .\ All rights reserved. @@ -31,9 +31,10 @@ .\ SUCH DAMAGE. .\ .\ from: @(#)yacc.1 5.7 (Berkeley) 7/30/91 -.\ $NetBSD: yacc.1,v 1.3 2010/12/24 23:28:14 christos Exp $ +.\ from: Id: yacc.1,v 1.12 2011/09/08 00:40:44 tom Exp +.\ $NetBSD: yacc.1,v 1.4 2011/09/10 21:38:59 christos Exp $ .\ -.Dd December 23, 2010 +.Dd September 7, 2011 .Dt YACC 1 .Os .Sh NAME @@ -43,7 +44,7 @@ parser generator .Sh SYNOPSIS .Nm -.Op Fl dglPrtVv +.Op Fl dgilPrtVv .Op Fl b Ar prefix .Op Fl o Ar outputfile .Op Fl p Ar symbol_prefix @@ -79,6 +80,7 @@ option causes the header file .Pa y.tab.h to be written. +It contains #define's for the token identifiers. .It Fl g The .Fl g @@ -88,6 +90,26 @@ .Pa y.dot in graphviz format, ready to be processed by .Xr dot 1 . +.It Fl i +The +.Fl i +option causes a supplementary header file +.Pa y.tab.i +to be written. +It contains extern declarations +and supplementary #define's as needed to map the conventional +.Nm +yy-prefixed names to whatever the +.Fl p +option may specify. +The code file, e.g., +.Pa y.tab.c +is modified to #include this file +as well as the +.Pa y.tab.h +file, enforcing consistent usage of the symbols defined in those files. +The supplementary header file makes it simpler to separate compilation +of lex- and yacc-files. .It Fl l If the .Fl l
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Sep 10 21:40:43 UTC 2011 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new byacc To generate a diff of this commit: cvs rdiff -u -r1.867 -r1.868 src/doc/3RDPARTY cvs rdiff -u -r1.1602 -r1.1603 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.867 src/doc/3RDPARTY:1.868 --- src/doc/3RDPARTY:1.867 Sat Sep 10 17:03:36 2011 +++ src/doc/3RDPARTY Sat Sep 10 17:40:43 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.867 2011/09/10 21:03:36 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.868 2011/09/10 21:40:43 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -167,8 +167,8 @@ Notes: Package: byacc -Version: 20101127 -Current Vers: 20101229 +Version: 20110908 +Current Vers: 20110908 Maintainer: Thomas Dickey dic...@invisible-island.net Archive Site: http://www.invisible-island.net/byacc/byacc.html Home Page: http://www.invisible-island.net/byacc/byacc.html @@ -176,6 +176,7 @@ Responsible: christos License: Public Domain Notes: +See /usr/src/external/bsd/byacc/byacc2netbsd for update instructions. Package: bzip2 Version: 1.0.5 Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1602 src/doc/CHANGES:1.1603 --- src/doc/CHANGES:1.1602 Sat Sep 10 17:03:36 2011 +++ src/doc/CHANGES Sat Sep 10 17:40:43 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1602 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1603 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1114,3 +1114,4 @@ openssh: Import 5.9. [christos 20110907] postfix(1): Import version 2.8.5 [tron 20110910] wpa: New wpa_supplicant and hostapd 0.7.3 [christos 20110910] + yacc(1): Import byacc-20110908 [christos 20110910]
CVS commit: src/usr.sbin/traceroute
Module Name:src Committed By: christos Date: Sun Sep 11 01:06:26 UTC 2011 Modified Files: src/usr.sbin/traceroute: CHANGES Makefile ifaddrlist.c traceroute.8 traceroute.c version.c Log Message: merge in traceroute1.4a12. Our sources are so different that it is really difficult to do this with an import. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/usr.sbin/traceroute/CHANGES cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/traceroute/Makefile cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/traceroute/ifaddrlist.c cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/traceroute/traceroute.8 cvs rdiff -u -r1.78 -r1.79 src/usr.sbin/traceroute/traceroute.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/traceroute/version.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/traceroute/CHANGES diff -u src/usr.sbin/traceroute/CHANGES:1.1.1.1 src/usr.sbin/traceroute/CHANGES:1.2 --- src/usr.sbin/traceroute/CHANGES:1.1.1.1 Fri Oct 3 18:25:19 1997 +++ src/usr.sbin/traceroute/CHANGES Sat Sep 10 21:06:26 2011 @@ -1,7 +1,7 @@ -$NetBSD: CHANGES,v 1.1.1.1 1997/10/03 22:25:19 christos Exp $ -@(#) Header: CHANGES,v 1.17 97/06/13 02:27:02 leres Exp (LBL) +$NetBSD: CHANGES,v 1.2 2011/09/11 01:06:26 christos Exp $ +@(#) Id: CHANGES,v 1.23 2000/12/14 06:53:11 leres Exp (LBL) -v1.4 Fri Jun 13 02:23:51 PDT 1997 +v1.4 Wed Dec 13 22:50:35 PST 2000 - Add an option to use icmp echo instead of udp datagrams. @@ -12,8 +12,6 @@ - Added flags to set the first ttl and to set the don't fragment bit. -- Removed dependence on strdup(). - - Add a local autoconf macro to check for routines in libraries; the autoconf version is broken (it only puts the library name in the cache variable name). Thanks to John Hawkinson. @@ -21,6 +19,70 @@ - Add a local autoconf macro to check for types; the autoconf version is broken (it uses grep instead of actually compiling a code fragment). +- Attempt to detect egcs versions of gcc. + +- Fix problems caused by savestr(). + +- Detect when there are more interfaces than we can deal with. Thanks + to Guy Harris g...@netapp.com. + +- Accommodate changes made to FreeBSD 3.2-RELEASE network headers files. + +- The ip header offset needs to be byte swapped under Solaris on the + intel as well. Reported by John McDermott (j...@jkintl.com) Also byte + ip length and offset for linux. + +- In wait_for_reply(), use passed socket instead of global one. Thanks + to Richard Kettlewell (richard.kettlew...@kewill.com) + +- Check for IFF_LOOPBACK as a define or an enum (concession to linux). + Reported by Robert Bihlmeyer (ro...@orcus.priv.at) + +- Increase size of SIOCGIFCONF buffer to accommodate systems with lots + of virtual interfaces. Ignore sun virtual interfaces. Suggested by + Ian Donaldson (i...@aone.com.au) + +- Always calculate icmp checksums when using -I. Reported by Soumen + (sbis...@novell.com) + +- Documentation fix for description of -p. Thanks to Jeffrey C Honig + (j...@bsdi.com) + +- Enable ip checksums for Solaris 2.6 and higher (since they seem to + work correctly now). + +- Avoid problems when broken routers return 0.0.0.0 as their source + address. Thanks to John Hawkinson (jh...@bbnplanet.com) + +- Canonicalize hostname if gethostname() doesn't return a domain. + +- Add -z flag (pause msecs) to allow optional pause between probes. + Suggested by Dave Morrison (drmor...@uplanet.com) + +- Fix max packet length test. + +- Use /dev/null instead of . for file descriptor fodder. + Suggested by Tim Robbins (f...@box3n.gumbynet.org) + +- Watch for a NULL argv[0]. Suggested by Tim Robbins. + +- Be careful with hostname legnths. + +- Print RFC1191 Path MTU Discovery value on needfrag unreachables. + +- Limit port size to 16 bits. Suggested by Tim Robbins. + +- Limit wait time to 24 hours. + +- Modified linux specific struct ipovly definition to avoid problems + with 64 bit systems. Problem reported by Uros Prestor + (u...@turbolinux.com) + +- Use kernel routing tables to determine correct source address. + Three styles are supported: bsd/socket, solaris/mib and linux. + +- Fix configure to recognize older versions of Solaris. + v1.3.2 Thu Sep 26 18:06:16 PDT 1996 - Rewrite source routing code to eliminate a number of problems on Index: src/usr.sbin/traceroute/Makefile diff -u src/usr.sbin/traceroute/Makefile:1.18 src/usr.sbin/traceroute/Makefile:1.19 --- src/usr.sbin/traceroute/Makefile:1.18 Mon May 9 21:52:49 2011 +++ src/usr.sbin/traceroute/Makefile Sat Sep 10 21:06:26 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2011/05/10 01:52:49 christos Exp $ +# $NetBSD: Makefile,v 1.19 2011/09/11 01:06:26 christos Exp $ USE_FORT?= yes # network client @@ -8,6 +8,7 @@ CPPFLAGS+=-DHAVE_MALLOC_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKIO_H=1 CPPFLAGS+=-DHAVE_STRERROR=1 -DHAVE_SETLINEBUF=1 -DHAVE_SOCKADDR_SA_LEN=1
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sun Sep 11 01:07:56 UTC 2011 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new traceroute To generate a diff of this commit: cvs rdiff -u -r1.868 -r1.869 src/doc/3RDPARTY cvs rdiff -u -r1.1603 -r1.1604 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.868 src/doc/3RDPARTY:1.869 --- src/doc/3RDPARTY:1.868 Sat Sep 10 17:40:43 2011 +++ src/doc/3RDPARTY Sat Sep 10 21:07:56 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.868 2011/09/10 21:40:43 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.869 2011/09/11 01:07:56 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1075,7 +1075,7 @@ Notes: Package: traceroute -Version: 1.4a5 +Version: 1.4a12 Current Vers: 1.4a12 Maintainer: tracero...@ee.lbl.gov Archive Site: ftp://ftp.ee.lbl.gov/ @@ -1084,6 +1084,7 @@ Responsible: License: BSD (4-clause) Notes: +Added changes from a5 - a12 manually. Package: tz Version: tzcode2011i / tzdata2011i Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1603 src/doc/CHANGES:1.1604 --- src/doc/CHANGES:1.1603 Sat Sep 10 17:40:43 2011 +++ src/doc/CHANGES Sat Sep 10 21:07:56 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1603 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1604 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1115,3 +1115,4 @@ postfix(1): Import version 2.8.5 [tron 20110910] wpa: New wpa_supplicant and hostapd 0.7.3 [christos 20110910] yacc(1): Import byacc-20110908 [christos 20110910] + traceroute(8): Updated to 1.4a12 [christos 20110910]
CVS commit: src/lib/libc/stdio
Module Name:src Committed By: jruoho Date: Sun Sep 11 04:55:48 UTC 2011 Modified Files: src/lib/libc/stdio: fread.3 Log Message: .Xr for fsetpos(3), not .Fn. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/stdio/fread.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/libc/stdio/fread.3 diff -u src/lib/libc/stdio/fread.3:1.14 src/lib/libc/stdio/fread.3:1.15 --- src/lib/libc/stdio/fread.3:1.14 Sun Jan 11 02:46:29 2009 +++ src/lib/libc/stdio/fread.3 Sun Sep 11 04:55:48 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: fread.3,v 1.14 2009/01/11 02:46:29 christos Exp $ +.\ $NetBSD: fread.3,v 1.15 2011/09/11 04:55:48 jruoho Exp $ .\ .\ Copyright (c) 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -33,7 +33,7 @@ .\ .\ @(#)fread.3 8.2 (Berkeley) 3/8/94 .\ -.Dd December 19, 2008 +.Dd September 11, 2011 .Dt FREAD 3 .Os .Sh NAME @@ -76,7 +76,7 @@ and .Fn fwrite calls without setting the file position explicitly using -.Fn fsetpos +.Xr fsetpos 3 between read and write or write and read operations will lead to unexpected results because of buffering the file pointer not being set to the expected position after each operation completes.
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Sun Sep 11 05:15:55 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/lib/libc/stdio: Makefile
Added Files:
src/tests/lib/libc/stdio: t_fflush.c
Log Message:
Couple of unit tests for fflush(3).
To generate a diff of this commit:
cvs rdiff -u -r1.378 -r1.379 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/stdio/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/stdio/t_fflush.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.378 src/distrib/sets/lists/tests/mi:1.379
--- src/distrib/sets/lists/tests/mi:1.378 Sat Aug 27 18:55:52 2011
+++ src/distrib/sets/lists/tests/mi Sun Sep 11 05:15:55 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.378 2011/08/27 18:55:52 dyoung Exp $
+# $NetBSD: mi,v 1.379 2011/09/11 05:15:55 jruoho Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -436,6 +436,7 @@
./usr/libdata/debug/usr/tests/lib/libc/ssp/h_vsprintf.debug tests-lib-debug debug,atf,ssp
./usr/libdata/debug/usr/tests/lib/libc/stdiotests-lib-debug
./usr/libdata/debug/usr/tests/lib/libc/stdio/t_clearerr.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fflush.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fmemopen.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/stdio/t_format.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/lib/libc/stdio/t_popen.debug tests-lib-debug debug,atf
@@ -2020,6 +2021,7 @@
./usr/tests/lib/libc/stdio tests-lib-tests
./usr/tests/lib/libc/stdio/Atffile tests-lib-tests atf
./usr/tests/lib/libc/stdio/t_clearerr tests-lib-tests atf
+./usr/tests/lib/libc/stdio/t_fflush tests-lib-tests atf
./usr/tests/lib/libc/stdio/t_fmemopen tests-lib-tests atf
./usr/tests/lib/libc/stdio/t_format tests-obsolete obsolete
./usr/tests/lib/libc/stdio/t_popen tests-lib-tests atf
Index: src/tests/lib/libc/stdio/Makefile
diff -u src/tests/lib/libc/stdio/Makefile:1.5 src/tests/lib/libc/stdio/Makefile:1.6
--- src/tests/lib/libc/stdio/Makefile:1.5 Fri Jul 8 06:38:04 2011
+++ src/tests/lib/libc/stdio/Makefile Sun Sep 11 05:15:55 2011
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2011/07/08 06:38:04 jruoho Exp $
+# $NetBSD: Makefile,v 1.6 2011/09/11 05:15:55 jruoho Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/lib/libc/stdio
TESTS_C+= t_clearerr
+TESTS_C+= t_fflush
TESTS_C+= t_fmemopen
TESTS_C+= t_popen
TESTS_C+= t_printf
Added files:
Index: src/tests/lib/libc/stdio/t_fflush.c
diff -u /dev/null src/tests/lib/libc/stdio/t_fflush.c:1.1
--- /dev/null Sun Sep 11 05:15:55 2011
+++ src/tests/lib/libc/stdio/t_fflush.c Sun Sep 11 05:15:55 2011
@@ -0,0 +1,171 @@
+/* $NetBSD: t_fflush.c,v 1.1 2011/09/11 05:15:55 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include sys/cdefs.h
+__RCSID($NetBSD: t_fflush.c,v 1.1 2011/09/11 05:15:55 jruoho Exp $);
+
+#include atf-c.h
+#include errno.h
+#include stdio.h
+#include unistd.h
+
+static const char *path = fflush;
+
+ATF_TC_WITH_CLEANUP(fflush_err);
+ATF_TC_HEAD(fflush_err, tc)
+{
+ atf_tc_set_md_var(tc, descr, Test errors from fflush(3));
+}
+
+ATF_TC_BODY(fflush_err, tc)
+{
+ FILE *f;
+
+ f = fopen(path, w);
+
+ ATF_REQUIRE(f != NULL);
+ ATF_REQUIRE(fflush(NULL)
CVS commit: src/sys/modules
Module Name:src Committed By: mbalmer Date: Sat Sep 10 08:27:07 UTC 2011 Modified Files: src/sys/modules: Makefile.inc Log Message: Include sysctl descriptions when building modules. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/modules/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libperfuse
Module Name:src Committed By: tron Date: Sat Sep 10 10:06:10 UTC 2011 Modified Files: src/lib/libperfuse: ops.c Log Message: Avoid comparison between signed and unsigned integer expressions by casting the offset to a unsigned type. This fixes the NetBSD/i386 and hopefully the NetBSD/amd64 build. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/lib/libperfuse/ops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/usermode/usermode
Module Name:src Committed By: reinoud Date: Sat Sep 10 10:29:39 UTC 2011 Modified Files: src/sys/arch/usermode/usermode: trap.c Log Message: The illegal instruction handler can exist on the usermodes stack and the stackframe will disappear when its switched back. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/usermode/usermode/trap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/usermode/dev
Module Name:src Committed By: reinoud Date: Sat Sep 10 10:37:06 UTC 2011 Modified Files: src/sys/arch/usermode/dev: cpu.c Log Message: Make cpu_lwp_trampo only jump once and make successive jumps go to the func only To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/usermode/dev/cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: tron Date: Sat Sep 10 11:44:34 UTC 2011 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Postfix has been been updated to version 2.8.5. To generate a diff of this commit: cvs rdiff -u -r1.865 -r1.866 src/doc/3RDPARTY cvs rdiff -u -r1.1600 -r1.1601 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: apb Date: Sat Sep 10 16:57:36 UTC 2011 Modified Files: src/share/mk: bsd.README bsd.dep.mk bsd.files.mk bsd.hostlib.mk bsd.hostprog.mk bsd.info.mk bsd.kmodule.mk bsd.lib.mk bsd.man.mk bsd.nls.mk bsd.prog.mk bsd.rpc.mk bsd.test.mk bsd.x11.mk Added Files: src/share/mk: bsd.clean.mk Log Message: Move all clean and cleandir processing to a new bsd.clean.mk file, as proposed in tech-toolchain. To generate a diff of this commit: cvs rdiff -u -r1.285 -r1.286 src/share/mk/bsd.README cvs rdiff -u -r0 -r1.1 src/share/mk/bsd.clean.mk cvs rdiff -u -r1.72 -r1.73 src/share/mk/bsd.dep.mk cvs rdiff -u -r1.41 -r1.42 src/share/mk/bsd.files.mk cvs rdiff -u -r1.15 -r1.16 src/share/mk/bsd.hostlib.mk cvs rdiff -u -r1.63 -r1.64 src/share/mk/bsd.hostprog.mk cvs rdiff -u -r1.39 -r1.40 src/share/mk/bsd.info.mk cvs rdiff -u -r1.31 -r1.32 src/share/mk/bsd.kmodule.mk cvs rdiff -u -r1.315 -r1.316 src/share/mk/bsd.lib.mk cvs rdiff -u -r1.108 -r1.109 src/share/mk/bsd.man.mk cvs rdiff -u -r1.46 -r1.47 src/share/mk/bsd.nls.mk cvs rdiff -u -r1.266 -r1.267 src/share/mk/bsd.prog.mk cvs rdiff -u -r1.11 -r1.12 src/share/mk/bsd.rpc.mk cvs rdiff -u -r1.18 -r1.19 src/share/mk/bsd.test.mk cvs rdiff -u -r1.102 -r1.103 src/share/mk/bsd.x11.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/mtree
Module Name:src Committed By: apb Date: Sat Sep 10 17:02:46 UTC 2011 Modified Files: src/etc/mtree: Makefile Log Message: Revert previous now that make cleandir uses bsd.clean.mk to clean both the obj dir and the src dir. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/etc/mtree/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/fstat
Module Name:src Committed By: christos Date: Sat Sep 10 18:34:40 UTC 2011 Modified Files: src/usr.bin/fstat: misc.c Log Message: add all the possible fileops here, and if there is one we know about print that instead of the passed name. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.bin/fstat/misc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/fstat
Module Name:src Committed By: christos Date: Sat Sep 10 18:34:54 UTC 2011 Modified Files: src/usr.bin/fstat: Makefile Log Message: add libutil. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/usr.bin/fstat/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/fstat
Module Name:src Committed By: christos Date: Sat Sep 10 18:35:28 UTC 2011 Modified Files: src/usr.bin/fstat: fstat.c Log Message: - remove bogus casts - print recycled vnode flags To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/usr.bin/fstat/fstat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pckbport
Module Name:src Committed By: jakllsch Date: Sat Sep 10 18:38:20 UTC 2011 Modified Files: src/sys/dev/pckbport: synaptics.c synapticsreg.h synapticsvar.h Log Message: Correct and improve some comments. Collect unused variables. Add a define. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pckbport/synaptics.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pckbport/synapticsreg.h cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pckbport/synapticsvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: marino Date: Sat Sep 10 19:07:58 UTC 2011 Modified Files: src/distrib/notes/common: main Log Message: Add John Marino to the list of developers. To generate a diff of this commit: cvs rdiff -u -r1.480 -r1.481 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: apb Date: Sat Sep 10 19:25:10 UTC 2011 Modified Files: src/share/mk: bsd.clean.mk Log Message: Don't automatically load .depend files during make clean or make cleandir. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/mk/bsd.clean.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/binutils/usr.bin/ld
Module Name:src Committed By: apb Date: Sat Sep 10 19:26:18 UTC 2011 Modified Files: src/external/gpl3/binutils/usr.bin/ld: Makefile Log Message: Don't include .depend.* files during make clean or make cleandir To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/usr.bin/ld/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/ping
Module Name:src Committed By: christos Date: Sat Sep 10 20:04:28 UTC 2011 Modified Files: src/sbin/ping: ping.8 ping.c Log Message: PR/45257: Instead of passing a 32bit sec and 32 bit usec timestamp in little endian format by default, pass a struct timespec in native host format. Add -C flag to produce a compatible timestamp like before. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sbin/ping/ping.8 cvs rdiff -u -r1.98 -r1.99 src/sbin/ping/ping.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/gnu/dist/gettext
Module Name:src Committed By: apb Date: Sat Sep 10 20:35:43 UTC 2011 Modified Files: src/gnu/dist/gettext/autoconf-lib-link: Makefile.in src/gnu/dist/gettext/gettext-runtime: Makefile.in Log Message: Disable rebuilding files in the source tree. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/gnu/dist/gettext/autoconf-lib-link/Makefile.in cvs rdiff -u -r1.4 -r1.5 src/gnu/dist/gettext/gettext-runtime/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/ping
Module Name:src Committed By: wiz Date: Sat Sep 10 20:46:43 UTC 2011 Modified Files: src/sbin/ping: ping.8 ping.c Log Message: Sort options and descriptions in standard order. Remove unecessary Bk/Ek in SYNOPSIS. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sbin/ping/ping.8 cvs rdiff -u -r1.99 -r1.100 src/sbin/ping/ping.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/ping
Module Name:src Committed By: wiz Date: Sat Sep 10 20:47:33 UTC 2011 Modified Files: src/sbin/ping: ping.8 Log Message: Another option order fix. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sbin/ping/ping.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/wpa/dist
Module Name:src Committed By: christos Date: Sat Sep 10 20:56:00 UTC 2011 Update of /cvsroot/src/external/bsd/wpa/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12221 Log Message: Import wpa_supplicant and hostapd Status: Vendor Tag: MALINEN Release Tags: v0_7_3 U src/external/bsd/wpa/dist/COPYING U src/external/bsd/wpa/dist/README U src/external/bsd/wpa/dist/patches/openssl-0.9.9-session-ticket.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8g-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8h-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8i-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8e-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8d-tls-extensions.patch U src/external/bsd/wpa/dist/hostapd/config_file.c U src/external/bsd/wpa/dist/hostapd/.gitignore U src/external/bsd/wpa/dist/hostapd/ChangeLog U src/external/bsd/wpa/dist/hostapd/Makefile U src/external/bsd/wpa/dist/hostapd/README U src/external/bsd/wpa/dist/hostapd/README-WPS U src/external/bsd/wpa/dist/hostapd/hlr_auc_gw.milenage_db U src/external/bsd/wpa/dist/hostapd/config_file.h U src/external/bsd/wpa/dist/hostapd/ctrl_iface.c U src/external/bsd/wpa/dist/hostapd/ctrl_iface.h U src/external/bsd/wpa/dist/hostapd/defconfig U src/external/bsd/wpa/dist/hostapd/dump_state.c U src/external/bsd/wpa/dist/hostapd/dump_state.h U src/external/bsd/wpa/dist/hostapd/eap_register.c U src/external/bsd/wpa/dist/hostapd/eap_register.h U src/external/bsd/wpa/dist/hostapd/eap_testing.txt U src/external/bsd/wpa/dist/hostapd/hlr_auc_gw.c U src/external/bsd/wpa/dist/hostapd/hostapd.accept U src/external/bsd/wpa/dist/hostapd/hostapd.8 U src/external/bsd/wpa/dist/hostapd/hostapd.eap_user U src/external/bsd/wpa/dist/hostapd/main.c U src/external/bsd/wpa/dist/hostapd/hostapd.conf U src/external/bsd/wpa/dist/hostapd/hostapd.deny U src/external/bsd/wpa/dist/hostapd/hostapd.radius_clients U src/external/bsd/wpa/dist/hostapd/hostapd.sim_db U src/external/bsd/wpa/dist/hostapd/hostapd.vlan U src/external/bsd/wpa/dist/hostapd/hostapd.wpa_psk U src/external/bsd/wpa/dist/hostapd/hostapd_cli.1 C src/external/bsd/wpa/dist/hostapd/hostapd_cli.c U src/external/bsd/wpa/dist/hostapd/nt_password_hash.c U src/external/bsd/wpa/dist/hostapd/wired.conf U src/external/bsd/wpa/dist/hostapd/logwatch/hostapd.conf U src/external/bsd/wpa/dist/hostapd/logwatch/README U src/external/bsd/wpa/dist/hostapd/logwatch/hostapd U src/external/bsd/wpa/dist/src/Makefile U src/external/bsd/wpa/dist/src/lib.rules U src/external/bsd/wpa/dist/src/ap/drv_callbacks.c C src/external/bsd/wpa/dist/src/ap/wpa_auth.c U src/external/bsd/wpa/dist/src/ap/hostapd.c U src/external/bsd/wpa/dist/src/ap/ieee802_1x.h U src/external/bsd/wpa/dist/src/ap/ieee802_11_auth.h U src/external/bsd/wpa/dist/src/ap/sta_info.c U src/external/bsd/wpa/dist/src/ap/Makefile U src/external/bsd/wpa/dist/src/ap/tkip_countermeasures.c U src/external/bsd/wpa/dist/src/ap/ieee802_11_auth.c U src/external/bsd/wpa/dist/src/ap/hw_features.c U src/external/bsd/wpa/dist/src/ap/wpa_auth_ie.c U src/external/bsd/wpa/dist/src/ap/preauth_auth.c U src/external/bsd/wpa/dist/src/ap/wpa_auth_ie.h U src/external/bsd/wpa/dist/src/ap/vlan_init.c U src/external/bsd/wpa/dist/src/ap/ap_config.c U src/external/bsd/wpa/dist/src/ap/hw_features.h U src/external/bsd/wpa/dist/src/ap/ieee802_1x.c U src/external/bsd/wpa/dist/src/ap/tkip_countermeasures.h U src/external/bsd/wpa/dist/src/ap/ap_config.h U src/external/bsd/wpa/dist/src/ap/sta_info.h U src/external/bsd/wpa/dist/src/ap/pmksa_cache_auth.h U src/external/bsd/wpa/dist/src/ap/ieee802_11_ht.c U src/external/bsd/wpa/dist/src/ap/wpa_auth_i.h U src/external/bsd/wpa/dist/src/ap/iapp.c U src/external/bsd/wpa/dist/src/ap/ieee802_11.c U src/external/bsd/wpa/dist/src/ap/beacon.c U src/external/bsd/wpa/dist/src/ap/wmm.c U src/external/bsd/wpa/dist/src/ap/wpa_auth_ft.c U src/external/bsd/wpa/dist/src/ap/wpa_auth_glue.c U src/external/bsd/wpa/dist/src/ap/ap_drv_ops.h U src/external/bsd/wpa/dist/src/ap/accounting.h U src/external/bsd/wpa/dist/src/ap/wpa_auth.h U src/external/bsd/wpa/dist/src/ap/wmm.h U src/external/bsd/wpa/dist/src/ap/ap_mlme.h U src/external/bsd/wpa/dist/src/ap/ap_mlme.c U src/external/bsd/wpa/dist/src/ap/utils.c U src/external/bsd/wpa/dist/src/ap/ctrl_iface_ap.h U src/external/bsd/wpa/dist/src/ap/ap_list.h U src/external/bsd/wpa/dist/src/ap/accounting.c U src/external/bsd/wpa/dist/src/ap/peerkey_auth.c U src/external/bsd/wpa/dist/src/ap/authsrv.h U src/external/bsd/wpa/dist/src/ap/wps_hostapd.h U src/external/bsd/wpa/dist/src/ap/iapp.h U src/external/bsd/wpa/dist/src/ap/vlan_init.h U src/external/bsd/wpa/dist/src/ap/ap_drv_ops.c U src/external/bsd/wpa/dist/src/ap/pmksa_cache_auth.c U src/external/bsd/wpa/dist/src/ap/wpa_auth_glue.h U src/external/bsd/wpa/dist/src/ap/ctrl_iface_ap.c U
CVS commit: src/external/bsd/wpa/dist
Module Name:src Committed By: christos Date: Sat Sep 10 20:59:03 UTC 2011 Modified Files: src/external/bsd/wpa/dist/hostapd: hostapd_cli.c src/external/bsd/wpa/dist/src/ap: wpa_auth.c Log Message: merge 0.7.3 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/hostapd/hostapd_cli.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/src/ap/wpa_auth.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Sep 10 21:03:37 UTC 2011 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new wpa To generate a diff of this commit: cvs rdiff -u -r1.866 -r1.867 src/doc/3RDPARTY cvs rdiff -u -r1.1601 -r1.1602 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/byacc
Module Name:src Committed By: christos Date: Sat Sep 10 21:18:00 UTC 2011 Modified Files: src/external/bsd/byacc: byacc2netbsd Log Message: fix pasto; generalize date To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/byacc/byacc2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/byacc/dist
Module Name:src Committed By: christos Date: Sat Sep 10 21:19:16 UTC 2011 Update of /cvsroot/src/external/bsd/byacc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9942 Log Message: Import byacc 20110908 Status: Vendor Tag: DICKEY Release Tags: byacc-20110908 U src/external/bsd/byacc/dist/ACKNOWLEDGEMENTS U src/external/bsd/byacc/dist/vmsbuild.com U src/external/bsd/byacc/dist/VERSION U src/external/bsd/byacc/dist/README C src/external/bsd/byacc/dist/error.c C src/external/bsd/byacc/dist/lr0.c U src/external/bsd/byacc/dist/AUTHORS C src/external/bsd/byacc/dist/output.c U src/external/bsd/byacc/dist/NO_WARRANTY C src/external/bsd/byacc/dist/graph.c U src/external/bsd/byacc/dist/configure C src/external/bsd/byacc/dist/symtab.c C src/external/bsd/byacc/dist/defs.h U src/external/bsd/byacc/dist/NOTES C src/external/bsd/byacc/dist/warshall.c C src/external/bsd/byacc/dist/skeleton.c U src/external/bsd/byacc/dist/NEW_FEATURES C src/external/bsd/byacc/dist/verbose.c C src/external/bsd/byacc/dist/config_h.in C src/external/bsd/byacc/dist/lalr.c U src/external/bsd/byacc/dist/makefile.in U src/external/bsd/byacc/dist/config.guess U src/external/bsd/byacc/dist/descrip.mms C src/external/bsd/byacc/dist/closure.c C src/external/bsd/byacc/dist/mkpar.c C src/external/bsd/byacc/dist/yacc.1 U src/external/bsd/byacc/dist/config.sub U src/external/bsd/byacc/dist/CHANGES C src/external/bsd/byacc/dist/reader.c U src/external/bsd/byacc/dist/aclocal.m4 U src/external/bsd/byacc/dist/install-sh U src/external/bsd/byacc/dist/configure.in C src/external/bsd/byacc/dist/main.c U src/external/bsd/byacc/dist/test/calc.tab.c U src/external/bsd/byacc/dist/test/error.y U src/external/bsd/byacc/dist/test/pure_calc.tab.c C src/external/bsd/byacc/dist/test/error.tab.c U src/external/bsd/byacc/dist/test/calc3.tab.c C src/external/bsd/byacc/dist/test/README U src/external/bsd/byacc/dist/test/pure_error.output U src/external/bsd/byacc/dist/test/code_error.tab.h U src/external/bsd/byacc/dist/test/pure_error.tab.c U src/external/bsd/byacc/dist/test/code_error.tab.c U src/external/bsd/byacc/dist/test/run_lint.sh U src/external/bsd/byacc/dist/test/code_calc.y U src/external/bsd/byacc/dist/test/run_test.sh U src/external/bsd/byacc/dist/test/grammar.output U src/external/bsd/byacc/dist/test/calc3.tab.h U src/external/bsd/byacc/dist/test/code_calc.code.c U src/external/bsd/byacc/dist/test/pure_error.tab.h C src/external/bsd/byacc/dist/test/error.tab.h U src/external/bsd/byacc/dist/test/grammar.tab.h U src/external/bsd/byacc/dist/test/pure_error.y C src/external/bsd/byacc/dist/test/ftp.y U src/external/bsd/byacc/dist/test/calc2.output U src/external/bsd/byacc/dist/test/error.output U src/external/bsd/byacc/dist/test/pure_calc.tab.h U src/external/bsd/byacc/dist/test/code_error.output U src/external/bsd/byacc/dist/test/ftp.output U src/external/bsd/byacc/dist/test/calc.tab.h U src/external/bsd/byacc/dist/test/code_error.code.c C src/external/bsd/byacc/dist/test/ftp.tab.c U src/external/bsd/byacc/dist/test/code_calc.output U src/external/bsd/byacc/dist/test/run_make.sh U src/external/bsd/byacc/dist/test/calc.output U src/external/bsd/byacc/dist/test/grammar.y U src/external/bsd/byacc/dist/test/calc2.y U src/external/bsd/byacc/dist/test/calc3.y U src/external/bsd/byacc/dist/test/calc1.tab.c C src/external/bsd/byacc/dist/test/ftp.tab.h U src/external/bsd/byacc/dist/test/pure_calc.output U src/external/bsd/byacc/dist/test/calc1.output U src/external/bsd/byacc/dist/test/calc2.tab.c U src/external/bsd/byacc/dist/test/calc.y U src/external/bsd/byacc/dist/test/code_calc.tab.h U src/external/bsd/byacc/dist/test/calc1.y U src/external/bsd/byacc/dist/test/code_error.y U src/external/bsd/byacc/dist/test/calc3.output U src/external/bsd/byacc/dist/test/code_calc.tab.c U src/external/bsd/byacc/dist/test/calc2.tab.h U src/external/bsd/byacc/dist/test/grammar.tab.c U src/external/bsd/byacc/dist/test/calc1.tab.h U src/external/bsd/byacc/dist/test/pure_calc.y U src/external/bsd/byacc/dist/package/byacc.spec U src/external/bsd/byacc/dist/package/pkgsrc/DESCR U src/external/bsd/byacc/dist/package/pkgsrc/PLIST U src/external/bsd/byacc/dist/package/pkgsrc/distinfo U src/external/bsd/byacc/dist/package/pkgsrc/Makefile U src/external/bsd/byacc/dist/package/debian/copyright U src/external/bsd/byacc/dist/package/debian/compat U src/external/bsd/byacc/dist/package/debian/rules U src/external/bsd/byacc/dist/package/debian/prerm U src/external/bsd/byacc/dist/package/debian/control U src/external/bsd/byacc/dist/package/debian/postinst U src/external/bsd/byacc/dist/package/debian/changelog U src/external/bsd/byacc/dist/package/debian/watch U src/external/bsd/byacc/dist/package/debian/docs U src/external/bsd/byacc/dist/package/debian/source/format 22 conflicts created by this import. Use the following command to help the merge: cvs checkout -jDICKEY:yesterday -jDICKEY src/external/bsd/byacc/dist
CVS commit: src/external/bsd/byacc/dist
Module Name:src Committed By: christos Date: Sat Sep 10 21:22:12 UTC 2011 Update of /cvsroot/src/external/bsd/byacc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21392 Log Message: Import byacc 20110908 Status: Vendor Tag: DICKEY Release Tags: byacc-20110908 U src/external/bsd/byacc/dist/ACKNOWLEDGEMENTS U src/external/bsd/byacc/dist/AUTHORS U src/external/bsd/byacc/dist/CHANGES U src/external/bsd/byacc/dist/NEW_FEATURES U src/external/bsd/byacc/dist/NOTES U src/external/bsd/byacc/dist/NO_WARRANTY U src/external/bsd/byacc/dist/README U src/external/bsd/byacc/dist/VERSION U src/external/bsd/byacc/dist/aclocal.m4 C src/external/bsd/byacc/dist/closure.c U src/external/bsd/byacc/dist/config.guess U src/external/bsd/byacc/dist/config.sub C src/external/bsd/byacc/dist/config_h.in U src/external/bsd/byacc/dist/configure U src/external/bsd/byacc/dist/configure.in C src/external/bsd/byacc/dist/defs.h U src/external/bsd/byacc/dist/descrip.mms C src/external/bsd/byacc/dist/error.c C src/external/bsd/byacc/dist/graph.c U src/external/bsd/byacc/dist/install-sh C src/external/bsd/byacc/dist/lalr.c C src/external/bsd/byacc/dist/lr0.c C src/external/bsd/byacc/dist/main.c U src/external/bsd/byacc/dist/makefile.in C src/external/bsd/byacc/dist/mkpar.c C src/external/bsd/byacc/dist/output.c C src/external/bsd/byacc/dist/skeleton.c C src/external/bsd/byacc/dist/reader.c C src/external/bsd/byacc/dist/symtab.c C src/external/bsd/byacc/dist/verbose.c U src/external/bsd/byacc/dist/vmsbuild.com C src/external/bsd/byacc/dist/warshall.c C src/external/bsd/byacc/dist/yacc.1 U src/external/bsd/byacc/dist/package/byacc.spec U src/external/bsd/byacc/dist/package/pkgsrc/DESCR U src/external/bsd/byacc/dist/package/pkgsrc/PLIST U src/external/bsd/byacc/dist/package/pkgsrc/distinfo U src/external/bsd/byacc/dist/package/pkgsrc/Makefile U src/external/bsd/byacc/dist/package/debian/copyright U src/external/bsd/byacc/dist/package/debian/compat U src/external/bsd/byacc/dist/package/debian/rules U src/external/bsd/byacc/dist/package/debian/prerm U src/external/bsd/byacc/dist/package/debian/control U src/external/bsd/byacc/dist/package/debian/postinst U src/external/bsd/byacc/dist/package/debian/changelog U src/external/bsd/byacc/dist/package/debian/watch U src/external/bsd/byacc/dist/package/debian/docs U src/external/bsd/byacc/dist/package/debian/source/format U src/external/bsd/byacc/dist/test/pure_calc.tab.c U src/external/bsd/byacc/dist/test/calc.tab.c U src/external/bsd/byacc/dist/test/error.y U src/external/bsd/byacc/dist/test/pure_error.output C src/external/bsd/byacc/dist/test/error.tab.c U src/external/bsd/byacc/dist/test/calc3.tab.c C src/external/bsd/byacc/dist/test/README U src/external/bsd/byacc/dist/test/pure_calc.tab.h U src/external/bsd/byacc/dist/test/code_error.tab.h U src/external/bsd/byacc/dist/test/pure_error.tab.c U src/external/bsd/byacc/dist/test/code_error.tab.c U src/external/bsd/byacc/dist/test/run_lint.sh U src/external/bsd/byacc/dist/test/code_calc.y U src/external/bsd/byacc/dist/test/run_test.sh U src/external/bsd/byacc/dist/test/grammar.output U src/external/bsd/byacc/dist/test/calc3.tab.h U src/external/bsd/byacc/dist/test/code_calc.code.c U src/external/bsd/byacc/dist/test/pure_error.tab.h C src/external/bsd/byacc/dist/test/error.tab.h U src/external/bsd/byacc/dist/test/grammar.tab.h U src/external/bsd/byacc/dist/test/ftp.output U src/external/bsd/byacc/dist/test/pure_error.y U src/external/bsd/byacc/dist/test/calc2.output U src/external/bsd/byacc/dist/test/error.output C src/external/bsd/byacc/dist/test/ftp.y U src/external/bsd/byacc/dist/test/run_make.sh U src/external/bsd/byacc/dist/test/calc2.y U src/external/bsd/byacc/dist/test/code_error.output U src/external/bsd/byacc/dist/test/calc.tab.h U src/external/bsd/byacc/dist/test/code_error.code.c C src/external/bsd/byacc/dist/test/ftp.tab.c U src/external/bsd/byacc/dist/test/code_calc.output U src/external/bsd/byacc/dist/test/grammar.y U src/external/bsd/byacc/dist/test/calc.output U src/external/bsd/byacc/dist/test/calc3.y U src/external/bsd/byacc/dist/test/calc1.tab.c C src/external/bsd/byacc/dist/test/ftp.tab.h U src/external/bsd/byacc/dist/test/calc2.tab.c U src/external/bsd/byacc/dist/test/calc.y U src/external/bsd/byacc/dist/test/pure_calc.output U src/external/bsd/byacc/dist/test/calc1.output U src/external/bsd/byacc/dist/test/code_calc.tab.h U src/external/bsd/byacc/dist/test/calc1.y U src/external/bsd/byacc/dist/test/code_error.y U src/external/bsd/byacc/dist/test/code_calc.tab.c U src/external/bsd/byacc/dist/test/calc3.output U src/external/bsd/byacc/dist/test/calc2.tab.h U src/external/bsd/byacc/dist/test/grammar.tab.c U src/external/bsd/byacc/dist/test/calc1.tab.h U src/external/bsd/byacc/dist/test/pure_calc.y 22 conflicts created by this import. Use the following command to help the merge: cvs checkout -jDICKEY:yesterday -jDICKEY src/external/bsd/byacc/dist
CVS commit: src/external/bsd/byacc/dist
Module Name:src Committed By: christos Date: Sat Sep 10 21:29:04 UTC 2011 Modified Files: src/external/bsd/byacc/dist: closure.c defs.h error.c lalr.c lr0.c main.c mkpar.c output.c reader.c skeleton.c symtab.c verbose.c warshall.c yacc.1 src/external/bsd/byacc/dist/test: error.tab.c error.tab.h ftp.tab.c ftp.tab.h ftp.y Log Message: merge changes. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/byacc/dist/closure.c \ src/external/bsd/byacc/dist/lr0.c src/external/bsd/byacc/dist/mkpar.c \ src/external/bsd/byacc/dist/symtab.c \ src/external/bsd/byacc/dist/verbose.c \ src/external/bsd/byacc/dist/warshall.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/byacc/dist/defs.h \ src/external/bsd/byacc/dist/lalr.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/byacc/dist/error.c \ src/external/bsd/byacc/dist/main.c src/external/bsd/byacc/dist/reader.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/byacc/dist/output.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/byacc/dist/skeleton.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/dist/yacc.1 cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/dist/test/error.tab.c \ src/external/bsd/byacc/dist/test/ftp.tab.c \ src/external/bsd/byacc/dist/test/ftp.y cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/dist/test/error.tab.h \ src/external/bsd/byacc/dist/test/ftp.tab.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/byacc
Module Name:src Committed By: christos Date: Sat Sep 10 21:32:25 UTC 2011 Modified Files: src/external/bsd/byacc: byacc2netbsd src/external/bsd/byacc/include: config.h Log Message: update config.h and what we do to it. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/byacc2netbsd cvs rdiff -u -r1.1 -r1.2 src/external/bsd/byacc/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/byacc/bin
Module Name:src Committed By: christos Date: Sat Sep 10 21:38:59 UTC 2011 Modified Files: src/external/bsd/byacc/bin: yacc.1 Log Message: document -i To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/bin/yacc.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Sep 10 21:40:43 UTC 2011 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new byacc To generate a diff of this commit: cvs rdiff -u -r1.867 -r1.868 src/doc/3RDPARTY cvs rdiff -u -r1.1602 -r1.1603 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/traceroute
Module Name:src Committed By: christos Date: Sun Sep 11 01:06:26 UTC 2011 Modified Files: src/usr.sbin/traceroute: CHANGES Makefile ifaddrlist.c traceroute.8 traceroute.c version.c Log Message: merge in traceroute1.4a12. Our sources are so different that it is really difficult to do this with an import. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/usr.sbin/traceroute/CHANGES cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/traceroute/Makefile cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/traceroute/ifaddrlist.c cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/traceroute/traceroute.8 cvs rdiff -u -r1.78 -r1.79 src/usr.sbin/traceroute/traceroute.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/traceroute/version.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sun Sep 11 01:07:56 UTC 2011 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new traceroute To generate a diff of this commit: cvs rdiff -u -r1.868 -r1.869 src/doc/3RDPARTY cvs rdiff -u -r1.1603 -r1.1604 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/stdio
Module Name:src Committed By: jruoho Date: Sun Sep 11 04:55:48 UTC 2011 Modified Files: src/lib/libc/stdio: fread.3 Log Message: .Xr for fsetpos(3), not .Fn. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/stdio/fread.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
