CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: mrg Date: Fri Jan 17 09:09:40 UTC 2014 Modified Files: src/sys/arch/powerpc/powerpc: openfirm.c Log Message: convert a failure to call OF for a reboot call into a panic() instead of a hard hang. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/powerpc/openfirm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/powerpc/openfirm.c diff -u src/sys/arch/powerpc/powerpc/openfirm.c:1.22 src/sys/arch/powerpc/powerpc/openfirm.c:1.23 --- src/sys/arch/powerpc/powerpc/openfirm.c:1.22 Sun May 12 13:50:11 2013 +++ src/sys/arch/powerpc/powerpc/openfirm.c Fri Jan 17 09:09:40 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: openfirm.c,v 1.22 2013/05/12 13:50:11 macallan Exp $ */ +/* $NetBSD: openfirm.c,v 1.23 2014/01/17 09:09:40 mrg Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -34,7 +34,7 @@ #include opt_multiprocessor.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: openfirm.c,v 1.22 2013/05/12 13:50:11 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: openfirm.c,v 1.23 2014/01/17 09:09:40 mrg Exp $); #include sys/param.h #include sys/systm.h @@ -615,8 +615,8 @@ OF_boot(const char *bootspec) ofw_stack(); ofbcopy(bootspec, OF_buf, l + 1); args.bootspec = OF_buf; - openfirmware(args); - while (1); /* just in case */ + if (openfirmware(args) == -1) + panic(OF_boot didn't); } void
CVS commit: src/sys/kern
Module Name:src
Committed By: hannken
Date: Fri Jan 17 10:52:36 UTC 2014
Modified Files:
src/sys/kern: vnode_if.src
Log Message:
Change vnode operations create, mknod, mkdir and symlink to keep the
directory node dvp locked on return.
Discussed on tech-kern@
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/kern/vnode_if.src
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vnode_if.src
diff -u src/sys/kern/vnode_if.src:1.63 src/sys/kern/vnode_if.src:1.64
--- src/sys/kern/vnode_if.src:1.63 Fri Oct 14 09:23:31 2011
+++ src/sys/kern/vnode_if.src Fri Jan 17 10:52:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: vnode_if.src,v 1.63 2011/10/14 09:23:31 hannken Exp $
+# $NetBSD: vnode_if.src,v 1.64 2014/01/17 10:52:36 hannken Exp $
#
# Copyright (c) 1992, 1993
# The Regents of the University of California. All rights reserved.
@@ -88,26 +88,28 @@ vop_lookup {
};
#
-#% create dvp L U U
+#% create dvp L L L
#% create vpp - L -
#
#! create cnp CREATE, LOCKPARENT
#
vop_create {
- IN LOCKED=YES WILLPUT struct vnode *dvp;
+ VERSION 2
+ IN LOCKED=YES struct vnode *dvp;
OUT WILLMAKE struct vnode **vpp;
IN struct componentname *cnp;
IN struct vattr *vap;
};
#
-#% mknod dvp L U U
+#% mknod dvp L L L
#% mknod vpp - L -
#
#! mknod cnp CREATE, LOCKPARENT
#
vop_mknod {
- IN LOCKED=YES WILLPUT struct vnode *dvp;
+ VERSION 2
+ IN LOCKED=YES struct vnode *dvp;
OUT WILLMAKE struct vnode **vpp;
IN struct componentname *cnp;
IN struct vattr *vap;
@@ -298,13 +300,14 @@ vop_rename {
};
#
-#% mkdir dvp L U U
+#% mkdir dvp L L L
#% mkdir vpp - L -
#
#! mkdir cnp CREATE, LOCKPARENT
#
vop_mkdir {
- IN LOCKED=YES WILLPUT struct vnode *dvp;
+ VERSION 2
+ IN LOCKED=YES struct vnode *dvp;
OUT WILLMAKE struct vnode **vpp;
IN struct componentname *cnp;
IN struct vattr *vap;
@@ -323,13 +326,14 @@ vop_rmdir {
};
#
-#% symlinkdvp L U U
+#% symlinkdvp L L L
#% symlinkvpp - L -
#
#! symlink cnp CREATE, LOCKPARENT
#
vop_symlink {
- IN LOCKED=YES WILLPUT struct vnode *dvp;
+ VERSION 2
+ IN LOCKED=YES struct vnode *dvp;
OUT WILLMAKE struct vnode **vpp;
IN struct componentname *cnp;
IN struct vattr *vap;
CVS commit: src/lib/libc/net
Module Name:src
Committed By: drochner
Date: Fri Jan 17 12:39:47 UTC 2014
Modified Files:
src/lib/libc/net: gethnamaddr.c
Log Message:
fix memory allocation, and an off-by-one
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/lib/libc/net/gethnamaddr.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/libc/net/gethnamaddr.c
diff -u src/lib/libc/net/gethnamaddr.c:1.88 src/lib/libc/net/gethnamaddr.c:1.89
--- src/lib/libc/net/gethnamaddr.c:1.88 Fri Jan 17 02:08:44 2014
+++ src/lib/libc/net/gethnamaddr.c Fri Jan 17 12:39:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gethnamaddr.c,v 1.88 2014/01/17 02:08:44 christos Exp $ */
+/* $NetBSD: gethnamaddr.c,v 1.89 2014/01/17 12:39:47 drochner Exp $ */
/*
* ++Copyright++ 1985, 1988, 1993
@@ -57,7 +57,7 @@
static char sccsid[] = @(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93;
static char rcsid[] = Id: gethnamaddr.c,v 8.21 1997/06/01 20:34:37 vixie Exp ;
#else
-__RCSID($NetBSD: gethnamaddr.c,v 1.88 2014/01/17 02:08:44 christos Exp $);
+__RCSID($NetBSD: gethnamaddr.c,v 1.89 2014/01/17 12:39:47 drochner Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -109,8 +109,8 @@ __weak_alias(gethostent,_gethostent)
#define maybe_dnok(res, dn) maybe_ok((res), (dn), res_dnok)
#define addalias(d, s, arr, siz) do { \
- if (d = arr[siz - 1]) { \
- char **xptr = realloc(arr, siz + 10); \
+ if (d = arr[siz]) {\
+ char **xptr = realloc(arr, (siz + 10) * sizeof(*arr)); \
if (xptr == NULL) \
goto nospc; \
d = xptr + (d - arr); \
@@ -121,7 +121,7 @@ __weak_alias(gethostent,_gethostent)
} while (/*CONSTCOND*/0)
#define setup(arr, siz) do {\
- arr = malloc(siz = 10); \
+ arr = malloc((siz = 10) * sizeof(*arr)); \
if (arr == NULL)\
goto nospc;\
} while (/*CONSTCOND*/0)
CVS commit: src/lib/libc/compiler_rt
Module Name:src
Committed By: joerg
Date: Fri Jan 17 14:03:31 UTC 2014
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
Log Message:
Explicitly enumerate platforms that have unwind support to make
piecewise migration easier.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/compiler_rt/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.5 src/lib/libc/compiler_rt/Makefile.inc:1.6
--- src/lib/libc/compiler_rt/Makefile.inc:1.5 Thu Jan 16 23:05:51 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Fri Jan 17 14:03:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2014/01/16 23:05:51 matt Exp $
+# $NetBSD: Makefile.inc,v 1.6 2014/01/17 14:03:31 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -28,10 +28,11 @@ COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCD
GENERIC_SRCS+= atomic.c
.endif
-.if ${HAVE_LIBGCC} == no
+.if ${LIBC_MACHINE_ARCH} == i386 || ${LIBC_MACHINE_ARCH} == amd64
# Requires unwind support
GENERIC_SRCS+= \
gcc_personality_v0.c
+.endif
# Conflicts with soft-float
GENERIC_SRCS+= \
CVS commit: src/lib/libc/compiler_rt
Module Name:src
Committed By: joerg
Date: Fri Jan 17 14:08:59 UTC 2014
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
Log Message:
Don't use aeabi_dcmp.S and aeabi_fcmp.S on ARM yet, softfloat provides
the same set of symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/compiler_rt/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.8 src/lib/libc/compiler_rt/Makefile.inc:1.9
--- src/lib/libc/compiler_rt/Makefile.inc:1.8 Fri Jan 17 14:07:33 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Fri Jan 17 14:08:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2014/01/17 14:07:33 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.9 2014/01/17 14:08:59 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -184,13 +184,14 @@ GENERIC_SRCS+= \
.if ${MACHINE_CPU} == arm
.if !empty(LIBC_MACHINE_ARCH:Mearm*)
GENERIC_SRCS+= \
- aeabi_dcmp.S \
- aeabi_fcmp.S \
aeabi_idivmod.S \
aeabi_ldivmod.S \
aeabi_uidivmod.S \
aeabi_uldivmod.S
.endif
+# Not yet, overlaps with softfloat
+# aeabi_dcmp.S \
+# aeabi_fcmp.S
# Not yet, requires ARMv6
#GENERIC_SRCS+= \
# bswapdi2.S \
CVS commit: src/lib/libc/compiler_rt
Module Name:src
Committed By: joerg
Date: Fri Jan 17 14:06:36 UTC 2014
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
Log Message:
__floatunsidf and __floatunsisf are provided by softfloat, but
__fixdfdi and __fixdfsi are not. So move them into the corresponding
chunks.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/compiler_rt/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.6 src/lib/libc/compiler_rt/Makefile.inc:1.7
--- src/lib/libc/compiler_rt/Makefile.inc:1.6 Fri Jan 17 14:03:31 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Fri Jan 17 14:06:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2014/01/17 14:03:31 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2014/01/17 14:06:36 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -43,14 +43,14 @@ GENERIC_SRCS+= \
divdf3.c \
divsf3.c \
extendsfdf2.c \
- fixdfdi.c \
- fixdfsi.c \
fixdfti.c \
fixsfdi.c \
fixsfsi.c \
fixsfti.c \
floatsidf.c \
floatsisf.c \
+ floatunsidf.c \
+ floatunsisf.c \
muldf3.c \
mulsf3.c \
subdf3.c \
@@ -74,6 +74,8 @@ GENERIC_SRCS+= \
divsi3.c \
divti3.c \
ffsti2.c \
+ fixdfdi.c \
+ fixdfsi.c \
fixunsdfdi.c \
fixunsdfsi.c \
fixunsdfti.c \
@@ -94,8 +96,6 @@ GENERIC_SRCS+= \
floatundidf.c \
floatundisf.c \
floatundixf.c \
- floatunsidf.c \
- floatunsisf.c \
floatuntidf.c \
floatuntisf.c \
floatuntixf.c \
CVS commit: src/lib/libc/compiler_rt
Module Name:src
Committed By: joerg
Date: Fri Jan 17 14:07:33 UTC 2014
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
Log Message:
Comment out softfloat code until it is decided what to use long term.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/compiler_rt/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.7 src/lib/libc/compiler_rt/Makefile.inc:1.8
--- src/lib/libc/compiler_rt/Makefile.inc:1.7 Fri Jan 17 14:06:36 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Fri Jan 17 14:07:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2014/01/17 14:06:36 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.8 2014/01/17 14:07:33 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -34,6 +34,7 @@ GENERIC_SRCS+= \
gcc_personality_v0.c
.endif
+.if 0
# Conflicts with soft-float
GENERIC_SRCS+= \
comparedf2.c \
CVS commit: src/tests/crypto/opencrypto
Module Name:src
Committed By: pgoyette
Date: Fri Jan 17 14:14:54 UTC 2014
Modified Files:
src/tests/crypto/opencrypto: t_opencrypto.sh
Log Message:
Disable the arc4 and null_cbc tests for now. The swcrypto driver does
not (yet) support them.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/crypto/opencrypto/t_opencrypto.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/opencrypto/t_opencrypto.sh
diff -u src/tests/crypto/opencrypto/t_opencrypto.sh:1.1 src/tests/crypto/opencrypto/t_opencrypto.sh:1.2
--- src/tests/crypto/opencrypto/t_opencrypto.sh:1.1 Tue Jan 14 17:51:39 2014
+++ src/tests/crypto/opencrypto/t_opencrypto.sh Fri Jan 17 14:14:54 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_opencrypto.sh,v 1.1 2014/01/14 17:51:39 pgoyette Exp $
+# $NetBSD: t_opencrypto.sh,v 1.2 2014/01/17 14:14:54 pgoyette Exp $
#
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -75,6 +75,7 @@ arc4_head() {
}
arc4_body() {
+ atf_skip ARC4 not implemented by swcrypto
common_body h_arc4
}
@@ -214,6 +215,7 @@ md5_hmac_cleanup() {
atf_test_case null cleanup
null_head() {
+ atf_skip NULL_CBC not implemented by swcrypto
common_head Test NULL_CBC crypto
}
CVS commit: src/tests/crypto/opencrypto
Module Name:src
Committed By: pgoyette
Date: Fri Jan 17 14:16:08 UTC 2014
Modified Files:
src/tests/crypto/opencrypto: h_aesctr1.c h_aesctr2.c h_arc4.c
h_camellia.c h_cbcdes.c h_gcm.c h_md5.c h_md5hmac.c h_null.c
Log Message:
Clean up the helper programs. Remove the code to print the results, and
make sure that all helpers actually check the results against the correct
values.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/crypto/opencrypto/h_aesctr1.c \
src/tests/crypto/opencrypto/h_aesctr2.c \
src/tests/crypto/opencrypto/h_arc4.c \
src/tests/crypto/opencrypto/h_camellia.c \
src/tests/crypto/opencrypto/h_cbcdes.c \
src/tests/crypto/opencrypto/h_gcm.c src/tests/crypto/opencrypto/h_md5.c \
src/tests/crypto/opencrypto/h_md5hmac.c \
src/tests/crypto/opencrypto/h_null.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/opencrypto/h_aesctr1.c
diff -u src/tests/crypto/opencrypto/h_aesctr1.c:1.1 src/tests/crypto/opencrypto/h_aesctr1.c:1.2
--- src/tests/crypto/opencrypto/h_aesctr1.c:1.1 Tue Jan 14 17:51:39 2014
+++ src/tests/crypto/opencrypto/h_aesctr1.c Fri Jan 17 14:16:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: h_aesctr1.c,v 1.1 2014/01/14 17:51:39 pgoyette Exp $ */
+/* $NetBSD: h_aesctr1.c,v 1.2 2014/01/17 14:16:08 pgoyette Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -76,16 +76,9 @@ main(void)
res = ioctl(fd, CIOCCRYPT, co);
if (res 0)
err(1, CIOCCRYPT);
-#if 1
+
if (memcmp(co.dst, ciphertx, sizeof(ciphertx)))
warnx(verification failed);
-#else
- {
- int i;
- for (i = 0; i sizeof(buf); i++)
- printf(%02x , buf[i]);
- printf(\n);
- }
-#endif
+
return 0;
}
Index: src/tests/crypto/opencrypto/h_aesctr2.c
diff -u src/tests/crypto/opencrypto/h_aesctr2.c:1.1 src/tests/crypto/opencrypto/h_aesctr2.c:1.2
--- src/tests/crypto/opencrypto/h_aesctr2.c:1.1 Tue Jan 14 17:51:39 2014
+++ src/tests/crypto/opencrypto/h_aesctr2.c Fri Jan 17 14:16:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: h_aesctr2.c,v 1.1 2014/01/14 17:51:39 pgoyette Exp $ */
+/* $NetBSD: h_aesctr2.c,v 1.2 2014/01/17 14:16:08 pgoyette Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -89,16 +89,9 @@ main(void)
res = ioctl(fd, CIOCCRYPT, co);
if (res 0)
err(1, CIOCCRYPT);
-#if 1
+
if (memcmp((char *)co.dst + 8, plaintx, sizeof(plaintx)))
warnx(verification failed);
-#else
- {
- int i;
- for (i = 0; i sizeof(ibuf); i++)
- printf(%02x , ibuf[i]);
- printf(\n);
- }
-#endif
+
return 0;
}
Index: src/tests/crypto/opencrypto/h_arc4.c
diff -u src/tests/crypto/opencrypto/h_arc4.c:1.1 src/tests/crypto/opencrypto/h_arc4.c:1.2
--- src/tests/crypto/opencrypto/h_arc4.c:1.1 Tue Jan 14 17:51:39 2014
+++ src/tests/crypto/opencrypto/h_arc4.c Fri Jan 17 14:16:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: h_arc4.c,v 1.1 2014/01/14 17:51:39 pgoyette Exp $ */
+/* $NetBSD: h_arc4.c,v 1.2 2014/01/17 14:16:08 pgoyette Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -72,16 +72,9 @@ main(void)
res = ioctl(fd, CIOCCRYPT, co);
if (res 0)
err(1, CIOCCRYPT);
-#if 1
+
if (memcmp(co.dst, ciphertx, sizeof(ciphertx)))
errx(1, verification failed);
-#else
- {
- int i;
- for (i = 0; i sizeof(buf); i++)
- printf(%02x , buf[i]);
- printf(\n);
- }
-#endif
+
return 0;
}
Index: src/tests/crypto/opencrypto/h_camellia.c
diff -u src/tests/crypto/opencrypto/h_camellia.c:1.1 src/tests/crypto/opencrypto/h_camellia.c:1.2
--- src/tests/crypto/opencrypto/h_camellia.c:1.1 Tue Jan 14 17:51:39 2014
+++ src/tests/crypto/opencrypto/h_camellia.c Fri Jan 17 14:16:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: h_camellia.c,v 1.1 2014/01/14 17:51:39 pgoyette Exp $ */
+/* $NetBSD: h_camellia.c,v 1.2 2014/01/17 14:16:08 pgoyette Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -78,16 +78,9 @@ main(void)
res = ioctl(fd, CIOCCRYPT, co);
if (res 0)
err(1, CIOCCRYPT);
-#if 0
+
if (memcmp(co.dst, ciphertx, sizeof(ciphertx)))
warnx(verification failed);
-#else
- {
- unsigned int i;
- for (i = 0; i sizeof(buf); i++)
- printf(%02x , buf[i]);
- printf(\n);
- }
-#endif
+
return 0;
}
Index: src/tests/crypto/opencrypto/h_cbcdes.c
diff -u src/tests/crypto/opencrypto/h_cbcdes.c:1.1 src/tests/crypto/opencrypto/h_cbcdes.c:1.2
--- src/tests/crypto/opencrypto/h_cbcdes.c:1.1 Tue Jan 14 17:51:39 2014
+++ src/tests/crypto/opencrypto/h_cbcdes.c Fri Jan 17 14:16:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: h_cbcdes.c,v 1.1 2014/01/14 17:51:39 pgoyette Exp $ */
+/* $NetBSD: h_cbcdes.c,v 1.2 2014/01/17 14:16:08 pgoyette Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -74,16 +74,9 @@ main(void)
res = ioctl(fd, CIOCCRYPT, co);
if (res 0)
err(1, CIOCCRYPT);
-#if 1
+
if (memcmp(co.dst, ciphertx, sizeof(ciphertx)))
errx(1, verification failed);
-#else
- {
- int i;
- for (i = 0; i
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Fri Jan 17 14:57:04 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: hyperentropy.c
Log Message:
don't use temp buffer from the stack, fix the constants
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpkern/hyperentropy.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/rump/librump/rumpkern/hyperentropy.c
diff -u src/sys/rump/librump/rumpkern/hyperentropy.c:1.1 src/sys/rump/librump/rumpkern/hyperentropy.c:1.2
--- src/sys/rump/librump/rumpkern/hyperentropy.c:1.1 Fri Jan 17 01:32:53 2014
+++ src/sys/rump/librump/rumpkern/hyperentropy.c Fri Jan 17 14:57:04 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hyperentropy.c,v 1.1 2014/01/17 01:32:53 pooka Exp $ */
+/* $NetBSD: hyperentropy.c,v 1.2 2014/01/17 14:57:04 pooka Exp $ */
/*
* Copyright (c) 2014 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hyperentropy.c,v 1.1 2014/01/17 01:32:53 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: hyperentropy.c,v 1.2 2014/01/17 14:57:04 pooka Exp $);
#include sys/param.h
#include sys/kmem.h
@@ -38,16 +38,18 @@ __KERNEL_RCSID(0, $NetBSD: hyperentropy
static krndsource_t rndsrc;
+#define MAXGET (RND_POOLBITS/NBBY)
static void
feedrandom(size_t bytes, void *arg)
{
- uint8_t rnddata[1024];
+ uint8_t *rnddata;
size_t dsize;
- /* stuff max 1k worth, we'll be called again if necessary */
- if (rumpuser_getrandom(rnddata, MIN(sizeof(rnddata), bytes),
+ rnddata = kmem_intr_alloc(MAXGET, KM_SLEEP);
+ if (rumpuser_getrandom(rnddata, MIN(MAXGET, bytes),
RUMPUSER_RANDOM_HARD|RUMPUSER_RANDOM_NOWAIT, dsize) == 0)
- rnd_add_data(rndsrc, rnddata, dsize, 8*dsize);
+ rnd_add_data(rndsrc, rnddata, dsize, NBBY*dsize);
+ kmem_intr_free(rnddata, MAXGET);
}
void
@@ -58,11 +60,10 @@ rump_hyperentropy_init(void)
rndsource_setcb(rndsrc, feedrandom, rndsrc);
rnd_attach_source(rndsrc, rump_hyperent, RND_TYPE_VM,
RND_FLAG_NO_ESTIMATE|RND_FLAG_HASCB);
- feedrandom(128, NULL);
} else {
- /* without threads, 1024 bytes ought to be enough for anyone */
+ /* without threads, just fill the pool */
rnd_attach_source(rndsrc, rump_hyperent, RND_TYPE_VM,
RND_FLAG_NO_ESTIMATE);
- feedrandom(1024, NULL);
+ feedrandom(RND_POOLBITS/NBBY, NULL);
}
}
CVS commit: src/external/historical/nawk/bin
Module Name:src
Committed By: roy
Date: Fri Jan 17 16:31:45 UTC 2014
Modified Files:
src/external/historical/nawk/bin: Makefile
Log Message:
Fix build with clang
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/historical/nawk/bin/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/historical/nawk/bin/Makefile
diff -u src/external/historical/nawk/bin/Makefile:1.9 src/external/historical/nawk/bin/Makefile:1.10
--- src/external/historical/nawk/bin/Makefile:1.9 Fri Aug 10 16:05:26 2012
+++ src/external/historical/nawk/bin/Makefile Fri Jan 17 16:31:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/08/10 16:05:26 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2014/01/17 16:31:45 roy Exp $
WARNS?= 4
CWARNFLAGS.clang+= -Wno-self-assign
@@ -17,9 +17,9 @@ LDADD+= -lm
DPADD+= ${LIBM}
.endif
YHEADER= yes
-COPTS+= -Wno-pointer-sign
-COPTS.run.c += -Wno-format-nonliteral
-COPTS.tran.c += -Wno-format-nonliteral
+CWARNFLAGS+= -Wno-pointer-sign
+COPTS.run.c+= -Wno-format-nonliteral
+COPTS.tran.c+= -Wno-format-nonliteral
# info file originally from GNU awk 3.1.3, adjusted for nawk slightly
.PATH: ${NETBSDSRCDIR}/external/gpl2/gawk/dist
CVS commit: [netbsd-5-1] src
Module Name:src Committed By: bouyer Date: Fri Jan 17 16:44:06 UTC 2014 Modified Files: src/distrib/notes/common [netbsd-5-1]: main src/doc [netbsd-5-1]: CHANGES-5.1.4 LAST_MINUTE src/sys/sys [netbsd-5-1]: param.h Log Message: distrib/notes/common/main patch doc/LAST_MINUTE patch sys/sys/param.h patch Welcome to 5.1.4! [bouyer] To generate a diff of this commit: cvs rdiff -u -r1.425.2.14.2.4 -r1.425.2.14.2.5 src/distrib/notes/common/main cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/doc/CHANGES-5.1.4 cvs rdiff -u -r1.2.30.2.2.3 -r1.2.30.2.2.4 src/doc/LAST_MINUTE cvs rdiff -u -r1.330.4.15.2.7 -r1.330.4.15.2.8 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.425.2.14.2.4 src/distrib/notes/common/main:1.425.2.14.2.5 --- src/distrib/notes/common/main:1.425.2.14.2.4 Mon Jan 13 21:52:12 2014 +++ src/distrib/notes/common/main Fri Jan 17 16:44:06 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.425.2.14.2.4 2014/01/13 21:52:12 bouyer Exp $ +.\ $NetBSD: main,v 1.425.2.14.2.5 2014/01/17 16:44:06 bouyer Exp $ .\ .\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -482,8 +482,8 @@ ntpd used as DDoS amplifier . .Pp Advisories prior to NetBSD-SA2013-010 do not affect -NetBSD 5.1.3: -.Lk http://www.NetBSD.org/support/security/patches-5.1.3.html . +NetBSD 5.1.4: +.Lk http://www.NetBSD.org/support/security/patches-5.1.4.html . . .Ss2 Kernel .(bullet Index: src/doc/CHANGES-5.1.4 diff -u src/doc/CHANGES-5.1.4:1.1.2.9 src/doc/CHANGES-5.1.4:1.1.2.10 --- src/doc/CHANGES-5.1.4:1.1.2.9 Wed Jan 15 10:12:32 2014 +++ src/doc/CHANGES-5.1.4 Fri Jan 17 16:44:06 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.4,v 1.1.2.9 2014/01/15 10:12:32 bouyer Exp $ +# $NetBSD: CHANGES-5.1.4,v 1.1.2.10 2014/01/17 16:44:06 bouyer Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -70,3 +70,10 @@ dist/bind/bin/named/query.c patch when serving NSEC3 signed zones. [RT #35120] [spz, ticket #1897] +distrib/notes/common/main patch +doc/LAST_MINUTE patch +sys/sys/param.h patch + + Welcome to 5.1.4! + [bouyer] + Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.30.2.2.3 src/doc/LAST_MINUTE:1.2.30.2.2.4 --- src/doc/LAST_MINUTE:1.2.30.2.2.3 Sun Sep 22 22:12:05 2013 +++ src/doc/LAST_MINUTE Fri Jan 17 16:44:06 2014 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.30.2.2.3 2013/09/22 22:12:05 riz Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.30.2.2.4 2014/01/17 16:44:06 bouyer Exp $ -This file contains important information on the NetBSD 5.1.3 release that +This file contains important information on the NetBSD 5.1.4 release that did not make it into the main documentation. [all] Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.330.4.15.2.7 src/sys/sys/param.h:1.330.4.15.2.8 --- src/sys/sys/param.h:1.330.4.15.2.7 Sun Oct 13 07:22:07 2013 +++ src/sys/sys/param.h Fri Jan 17 16:44:06 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.330.4.15.2.7 2013/10/13 07:22:07 jdc Exp $ */ +/* $NetBSD: param.h,v 1.330.4.15.2.8 2014/01/17 16:44:06 bouyer Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 501000301 /* NetBSD 5.1.3_PATCH */ +#define __NetBSD_Version__ 501000400 /* NetBSD 5.1.4 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: [netbsd-5-2] src
Module Name:src Committed By: bouyer Date: Fri Jan 17 17:00:04 UTC 2014 Modified Files: src/distrib/notes/common [netbsd-5-2]: main src/doc [netbsd-5-2]: CHANGES-5.2.2 LAST_MINUTE src/gnu/usr.bin/groff/tmac [netbsd-5-2]: mdoc.local src/sys/sys [netbsd-5-2]: param.h Log Message: distrib/notes/common/main patched by hand doc/LAST_MINUTE patched by hand gnu/usr.bin/groff/tmac/mdoc.local patched by hand sys/sys/param.h patched by hand Welcome to 5.2.2! [bouyer] To generate a diff of this commit: cvs rdiff -u -r1.425.2.16.2.2 -r1.425.2.16.2.3 src/distrib/notes/common/main cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/doc/CHANGES-5.2.2 cvs rdiff -u -r1.2.30.3.2.1 -r1.2.30.3.2.2 src/doc/LAST_MINUTE cvs rdiff -u -r1.43.4.18.2.3 -r1.43.4.18.2.4 \ src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.330.4.18.2.3 -r1.330.4.18.2.4 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.425.2.16.2.2 src/distrib/notes/common/main:1.425.2.16.2.3 --- src/distrib/notes/common/main:1.425.2.16.2.2 Mon Jan 13 21:51:56 2014 +++ src/distrib/notes/common/main Fri Jan 17 17:00:03 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.425.2.16.2.2 2014/01/13 21:51:56 bouyer Exp $ +.\ $NetBSD: main,v 1.425.2.16.2.3 2014/01/17 17:00:03 bouyer Exp $ .\ .\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -482,8 +482,8 @@ ntpd used as DDoS amplifier . .Pp Advisories prior to NetBSD-SA2013-010 do not affect -NetBSD 5.2.1: -.Lk http://www.NetBSD.org/support/security/patches-5.2.1.html . +NetBSD 5.2.2: +.Lk http://www.NetBSD.org/support/security/patches-5.2.2.html . .Ss2 Kernel .(bullet Xen: remove a bogus diagostic message spamming the console. (PR#46313): Index: src/doc/CHANGES-5.2.2 diff -u src/doc/CHANGES-5.2.2:1.1.2.9 src/doc/CHANGES-5.2.2:1.1.2.10 --- src/doc/CHANGES-5.2.2:1.1.2.9 Wed Jan 15 10:12:25 2014 +++ src/doc/CHANGES-5.2.2 Fri Jan 17 17:00:03 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.2,v 1.1.2.9 2014/01/15 10:12:25 bouyer Exp $ +# $NetBSD: CHANGES-5.2.2,v 1.1.2.10 2014/01/17 17:00:03 bouyer Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.2.1 release: @@ -70,3 +70,11 @@ dist/bind/bin/named/query.c patch when serving NSEC3 signed zones. [RT #35120] [spz, ticket #1897] +distrib/notes/common/main patched by hand +doc/LAST_MINUTE patched by hand +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 5.2.2! + [bouyer] + Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.30.3.2.1 src/doc/LAST_MINUTE:1.2.30.3.2.2 --- src/doc/LAST_MINUTE:1.2.30.3.2.1 Sun Sep 22 22:43:10 2013 +++ src/doc/LAST_MINUTE Fri Jan 17 17:00:03 2014 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.30.3.2.1 2013/09/22 22:43:10 riz Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.30.3.2.2 2014/01/17 17:00:03 bouyer Exp $ -This file contains important information on the NetBSD 5.2.1 release that +This file contains important information on the NetBSD 5.2.2 release that did not make it into the main documentation. [all] Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18.2.3 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18.2.4 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18.2.3 Sun Oct 13 07:22:18 2013 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Fri Jan 17 17:00:03 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: mdoc.local,v 1.43.4.18.2.3 2013/10/13 07:22:18 jdc Exp $ +.\ $NetBSD: mdoc.local,v 1.43.4.18.2.4 2014/01/17 17:00:03 bouyer Exp $ .\ .\ Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -60,7 +60,7 @@ .ds doc-operating-system-NetBSD-5.15.1 .ds doc-operating-system-NetBSD-5.25.2 .ds doc-operating-system-NetBSD-5.2.1 5.2.1 -.ds doc-operating-system-NetBSD-5.2.1 5.2.2 +.ds doc-operating-system-NetBSD-5.2.2 5.2.2 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-6.1 6.1 .ds doc-operating-system-FreeBSD-6.3 6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.330.4.18.2.3 src/sys/sys/param.h:1.330.4.18.2.4 --- src/sys/sys/param.h:1.330.4.18.2.3 Sun Oct 13 07:22:18 2013 +++ src/sys/sys/param.h Fri Jan 17 17:00:04 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.330.4.18.2.3 2013/10/13 07:22:18 jdc Exp $ */ +/* $NetBSD: param.h,v 1.330.4.18.2.4 2014/01/17 17:00:04 bouyer Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 502000101 /* NetBSD 5.2.1_PATCH */ +#define __NetBSD_Version__ 502000200 /* NetBSD 5.2.2
CVS commit: src/external/bsd/ntp/dist/ntpd
Module Name:src
Committed By: roy
Date: Fri Jan 17 17:25:47 UTC 2014
Modified Files:
src/external/bsd/ntp/dist/ntpd: ntp_io.c
Log Message:
Do not try to bind to un-useable IPv6 addresses.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/dist/ntpd/ntp_io.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/ntp/dist/ntpd/ntp_io.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_io.c:1.12 src/external/bsd/ntp/dist/ntpd/ntp_io.c:1.13
--- src/external/bsd/ntp/dist/ntpd/ntp_io.c:1.12 Sat Dec 28 17:00:50 2013
+++ src/external/bsd/ntp/dist/ntpd/ntp_io.c Fri Jan 17 17:25:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_io.c,v 1.12 2013/12/28 17:00:50 christos Exp $ */
+/* $NetBSD: ntp_io.c,v 1.13 2014/01/17 17:25:47 roy Exp $ */
/*
* ntp_io.c - input/output routines for ntpd. The socket-opening code
@@ -1632,16 +1632,15 @@ set_wildcard_reuse(
static isc_boolean_t
-is_anycast(
+check_flags6(
sockaddr_u *psau,
- const char *name
+ const char *name,
+ u_int32 flags6
)
{
-#if defined(INCLUDE_IPV6_SUPPORT) defined(SIOCGIFAFLAG_IN6) \
-defined(IN6_IFF_ANYCAST)
+#if defined(INCLUDE_IPV6_SUPPORT) defined(SIOCGIFAFLAG_IN6)
struct in6_ifreq ifr6;
int fd;
- u_int32 flags6;
if (psau-sa.sa_family != AF_INET6)
return ISC_FALSE;
@@ -1655,13 +1654,45 @@ is_anycast(
return ISC_FALSE;
}
close(fd);
- flags6 = ifr6.ifr_ifru.ifru_flags6;
- if ((flags6 IN6_IFF_ANYCAST) != 0)
+ if ((ifr6.ifr_ifru.ifru_flags6 flags6) != 0)
return ISC_TRUE;
-#endif /* INCLUDE_IPV6_SUPPORT SIOCGIFAFLAG_IN6 IN6_IFF_ANYCAST */
+#endif /* INCLUDE_IPV6_SUPPORT SIOCGIFAFLAG_IN6 */
return ISC_FALSE;
}
+static isc_boolean_t
+is_anycast(
+ sockaddr_u *psau,
+ const char *name
+ )
+{
+#ifdef IN6_IFF_ANYCAST
+ return check_flags6(psau, name, IN6_IFF_ANYCAST);
+#else
+ return ISC_FALSE;
+#endif
+}
+
+static isc_boolean_t
+is_valid(
+ sockaddr_u *psau,
+ const char *name
+ )
+{
+ u_int32 flags6;
+
+ flags6 = 0;
+#ifdef IN6_IFF_DEPARTED
+ flags6 |= IN6_IFF_DEPARTED;
+#endif
+#ifdef IN6_IFF_DETACHED
+ flags6 |= IN6_IFF_DETACHED;
+#endif
+#ifdef IN6_IFF_TENTATIVE
+ flags6 |= IN6_IFF_TENTATIVE;
+#endif
+ return check_flags6(psau, name, flags6) ? ISC_FALSE : ISC_TRUE;
+}
/*
* update_interface strategy
@@ -1795,6 +1826,12 @@ update_interfaces(
continue;
/*
+ * skip any address that is an invalid state to be used
+ */
+ if (!is_valid(enumep.sin, isc_if.name))
+ continue;
+
+ /*
* map to local *address* in order to map all duplicate
* interfaces to an endpt structure with the appropriate
* socket. Our name space is (ip-address), NOT
CVS commit: [netbsd-6-0] src
Module Name:src Committed By: bouyer Date: Fri Jan 17 18:02:51 UTC 2014 Modified Files: src/distrib/notes/common [netbsd-6-0]: main src/doc [netbsd-6-0]: CHANGES-6.0.4 LAST_MINUTE src/sys/sys [netbsd-6-0]: param.h Log Message: distrib/notes/common/main patched by hand doc/LAST_MINUTE patched by hand sys/sys/param.h patched by hand Welcome to 6.0.4! [bouyer] To generate a diff of this commit: cvs rdiff -u -r1.484.2.4.2.5 -r1.484.2.4.2.6 src/distrib/notes/common/main cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/doc/CHANGES-6.0.4 cvs rdiff -u -r1.2.40.1.4.3 -r1.2.40.1.4.4 src/doc/LAST_MINUTE cvs rdiff -u -r1.408.2.6.2.7 -r1.408.2.6.2.8 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.484.2.4.2.5 src/distrib/notes/common/main:1.484.2.4.2.6 --- src/distrib/notes/common/main:1.484.2.4.2.5 Sun Jan 12 16:06:36 2014 +++ src/distrib/notes/common/main Fri Jan 17 18:02:51 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.484.2.4.2.5 2014/01/12 16:06:36 bouyer Exp $ +.\ $NetBSD: main,v 1.484.2.4.2.6 2014/01/17 18:02:51 bouyer Exp $ .\ .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -493,8 +493,8 @@ ntpd used as DDoS amplifier . .Pp Advisories prior to NetBSD-SA2013-009 do not affect -NetBSD 6.0.3: -.Lk http://www.NetBSD.org/support/security/patches-6.0.3.html . +NetBSD 6.0.4: +.Lk http://www.NetBSD.org/support/security/patches-6.0.4.html . .Ss2 Kernel .(bullet .Xr pci 4 : Index: src/doc/CHANGES-6.0.4 diff -u src/doc/CHANGES-6.0.4:1.1.2.16 src/doc/CHANGES-6.0.4:1.1.2.17 --- src/doc/CHANGES-6.0.4:1.1.2.16 Wed Jan 15 10:07:49 2014 +++ src/doc/CHANGES-6.0.4 Fri Jan 17 18:02:51 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.4,v 1.1.2.16 2014/01/15 10:07:49 bouyer Exp $ +# $NetBSD: CHANGES-6.0.4,v 1.1.2.17 2014/01/17 18:02:51 bouyer Exp $ A complete list of changes from the NetBSD 6.0.3 release to the NetBSD 6.0.4 release: @@ -175,3 +175,10 @@ external/bsd/bind/dist/bin/named/query.c when serving NSEC3 signed zones. [RT #35120] [spz, ticket #1016] +distrib/notes/common/main patched by hand +doc/LAST_MINUTE patched by hand +sys/sys/param.h patched by hand + + Welcome to 6.0.4! + [bouyer] + Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.40.1.4.3 src/doc/LAST_MINUTE:1.2.40.1.4.4 --- src/doc/LAST_MINUTE:1.2.40.1.4.3 Thu Sep 26 15:41:52 2013 +++ src/doc/LAST_MINUTE Fri Jan 17 18:02:51 2014 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.40.1.4.3 2013/09/26 15:41:52 riz Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.40.1.4.4 2014/01/17 18:02:51 bouyer Exp $ -This file contains important information on the NetBSD 6.0.3 release that +This file contains important information on the NetBSD 6.0.4 release that did not make it into the main documentation. [all] Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.408.2.6.2.7 src/sys/sys/param.h:1.408.2.6.2.8 --- src/sys/sys/param.h:1.408.2.6.2.7 Sat Oct 12 18:53:18 2013 +++ src/sys/sys/param.h Fri Jan 17 18:02:51 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.408.2.6.2.7 2013/10/12 18:53:18 jdc Exp $ */ +/* $NetBSD: param.h,v 1.408.2.6.2.8 2014/01/17 18:02:51 bouyer Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 60301 /* NetBSD 6.0.3_PATCH */ +#define __NetBSD_Version__ 60400 /* NetBSD 6.0.4 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: [netbsd-6-1] src
Module Name:src Committed By: bouyer Date: Fri Jan 17 18:11:37 UTC 2014 Modified Files: src/distrib/notes/common [netbsd-6-1]: main src/doc [netbsd-6-1]: CHANGES-6.1.3 LAST_MINUTE README.files src/sys/sys [netbsd-6-1]: param.h Log Message: distrib/notes/common/main patched by hand doc/LAST_MINUTE patched by hand doc/README.filespatched by hand sys/sys/param.h patched by hand Welcome to 6.1.3! [bouyer] To generate a diff of this commit: cvs rdiff -u -r1.484.2.6.2.4 -r1.484.2.6.2.5 src/distrib/notes/common/main cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/doc/CHANGES-6.1.3 cvs rdiff -u -r1.2.40.2.2.2 -r1.2.40.2.2.3 src/doc/LAST_MINUTE cvs rdiff -u -r1.4.20.2.2.4 -r1.4.20.2.2.5 src/doc/README.files cvs rdiff -u -r1.408.2.12.2.5 -r1.408.2.12.2.6 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.484.2.6.2.4 src/distrib/notes/common/main:1.484.2.6.2.5 --- src/distrib/notes/common/main:1.484.2.6.2.4 Sun Jan 12 16:06:49 2014 +++ src/distrib/notes/common/main Fri Jan 17 18:11:37 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.484.2.6.2.4 2014/01/12 16:06:49 bouyer Exp $ +.\ $NetBSD: main,v 1.484.2.6.2.5 2014/01/17 18:11:37 bouyer Exp $ .\ .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -499,8 +499,8 @@ ntpd used as DDoS amplifier . .Pp Advisories prior to NetBSD-SA2013-009 do not affect -NetBSD 6.1.2: -.Lk http://www.NetBSD.org/support/security/patches-6.1.2.html . +NetBSD 6.1.3: +.Lk http://www.NetBSD.org/support/security/patches-6.1.3.html . .Ss2 Kernel .(bullet .Xr pci 4 : Index: src/doc/CHANGES-6.1.3 diff -u src/doc/CHANGES-6.1.3:1.1.2.17 src/doc/CHANGES-6.1.3:1.1.2.18 --- src/doc/CHANGES-6.1.3:1.1.2.17 Wed Jan 15 10:07:39 2014 +++ src/doc/CHANGES-6.1.3 Fri Jan 17 18:11:37 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.3,v 1.1.2.17 2014/01/15 10:07:39 bouyer Exp $ +# $NetBSD: CHANGES-6.1.3,v 1.1.2.18 2014/01/17 18:11:37 bouyer Exp $ A complete list of changes from the NetBSD 6.1.2 release to the NetBSD 6.1.3 release: @@ -183,3 +183,11 @@ external/bsd/bind/dist/bin/named/query.c when serving NSEC3 signed zones. [RT #35120] [spz, ticket #1016] +distrib/notes/common/main patched by hand +doc/LAST_MINUTE patched by hand +doc/README.filespatched by hand +sys/sys/param.h patched by hand + + Welcome to 6.1.3! + [bouyer] + Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.40.2.2.2 src/doc/LAST_MINUTE:1.2.40.2.2.3 --- src/doc/LAST_MINUTE:1.2.40.2.2.2 Thu Sep 26 15:36:34 2013 +++ src/doc/LAST_MINUTE Fri Jan 17 18:11:37 2014 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.40.2.2.2 2013/09/26 15:36:34 riz Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.40.2.2.3 2014/01/17 18:11:37 bouyer Exp $ -This file contains important information on the NetBSD 6.1.2 release that +This file contains important information on the NetBSD 6.1.3 release that did not make it into the main documentation. [all] Index: src/doc/README.files diff -u src/doc/README.files:1.4.20.2.2.4 src/doc/README.files:1.4.20.2.2.5 --- src/doc/README.files:1.4.20.2.2.4 Sat Oct 12 18:53:47 2013 +++ src/doc/README.files Fri Jan 17 18:11:37 2014 @@ -1,4 +1,4 @@ -# $NetBSD: README.files,v 1.4.20.2.2.4 2013/10/12 18:53:47 jdc Exp $ +# $NetBSD: README.files,v 1.4.20.2.2.5 2014/01/17 18:11:37 bouyer Exp $ What's in this directory: @@ -37,7 +37,7 @@ source/patches/ Post-release source code In addition to the files and directories listed above, there is one directory per architecture, for each of the architectures for which -NetBSD 6.1.2 has a binary distribution. The contents of each +NetBSD 6.1.3 has a binary distribution. The contents of each architecture's directory are described in an INSTALL file found in that directory. Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.408.2.12.2.5 src/sys/sys/param.h:1.408.2.12.2.6 --- src/sys/sys/param.h:1.408.2.12.2.5 Sat Oct 12 18:53:47 2013 +++ src/sys/sys/param.h Fri Jan 17 18:11:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.408.2.12.2.5 2013/10/12 18:53:47 jdc Exp $ */ +/* $NetBSD: param.h,v 1.408.2.12.2.6 2014/01/17 18:11:37 bouyer Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 601000201 /* NetBSD 6.1.2_PATCH */ +#define __NetBSD_Version__ 601000300 /* NetBSD 6.1.3 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: bouyer Date: Fri Jan 17 18:14:14 UTC 2014 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.4 README.files Log Message: distrib/notes/common/main patch doc/LAST_MINUTE patch doc/README.filespatch sys/sys/param.h patch Welcome to 5.1.4! [bouyer] To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-5.1.4 cvs rdiff -u -r1.4.10.3.2.4 -r1.4.10.3.2.5 src/doc/README.files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1.4 diff -u src/doc/CHANGES-5.1.4:1.1.2.10 src/doc/CHANGES-5.1.4:1.1.2.11 --- src/doc/CHANGES-5.1.4:1.1.2.10 Fri Jan 17 16:44:06 2014 +++ src/doc/CHANGES-5.1.4 Fri Jan 17 18:14:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.4,v 1.1.2.10 2014/01/17 16:44:06 bouyer Exp $ +# $NetBSD: CHANGES-5.1.4,v 1.1.2.11 2014/01/17 18:14:13 bouyer Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -72,6 +72,7 @@ dist/bind/bin/named/query.c patch distrib/notes/common/main patch doc/LAST_MINUTE patch +doc/README.filespatch sys/sys/param.h patch Welcome to 5.1.4! Index: src/doc/README.files diff -u src/doc/README.files:1.4.10.3.2.4 src/doc/README.files:1.4.10.3.2.5 --- src/doc/README.files:1.4.10.3.2.4 Sun Oct 13 07:22:07 2013 +++ src/doc/README.files Fri Jan 17 18:14:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: README.files,v 1.4.10.3.2.4 2013/10/13 07:22:07 jdc Exp $ +# $NetBSD: README.files,v 1.4.10.3.2.5 2014/01/17 18:14:13 bouyer Exp $ What's in this directory: @@ -30,7 +30,7 @@ source/sets/ Source distribution sets; s In addition to the files and directories listed above, there is one directory per architecture, for each of the architectures for which -NetBSD 5.1.2 has a binary distribution. The contents of each +NetBSD 5.1.4 has a binary distribution. The contents of each architecture's directory are described in an INSTALL file found in that directory.
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: bouyer Date: Fri Jan 17 18:17:05 UTC 2014 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.2 README.files Log Message: distrib/notes/common/main patched by hand doc/LAST_MINUTE patched by hand doc/README.filespatched by hand gnu/usr.bin/groff/tmac/mdoc.local patched by hand sys/sys/param.h patched by hand Welcome to 5.2.2! [bouyer] To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-5.2.2 cvs rdiff -u -r1.4.10.4.2.2 -r1.4.10.4.2.3 src/doc/README.files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2.2 diff -u src/doc/CHANGES-5.2.2:1.1.2.10 src/doc/CHANGES-5.2.2:1.1.2.11 --- src/doc/CHANGES-5.2.2:1.1.2.10 Fri Jan 17 17:00:03 2014 +++ src/doc/CHANGES-5.2.2 Fri Jan 17 18:17:05 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.2,v 1.1.2.10 2014/01/17 17:00:03 bouyer Exp $ +# $NetBSD: CHANGES-5.2.2,v 1.1.2.11 2014/01/17 18:17:05 bouyer Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.2.1 release: @@ -72,6 +72,7 @@ dist/bind/bin/named/query.c patch distrib/notes/common/main patched by hand doc/LAST_MINUTE patched by hand +doc/README.filespatched by hand gnu/usr.bin/groff/tmac/mdoc.local patched by hand sys/sys/param.h patched by hand Index: src/doc/README.files diff -u src/doc/README.files:1.4.10.4.2.2 src/doc/README.files:1.4.10.4.2.3 --- src/doc/README.files:1.4.10.4.2.2 Sun Oct 13 07:22:18 2013 +++ src/doc/README.files Fri Jan 17 18:17:05 2014 @@ -1,4 +1,4 @@ -# $NetBSD: README.files,v 1.4.10.4.2.2 2013/10/13 07:22:18 jdc Exp $ +# $NetBSD: README.files,v 1.4.10.4.2.3 2014/01/17 18:17:05 bouyer Exp $ What's in this directory: @@ -28,7 +28,7 @@ source/sets/ Source distribution sets; s In addition to the files and directories listed above, there is one directory per architecture, for each of the architectures for which -NetBSD 5.1 has a binary distribution. The contents of each +NetBSD 5.2.2 has a binary distribution. The contents of each architecture's directory are described in an INSTALL file found in that directory.
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: bouyer Date: Fri Jan 17 18:19:15 UTC 2014 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.4 README.files Log Message: distrib/notes/common/main patched by hand doc/LAST_MINUTE patched by hand doc/README.filespatched by hand sys/sys/param.h patched by hand Welcome to 6.0.4! [bouyer] To generate a diff of this commit: cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/doc/CHANGES-6.0.4 cvs rdiff -u -r1.4.20.1.2.4 -r1.4.20.1.2.5 src/doc/README.files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.4 diff -u src/doc/CHANGES-6.0.4:1.1.2.17 src/doc/CHANGES-6.0.4:1.1.2.18 --- src/doc/CHANGES-6.0.4:1.1.2.17 Fri Jan 17 18:02:51 2014 +++ src/doc/CHANGES-6.0.4 Fri Jan 17 18:19:15 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.4,v 1.1.2.17 2014/01/17 18:02:51 bouyer Exp $ +# $NetBSD: CHANGES-6.0.4,v 1.1.2.18 2014/01/17 18:19:15 bouyer Exp $ A complete list of changes from the NetBSD 6.0.3 release to the NetBSD 6.0.4 release: @@ -177,6 +177,7 @@ external/bsd/bind/dist/bin/named/query.c distrib/notes/common/main patched by hand doc/LAST_MINUTE patched by hand +doc/README.filespatched by hand sys/sys/param.h patched by hand Welcome to 6.0.4! Index: src/doc/README.files diff -u src/doc/README.files:1.4.20.1.2.4 src/doc/README.files:1.4.20.1.2.5 --- src/doc/README.files:1.4.20.1.2.4 Sat Oct 12 18:53:17 2013 +++ src/doc/README.files Fri Jan 17 18:19:15 2014 @@ -1,4 +1,4 @@ -# $NetBSD: README.files,v 1.4.20.1.2.4 2013/10/12 18:53:17 jdc Exp $ +# $NetBSD: README.files,v 1.4.20.1.2.5 2014/01/17 18:19:15 bouyer Exp $ What's in this directory: @@ -37,7 +37,7 @@ source/patches/ Post-release source code In addition to the files and directories listed above, there is one directory per architecture, for each of the architectures for which -NetBSD XXX.XXX has a binary distribution. The contents of each +NetBSD 6.0.4 has a binary distribution. The contents of each architecture's directory are described in an INSTALL file found in that directory.
CVS commit: src/external/bsd/dhcpcd/sbin/dhcpcd
Module Name:src
Committed By: roy
Date: Fri Jan 17 18:36:25 UTC 2014
Modified Files:
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile
Log Message:
Specify correct run directory.
Fixes PR bin/48529 thanks to martin@
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.18 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.19
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.18 Wed Jan 15 20:58:53 2014
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Fri Jan 17 18:36:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/01/15 20:58:53 roy Exp $
+# $NetBSD: Makefile,v 1.19 2014/01/17 18:36:25 roy Exp $
#
PROG= dhcpcd
@@ -44,6 +44,7 @@ CLEANFILES= dhcpcd.conf.5 dhcpcd.8 \
${f}: ${f}.in
${TOOL_SED} -e 's:@SYSCONFDIR@:/etc:g' -e 's:@DBDIR@:/var/db:g' \
-e 's:@LIBDIR@:/lib:g' \
+ -e 's:@RUNDIR@:/var/run:g' \
-e 's:@HOOKDIR@:/libexec/dhcpcd-hooks:g' \
-e 's:@SCRIPT@:/libexec/dhcpcd-run-hooks:g' \
-e 's:@SERVICEEXISTS@::g' \
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: martin
Date: Fri Jan 17 19:06:57 UTC 2014
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Add a check to remove the temporarily (eroneously) created /@RUNDIR@
(PR bin/48529)
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/usr.sbin/postinstall/postinstall
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/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.161 src/usr.sbin/postinstall/postinstall:1.162
--- src/usr.sbin/postinstall/postinstall:1.161 Tue Dec 17 12:51:26 2013
+++ src/usr.sbin/postinstall/postinstall Fri Jan 17 19:06:57 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.161 2013/12/17 12:51:26 njoly Exp $
+# $NetBSD: postinstall,v 1.162 2014/01/17 19:06:57 martin Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -796,6 +796,30 @@ do_dhcpcd()
}
#
+# dhcpcdrundir
+#
+additem dhcpcdrundir accientaly created /@RUNDIR@ does not exist
+do_dhcpcdrundir()
+{
+ [ -n $1 ] || err 3 USAGE: do_dhcpcdrundir fix|check
+ op=$1
+ failed=0
+
+ if [ -d /@RUNDIR@ ]; then
+ if [ ${op} = check ]; then
+ msg Remove eroneously created /@RUNDIR@
+ failed=1
+ elif ! eval rm -r /@RUNDIR@; then
+ msg Failed to remove /@RUNDIR@
+ failed=1
+ else
+ msg Removed eroneously created /@RUNDIR@
+ fi
+ fi
+ return ${failed}
+}
+
+#
# envsys
#
additem envsys envsys configuration is up to date
CVS commit: src/tests/crypto/opencrypto
Module Name:src
Committed By: pgoyette
Date: Fri Jan 17 19:35:33 UTC 2014
Modified Files:
src/tests/crypto/opencrypto: h_null.c t_opencrypto.sh
Log Message:
Reenable h_null (NULL_CBC) test. It works if we correctly pass a NULL iv.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/crypto/opencrypto/h_null.c \
src/tests/crypto/opencrypto/t_opencrypto.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/opencrypto/h_null.c
diff -u src/tests/crypto/opencrypto/h_null.c:1.2 src/tests/crypto/opencrypto/h_null.c:1.3
--- src/tests/crypto/opencrypto/h_null.c:1.2 Fri Jan 17 14:16:08 2014
+++ src/tests/crypto/opencrypto/h_null.c Fri Jan 17 19:35:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: h_null.c,v 1.2 2014/01/17 14:16:08 pgoyette Exp $ */
+/* $NetBSD: h_null.c,v 1.3 2014/01/17 19:35:33 pgoyette Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -37,12 +37,7 @@
#include crypto/cryptodev.h
unsigned char key[] = abcdefgh;
-unsigned char iv[8] = {0};
char plaintx[16] = 1234567890123456;
-const unsigned char ciphertx[16] = {
- 0x21, 0xc6, 0x0d, 0xa5, 0x34, 0x24, 0x8b, 0xce,
- 0x95, 0x86, 0x64, 0xb3, 0x66, 0x77, 0x9b, 0x4c
-};
int
main(void)
@@ -70,12 +65,11 @@ main(void)
co.src = plaintx;
co.dst = buf;
co.dst_len = sizeof(buf);
- co.iv = iv;
res = ioctl(fd, CIOCCRYPT, co);
if (res 0)
err(1, CIOCCRYPT);
- if (memcmp(co.dst, ciphertx, sizeof(ciphertx)))
+ if (memcmp(co.dst, plaintx, sizeof(plaintx)))
errx(1, verification failed);
return 0;
Index: src/tests/crypto/opencrypto/t_opencrypto.sh
diff -u src/tests/crypto/opencrypto/t_opencrypto.sh:1.2 src/tests/crypto/opencrypto/t_opencrypto.sh:1.3
--- src/tests/crypto/opencrypto/t_opencrypto.sh:1.2 Fri Jan 17 14:14:54 2014
+++ src/tests/crypto/opencrypto/t_opencrypto.sh Fri Jan 17 19:35:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_opencrypto.sh,v 1.2 2014/01/17 14:14:54 pgoyette Exp $
+# $NetBSD: t_opencrypto.sh,v 1.3 2014/01/17 19:35:33 pgoyette Exp $
#
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -215,7 +215,6 @@ md5_hmac_cleanup() {
atf_test_case null cleanup
null_head() {
- atf_skip NULL_CBC not implemented by swcrypto
common_head Test NULL_CBC crypto
}
CVS commit: src/tests/crypto/opencrypto
Module Name:src
Committed By: pgoyette
Date: Fri Jan 17 19:39:51 UTC 2014
Modified Files:
src/tests/crypto/opencrypto: h_camellia.c
Log Message:
Use RFC 3713 vector, add comment to identify the source
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/crypto/opencrypto/h_camellia.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/opencrypto/h_camellia.c
diff -u src/tests/crypto/opencrypto/h_camellia.c:1.2 src/tests/crypto/opencrypto/h_camellia.c:1.3
--- src/tests/crypto/opencrypto/h_camellia.c:1.2 Fri Jan 17 14:16:08 2014
+++ src/tests/crypto/opencrypto/h_camellia.c Fri Jan 17 19:39:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: h_camellia.c,v 1.2 2014/01/17 14:16:08 pgoyette Exp $ */
+/* $NetBSD: h_camellia.c,v 1.3 2014/01/17 19:39:51 pgoyette Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -36,6 +36,7 @@
#include crypto/cryptodev.h
+/* Test vector from RFC3713 */
unsigned char key[32] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
@@ -44,8 +45,8 @@ unsigned char iv[16] = {0};
char plaintx[16] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10};
const unsigned char ciphertx[16] = {
- 0xe4, 0x09, 0x5d, 0x4f, 0xb7, 0xa7, 0xb3, 0x79,
- 0x2d, 0x61, 0x75, 0xa3, 0x26, 0x13, 0x11, 0xb8
+ 0x9a, 0xcc, 0x23, 0x7d, 0xff, 0x16, 0xd7, 0x6c,
+ 0x20, 0xef, 0x7c, 0x91, 0x9e, 0x3a, 0x75, 0x09
};
int
CVS commit: src/external/bsd/file
Module Name:src
Committed By: martin
Date: Fri Jan 17 20:24:20 UTC 2014
Modified Files:
src/external/bsd/file: Makefile.inc
Log Message:
Make a gcc 4.8 warning non-fatal (couldn't find a way to avoid it, the
data is initialized via memcpy to a void pointer, so the may be uninitialized
warning is not true)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/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/external/bsd/file/Makefile.inc
diff -u src/external/bsd/file/Makefile.inc:1.4 src/external/bsd/file/Makefile.inc:1.5
--- src/external/bsd/file/Makefile.inc:1.4 Sun Dec 1 20:15:42 2013
+++ src/external/bsd/file/Makefile.inc Fri Jan 17 20:24:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2013/12/01 20:15:42 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2014/01/17 20:24:20 martin Exp $
WARNS=4
DIST=${NETBSDSRCDIR}/external/bsd/file/dist
@@ -20,4 +20,8 @@ CPPFLAGS+= -DMAGIC='${MAGIC}' -DHAVE_C
-DELFCORE -DVERSION='${VERSION}'
CPPFLAGS+= -I${.CURDIR}/../include -I${DIST}/src
+.if ${ACTIVE_CC}==gcc ${HAVE_GCC}==48
+CPPFLAGS.readelf.c += -Wno-error=maybe-uninitialized
+.endif
+
.PATH: ${DIST}/src ${DIST}/doc
CVS commit: src/lib/libc/arch/arm
Module Name:src
Committed By: joerg
Date: Fri Jan 17 22:19:46 UTC 2014
Modified Files:
src/lib/libc/arch/arm: Makefile.inc
src/lib/libc/arch/arm/gen: Makefile.inc
Added Files:
src/lib/libc/arch/arm/hardfloat: fabs_ieee754.S
Removed Files:
src/lib/libc/arch/arm/hardfloat: fabs.S
Log Message:
Use generic version of fabs for softfloat.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/lib/libc/arch/arm/Makefile.inc
cvs rdiff -u -r1.26 -r1.27 src/lib/libc/arch/arm/gen/Makefile.inc
cvs rdiff -u -r1.2 -r0 src/lib/libc/arch/arm/hardfloat/fabs.S
cvs rdiff -u -r0 -r1.1 src/lib/libc/arch/arm/hardfloat/fabs_ieee754.S
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/arch/arm/Makefile.inc
diff -u src/lib/libc/arch/arm/Makefile.inc:1.25 src/lib/libc/arch/arm/Makefile.inc:1.26
--- src/lib/libc/arch/arm/Makefile.inc:1.25 Tue Sep 3 00:30:19 2013
+++ src/lib/libc/arch/arm/Makefile.inc Fri Jan 17 22:19:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.25 2013/09/03 00:30:19 matt Exp $
+# $NetBSD: Makefile.inc,v 1.26 2014/01/17 22:19:46 joerg Exp $
.include bsd.own.mk
@@ -30,7 +30,7 @@ SOFTFLOAT_BITS=32
.include softfloat/Makefile.inc
.else
.PATH : ${ARCHDIR}/hardfloat
-SRCS.hardfloat+= fpgetround.c fpgetsticky.S fpgetmask.S
+SRCS.hardfloat+= fpgetround.c fpgetsticky.S fpgetmask.S fabs_ieee754.S
SRCS.hardfloat+= fpsetround.c fpsetmask.S fpsetsticky.S
.for f in ${SRCS.hardfloat}
CPPFLAGS.${f} += -mfpu=vfp
Index: src/lib/libc/arch/arm/gen/Makefile.inc
diff -u src/lib/libc/arch/arm/gen/Makefile.inc:1.26 src/lib/libc/arch/arm/gen/Makefile.inc:1.27
--- src/lib/libc/arch/arm/gen/Makefile.inc:1.26 Wed Dec 25 22:05:12 2013
+++ src/lib/libc/arch/arm/gen/Makefile.inc Fri Jan 17 22:19:46 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.26 2013/12/25 22:05:12 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.27 2014/01/17 22:19:46 joerg Exp $
SRCS+= alloca.S byte_swap_2.S byte_swap_4.S bswap64.c divide.S divsi3.S \
- fabs.c flt_rounds.c udivsi3.S
+ fabs_ieee754.c flt_rounds.c udivsi3.S
CPUFLAGS.divide.S+= -marm
Added files:
Index: src/lib/libc/arch/arm/hardfloat/fabs_ieee754.S
diff -u /dev/null src/lib/libc/arch/arm/hardfloat/fabs_ieee754.S:1.1
--- /dev/null Fri Jan 17 22:19:46 2014
+++ src/lib/libc/arch/arm/hardfloat/fabs_ieee754.S Fri Jan 17 22:19:46 2014
@@ -0,0 +1,40 @@
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * 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 arm/asm.h
+
+RCSID($NetBSD: fabs_ieee754.S,v 1.1 2014/01/17 22:19:46 joerg Exp $)
+
+ .fpu vfp
+
+ENTRY(fabsl)
+ENTRY(fabs)
+ vabs.f64 d0, d0
+ RET
+END(fabs)
CVS commit: src/lib/libc/arch/arm/gen
Module Name:src Committed By: joerg Date: Fri Jan 17 22:20:04 UTC 2014 Removed Files: src/lib/libc/arch/arm/gen: fabs.c Log Message: GC To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/lib/libc/arch/arm/gen/fabs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/crypto/opencrypto
Module Name:src
Committed By: pgoyette
Date: Fri Jan 17 22:33:02 UTC 2014
Modified Files:
src/tests/crypto/opencrypto: Makefile
Added Files:
src/tests/crypto/opencrypto: h_sha1hmac.c
Log Message:
Additional tests for SHA1_HMAC (with test cases from RFC2202)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/crypto/opencrypto/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/crypto/opencrypto/h_sha1hmac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/opencrypto/Makefile
diff -u src/tests/crypto/opencrypto/Makefile:1.1 src/tests/crypto/opencrypto/Makefile:1.2
--- src/tests/crypto/opencrypto/Makefile:1.1 Tue Jan 14 17:51:39 2014
+++ src/tests/crypto/opencrypto/Makefile Fri Jan 17 22:33:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/01/14 17:51:39 pgoyette Exp $
+# $NetBSD: Makefile,v 1.2 2014/01/17 22:33:02 pgoyette Exp $
.include bsd.own.mk
@@ -21,6 +21,7 @@ PROGS+= h_gcm
PROGS+= h_md5
PROGS+= h_md5hmac
PROGS+= h_null
+PROGS+= h_sha1hmac
PROGS+= h_xcbcmac
LDADD.h_comp_zlib+= -lz
Added files:
Index: src/tests/crypto/opencrypto/h_sha1hmac.c
diff -u /dev/null src/tests/crypto/opencrypto/h_sha1hmac.c:1.1
--- /dev/null Fri Jan 17 22:33:03 2014
+++ src/tests/crypto/opencrypto/h_sha1hmac.c Fri Jan 17 22:33:02 2014
@@ -0,0 +1,191 @@
+/* $NetBSD: h_sha1hmac.c,v 1.1 2014/01/17 22:33:02 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include err.h
+#include fcntl.h
+#include stdio.h
+#include string.h
+
+#include sys/ioctl.h
+#include sys/time.h
+
+#include crypto/cryptodev.h
+
+#define SHA1_HMAC_KEYLEN 20 /* Only key-length we support */
+
+/* Test data from RFC2202 */
+const struct {
+ int num;
+size_t key_len;
+size_t len;
+unsigned char key[80];
+unsigned char data[80];
+unsigned char mac[20];
+} tests[] = {
+/* Test #1 */
+ { 1, 20, 8,
+ { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+ 0x0b, 0x0b, 0x0b, 0x0b },
+ Hi There,
+ { 0xb6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64,
+ 0xe2, 0x8b, 0xc0, 0xb6, 0xfb, 0x37, 0x8c, 0x8e,
+ 0xf1, 0x46, 0xbe, 0x00 }
+ },
+/* Test #2 */
+ { 2, 4, 28,
+ Jefe,
+ what do ya want for nothing?,
+ { 0xef, 0xfc, 0xdf, 0x6a, 0xe5, 0xeb, 0x2f, 0xa2,
+ 0xd2, 0x74, 0x16, 0xd5, 0xf1, 0x84, 0xdf, 0x9c,
+ 0x25, 0x9a, 0x7c, 0x79 }
+ },
+/* Test #3 */
+ { 3, 20, 50,
+ { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+ 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+ 0xaa, 0xaa, 0xaa, 0xaa },
+ { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+ 0xdd, 0xdd },
+ { 0x12, 0x5d, 0x73, 0x42, 0xb9, 0xac, 0x11, 0xcd,
+ 0x91, 0xa3, 0x9a, 0xf4, 0x8a, 0xa1, 0x7b, 0x4f,
+ 0x63, 0xf1, 0x75, 0xd3 }
+ },
+/* Test #4 */
+ { 4, 25, 50,
+ { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
+ 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
+ 0x19 },
+ { 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+ 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+ 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+ 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: pgoyette Date: Fri Jan 17 22:34:36 UTC 2014 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: Update sets lists for new h_sha1hmac test program. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.558 -r1.559 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.48 src/distrib/sets/lists/debug/mi:1.49 --- src/distrib/sets/lists/debug/mi:1.48 Wed Jan 15 15:01:24 2014 +++ src/distrib/sets/lists/debug/mi Fri Jan 17 22:34:36 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.48 2014/01/15 15:01:24 pgoyette Exp $ +# $NetBSD: mi,v 1.49 2014/01/17 22:34:36 pgoyette Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -1502,6 +1502,7 @@ ./usr/libdata/debug/usr/tests/crypto/opencrypto/h_md5.debug tests-crypto-debug debug,atf,crypto ./usr/libdata/debug/usr/tests/crypto/opencrypto/h_md5hmac.debug tests-crypto-debug debug,atf,crypto ./usr/libdata/debug/usr/tests/crypto/opencrypto/h_null.debug tests-crypto-debug debug,atf,crypto +./usr/libdata/debug/usr/tests/crypto/opencrypto/h_sha1hmac.debug tests-crypto-debug debug,atf,crypto ./usr/libdata/debug/usr/tests/crypto/opencrypto/h_xcbcmac.debug tests-crypto-debug debug,atf,crypto ./usr/libdata/debug/usr/tests/dev/audio/h_pad.debug tests-fs-debug debug,atf,rump ./usr/libdata/debug/usr/tests/dev/cgd/h_img2cgd/h_img2cgd.debug tests-obsolete obsolete Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.558 src/distrib/sets/lists/tests/mi:1.559 --- src/distrib/sets/lists/tests/mi:1.558 Wed Jan 15 10:23:32 2014 +++ src/distrib/sets/lists/tests/mi Fri Jan 17 22:34:36 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.558 2014/01/15 10:23:32 martin Exp $ +# $NetBSD: mi,v 1.559 2014/01/17 22:34:36 pgoyette Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -873,6 +873,7 @@ ./usr/tests/crypto/opencrypto/h_md5 tests-crypto-tests crypto ./usr/tests/crypto/opencrypto/h_md5hmac tests-crypto-tests crypto ./usr/tests/crypto/opencrypto/h_null tests-crypto-tests crypto +./usr/tests/crypto/opencrypto/h_sha1hmac tests-crypto-tests crypto ./usr/tests/crypto/opencrypto/h_xcbcmac tests-crypto-tests crypto ./usr/tests/crypto/opencrypto/t_opencrypto tests-crypto-tests crypto ./usr/tests/dev tests-fs-tests
CVS commit: src
Module Name:src
Committed By: joerg
Date: Sat Jan 18 01:08:56 UTC 2014
Modified Files:
src/lib/libc: Makefile
src/lib/libc/compiler_rt: Makefile.inc
src/share/mk: bsd.own.mk
Log Message:
Use a separate variable for the use of GCC's unwind code.
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/lib/libc/Makefile
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/compiler_rt/Makefile.inc
cvs rdiff -u -r1.762 -r1.763 src/share/mk/bsd.own.mk
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/Makefile
diff -u src/lib/libc/Makefile:1.161 src/lib/libc/Makefile:1.162
--- src/lib/libc/Makefile:1.161 Wed Jan 15 20:58:09 2014
+++ src/lib/libc/Makefile Sat Jan 18 01:08:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.161 2014/01/15 20:58:09 joerg Exp $
+# $NetBSD: Makefile,v 1.162 2014/01/18 01:08:56 joerg Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -99,7 +99,7 @@ CPPFLAGS+= -D__BUILD_LEGACY
.include ${.CURDIR}/time/Makefile.inc
.include ${.CURDIR}/tls/Makefile.inc
.include ${.CURDIR}/sys/Makefile.inc
-.if ${HAVE_LIBGCC} == no
+.if ${HAVE_LIBGCC_EH} == no
.include ${NETBSDSRCDIR}/sys/lib/libunwind/Makefile.inc
.endif
.include ${.CURDIR}/uuid/Makefile.inc
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.9 src/lib/libc/compiler_rt/Makefile.inc:1.10
--- src/lib/libc/compiler_rt/Makefile.inc:1.9 Fri Jan 17 14:08:59 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Sat Jan 18 01:08:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2014/01/17 14:08:59 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.10 2014/01/18 01:08:56 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -28,8 +28,7 @@ COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCD
GENERIC_SRCS+= atomic.c
.endif
-.if ${LIBC_MACHINE_ARCH} == i386 || ${LIBC_MACHINE_ARCH} == amd64
-# Requires unwind support
+.if ${HAVE_LIBGCC_EH} == no
GENERIC_SRCS+= \
gcc_personality_v0.c
.endif
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.762 src/share/mk/bsd.own.mk:1.763
--- src/share/mk/bsd.own.mk:1.762 Thu Jan 16 01:19:46 2014
+++ src/share/mk/bsd.own.mk Sat Jan 18 01:08:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.762 2014/01/16 01:19:46 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.763 2014/01/18 01:08:56 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -71,6 +71,12 @@ HAVE_LIBGCC?= no
HAVE_LIBGCC?= yes
.endif
+.if ${MKLLVM:Uno} == yes (${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64)
+HAVE_LIBGCC_EH?= no
+.else
+HAVE_LIBGCC_EH?= yes
+.endif
+
HAVE_GDB?= 7
.if (${MACHINE_ARCH} == alpha) || \
CVS commit: src/tests/crypto/opencrypto
Module Name:src Committed By: joerg Date: Sat Jan 18 02:31:14 UTC 2014 Modified Files: src/tests/crypto/opencrypto: h_md5hmac.c h_sha1hmac.c Log Message: Needs some unconst. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/crypto/opencrypto/h_md5hmac.c cvs rdiff -u -r1.1 -r1.2 src/tests/crypto/opencrypto/h_sha1hmac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/crypto/opencrypto/h_md5hmac.c diff -u src/tests/crypto/opencrypto/h_md5hmac.c:1.3 src/tests/crypto/opencrypto/h_md5hmac.c:1.4 --- src/tests/crypto/opencrypto/h_md5hmac.c:1.3 Fri Jan 17 22:31:25 2014 +++ src/tests/crypto/opencrypto/h_md5hmac.c Sat Jan 18 02:31:14 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: h_md5hmac.c,v 1.3 2014/01/17 22:31:25 pgoyette Exp $ */ +/* $NetBSD: h_md5hmac.c,v 1.4 2014/01/18 02:31:14 joerg Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -154,7 +154,7 @@ main(void) memset(cs, 0, sizeof(cs)); cs.mac = CRYPTO_MD5_HMAC; cs.mackeylen = tests[i].key_len; - cs.mackey = tests[i].key; + cs.mackey = __UNCONST(tests[i].key); res = ioctl(fd, CIOCGSESSION, cs); if (res 0) err(1, CIOCGSESSION test %d, tests[i].num); @@ -164,7 +164,7 @@ main(void) co.ses = cs.ses; co.op = COP_ENCRYPT; co.len = tests[i].len; - co.src = tests[i].data; + co.src = __UNCONST(tests[i].data); co.mac = buf; res = ioctl(fd, CIOCCRYPT, co); if (res 0) Index: src/tests/crypto/opencrypto/h_sha1hmac.c diff -u src/tests/crypto/opencrypto/h_sha1hmac.c:1.1 src/tests/crypto/opencrypto/h_sha1hmac.c:1.2 --- src/tests/crypto/opencrypto/h_sha1hmac.c:1.1 Fri Jan 17 22:33:02 2014 +++ src/tests/crypto/opencrypto/h_sha1hmac.c Sat Jan 18 02:31:14 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: h_sha1hmac.c,v 1.1 2014/01/17 22:33:02 pgoyette Exp $ */ +/* $NetBSD: h_sha1hmac.c,v 1.2 2014/01/18 02:31:14 joerg Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -164,7 +164,7 @@ main(void) memset(cs, 0, sizeof(cs)); cs.mac = CRYPTO_SHA1_HMAC; cs.mackeylen = tests[i].key_len; - cs.mackey = tests[i].key;; + cs.mackey = __UNCONST(tests[i].key); res = ioctl(fd, CIOCGSESSION, cs); if (res 0) err(1, CIOCGSESSION test %d, tests[i].num); @@ -174,7 +174,7 @@ main(void) co.ses = cs.ses; co.op = COP_ENCRYPT; co.len = tests[i].len; - co.src = tests[i].data; + co.src = __UNCONST(tests[i].data); co.mac = buf; res = ioctl(fd, CIOCCRYPT, co); if (res 0)
CVS commit: src/lib/libc/compiler_rt
Module Name:src
Committed By: joerg
Date: Sat Jan 18 03:28:28 UTC 2014
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
Log Message:
__fixsfdi is required, __fixdfsi already in softfloat.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/compiler_rt/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.10 src/lib/libc/compiler_rt/Makefile.inc:1.11
--- src/lib/libc/compiler_rt/Makefile.inc:1.10 Sat Jan 18 01:08:56 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Sat Jan 18 03:28:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2014/01/18 01:08:56 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.11 2014/01/18 03:28:28 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -43,8 +43,8 @@ GENERIC_SRCS+= \
divdf3.c \
divsf3.c \
extendsfdf2.c \
+ fixdfsi.c \
fixdfti.c \
- fixsfdi.c \
fixsfsi.c \
fixsfti.c \
floatsidf.c \
@@ -74,8 +74,8 @@ GENERIC_SRCS+= \
divsi3.c \
divti3.c \
ffsti2.c \
+ fixsfdi.c \
fixdfdi.c \
- fixdfsi.c \
fixunsdfdi.c \
fixunsdfsi.c \
fixunsdfti.c \
