CVS commit: src/doc
Module Name:src Committed By: agc Date: Sun May 6 07:28:48 UTC 2012 Modified Files: src/doc: BRANCHES Log Message: Document the new agc-netpgp-standalone branch under src/crypto/external/bsd/netpgp, used to develop a version of netpgp with its own BIGNUM/MPI, cipher and signature libraries. This will allow netpgp to be used without bootstrapping openssl first, in turn allowing netpgp to be used in places it would otherwise not be able to be used. To generate a diff of this commit: cvs rdiff -u -r1.322 -r1.323 src/doc/BRANCHES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BRANCHES diff -u src/doc/BRANCHES:1.322 src/doc/BRANCHES:1.323 --- src/doc/BRANCHES:1.322 Fri Feb 17 08:24:30 2012 +++ src/doc/BRANCHES Sun May 6 07:28:48 2012 @@ -1,4 +1,4 @@ -# $NetBSD: BRANCHES,v 1.322 2012/02/17 08:24:30 yamt Exp $ +# $NetBSD: BRANCHES,v 1.323 2012/05/06 07:28:48 agc Exp $ # # This file contains a list of branches that exist in the NetBSD CVS # tree and their current state. @@ -284,6 +284,19 @@ Maintainer: Andrew Doran a...@netbsd.org Scope: kernel Notes: Ressurect ad-audiomp, make the audio drivers MP safe. +Branch: agc-netpgp-standalone +Description: Remove dependency on openssl libraries in netpgp +Status: Active +Start Date: 5 May 2012 +End Date: +Base Tag: agc-netpgp-standalone-base +Maintainer: Alistair Crooks a...@netbsd.org +Scope: src/crypto/external/bsd/netpgp +Notes: This branch is used to develop the version of netpgp + which has its own version of bignum, ciphers, and signatures + libraries, so that it is able to operate without openssl + being in place. + Branch: bjh21-hydra Description: Simtec Hydra support and ARM SMP in general Status: Dormant
CVS commit: src/sys/rump/dev/lib/libscsitest
Module Name:src Committed By: martin Date: Sun May 6 16:33:02 UTC 2012 Modified Files: src/sys/rump/dev/lib/libscsitest: scsitest.c Log Message: If we are not delivering a host iso file (USE_TOSI_ISO is undefined), use -1 as file descriptor initially. The -2 value confused a few other checks later and led to inconsistent media present reports. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libscsitest/scsitest.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/dev/lib/libscsitest/scsitest.c diff -u src/sys/rump/dev/lib/libscsitest/scsitest.c:1.1 src/sys/rump/dev/lib/libscsitest/scsitest.c:1.2 --- src/sys/rump/dev/lib/libscsitest/scsitest.c:1.1 Tue Aug 24 11:23:35 2010 +++ src/sys/rump/dev/lib/libscsitest/scsitest.c Sun May 6 16:33:02 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: scsitest.c,v 1.1 2010/08/24 11:23:35 pooka Exp $ */ +/* $NetBSD: scsitest.c,v 1.2 2012/05/06 16:33:02 martin Exp $ */ /* * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: scsitest.c,v 1.1 2010/08/24 11:23:35 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: scsitest.c,v 1.2 2012/05/06 16:33:02 martin Exp $); #include sys/param.h #include sys/atomic.h @@ -221,7 +221,7 @@ scsitest_match(struct device *parent, st if ((isofd = rumpuser_open(MYCDISO, O_RDWR, error)) == -1) return 0; #else - isofd = -2; + isofd = -1; #endif return 1;
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: martin
Date: Sun May 6 16:42:20 UTC 2012
Modified Files:
src/sys/dev/scsipi: cd.c
Log Message:
In cdopen: make the test for media presence always silent. In all cases
requiring a message, we will most likely get that from the spinup attempt
anyway.
This avoids the spurious Check Condition on CDB, Not Ready, Medium Not
Present, Tray Closed messages at boot/shutdown time.
To generate a diff of this commit:
cvs rdiff -u -r1.307 -r1.308 src/sys/dev/scsipi/cd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.307 src/sys/dev/scsipi/cd.c:1.308
--- src/sys/dev/scsipi/cd.c:1.307 Thu Apr 19 17:45:20 2012
+++ src/sys/dev/scsipi/cd.c Sun May 6 16:42:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.307 2012/04/19 17:45:20 bouyer Exp $ */
+/* $NetBSD: cd.c,v 1.308 2012/05/06 16:42:19 martin Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cd.c,v 1.307 2012/04/19 17:45:20 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: cd.c,v 1.308 2012/05/06 16:42:19 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -382,17 +382,10 @@ cdopen(dev_t dev, int flag, int fmt, str
goto bad3;
}
} else {
- int silent;
-
- if (rawpart)
- silent = XS_CTL_SILENT;
- else
- silent = 0;
-
/* Check that it is still responding and ok. */
error = scsipi_test_unit_ready(periph,
XS_CTL_IGNORE_ILLEGAL_REQUEST | XS_CTL_IGNORE_MEDIA_CHANGE |
- silent);
+ XS_CTL_SILENT);
/*
* Start the pack spinning if necessary. Always allow the
@@ -401,6 +394,12 @@ cdopen(dev_t dev, int flag, int fmt, str
*/
if (error == EIO) {
int error2;
+ int silent;
+
+ if (rawpart)
+silent = XS_CTL_SILENT;
+ else
+silent = 0;
error2 = scsipi_start(periph, SSS_START, silent);
switch (error2) {
CVS commit: src/sys/rump/dev/lib/libscsitest
Module Name:src Committed By: martin Date: Sun May 6 16:58:31 UTC 2012 Modified Files: src/sys/rump/dev/lib/libscsitest: scsitest.c Log Message: Revert previous and add a comment - I misunderstood what this code is emulating. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libscsitest/scsitest.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/dev/lib/libscsitest/scsitest.c diff -u src/sys/rump/dev/lib/libscsitest/scsitest.c:1.2 src/sys/rump/dev/lib/libscsitest/scsitest.c:1.3 --- src/sys/rump/dev/lib/libscsitest/scsitest.c:1.2 Sun May 6 16:33:02 2012 +++ src/sys/rump/dev/lib/libscsitest/scsitest.c Sun May 6 16:58:31 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: scsitest.c,v 1.2 2012/05/06 16:33:02 martin Exp $ */ +/* $NetBSD: scsitest.c,v 1.3 2012/05/06 16:58:31 martin Exp $ */ /* * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: scsitest.c,v 1.2 2012/05/06 16:33:02 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: scsitest.c,v 1.3 2012/05/06 16:58:31 martin Exp $); #include sys/param.h #include sys/atomic.h @@ -221,7 +221,10 @@ scsitest_match(struct device *parent, st if ((isofd = rumpuser_open(MYCDISO, O_RDWR, error)) == -1) return 0; #else - isofd = -1; + /* + * We pretend to have a medium present initially, so != -1. + */ + isofd = -2; #endif return 1;
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: martin
Date: Sun May 6 17:23:10 UTC 2012
Modified Files:
src/sys/dev/scsipi: cd.c
Log Message:
When ejecting a medium, invalidate the in core disklabel - it is not
meaningfull anymore. This makes the following cdclose() use silent
mode and finally fixes PR kern/43785.
To generate a diff of this commit:
cvs rdiff -u -r1.308 -r1.309 src/sys/dev/scsipi/cd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.308 src/sys/dev/scsipi/cd.c:1.309
--- src/sys/dev/scsipi/cd.c:1.308 Sun May 6 16:42:19 2012
+++ src/sys/dev/scsipi/cd.c Sun May 6 17:23:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.308 2012/05/06 16:42:19 martin Exp $ */
+/* $NetBSD: cd.c,v 1.309 2012/05/06 17:23:10 martin Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cd.c,v 1.308 2012/05/06 16:42:19 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: cd.c,v 1.309 2012/05/06 17:23:10 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1570,7 +1570,24 @@ cdioctl(dev_t dev, u_long cmd, void *add
/* FALLTHROUGH */
case CDIOCEJECT: /* FALLTHROUGH */
case ODIOCEJECT:
- return (scsipi_start(periph, SSS_STOP|SSS_LOEJ, 0));
+ error = scsipi_start(periph, SSS_STOP|SSS_LOEJ, 0);
+ if (error == 0) {
+ int i;
+
+ /*
+ * We have just successfully ejected the medium,
+ * all partitions cached are meaningless now.
+ * Make sure cdclose() will do silent operations
+ * now by marking all partitions unused.
+ * Before any real access, a new (default-)disk-
+ * label will be generated anyway.
+ */
+ for (i = 0; i cd-sc_dk.dk_label-d_npartitions;
+ i++)
+cd-sc_dk.dk_label-d_partitions[i].p_fstype =
+ FS_UNUSED;
+ }
+ return error;
case DIOCCACHESYNC:
/* SYNCHRONISE CACHES command */
return (cdcachesync(periph, 0));
CVS commit: src/tests/dev/scsipi
Module Name:src Committed By: martin Date: Sun May 6 17:27:22 UTC 2012 Modified Files: src/tests/dev/scsipi: t_cd.c Log Message: Comment out the expected failure, as it does not trigger anymore. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/dev/scsipi/t_cd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/dev/scsipi/t_cd.c diff -u src/tests/dev/scsipi/t_cd.c:1.3 src/tests/dev/scsipi/t_cd.c:1.4 --- src/tests/dev/scsipi/t_cd.c:1.3 Sun Mar 27 08:53:56 2011 +++ src/tests/dev/scsipi/t_cd.c Sun May 6 17:27:22 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: t_cd.c,v 1.3 2011/03/27 08:53:56 mlelstv Exp $ */ +/* $NetBSD: t_cd.c,v 1.4 2012/05/06 17:27:22 martin Exp $ */ /* * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -60,7 +60,7 @@ ATF_TC_BODY(noisyeject, tc) ATF_REQUIRE_EQ(rump_scsitest_err[RUMP_SCSITEST_NOISYSYNC], 0); RL(rump_sys_close(fd)); - atf_tc_expect_fail(PR kern/43785); + // atf_tc_expect_fail(PR kern/43785); ATF_REQUIRE_EQ(rump_scsitest_err[RUMP_SCSITEST_NOISYSYNC], 0); }
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/dist/src/librsa
Module Name:src
Committed By: agc
Date: Sun May 6 17:46:45 UTC 2012
Added Files:
src/crypto/external/bsd/netpgp/dist/src/librsa [agc-netpgp-standalone]:
Makefile libnetpgprsa.3 rsa.c rsa.h rsastubs.c rsastubs.h
Log Message:
Add the RSA and DSA signature code to the agc-netpgp-standalone branch.
Despite the library name, this library implements both RSA and DSA
functionality.
XXX There is still some work to do on DSA signatures and verification. XXX
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 \
src/crypto/external/bsd/netpgp/dist/src/librsa/Makefile \
src/crypto/external/bsd/netpgp/dist/src/librsa/libnetpgprsa.3 \
src/crypto/external/bsd/netpgp/dist/src/librsa/rsa.c \
src/crypto/external/bsd/netpgp/dist/src/librsa/rsa.h \
src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c \
src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/crypto/external/bsd/netpgp/dist/src/librsa/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/src/librsa/Makefile:1.1.2.1
--- /dev/null Sun May 6 17:46:45 2012
+++ src/crypto/external/bsd/netpgp/dist/src/librsa/Makefile Sun May 6 17:46:45 2012
@@ -0,0 +1,10 @@
+LIB=netrsa
+SRCS=rsa.c stubs.c
+MKMAN=no
+WARNS=4
+CPPFLAGS+=-I${.CURDIR}/../bn
+
+INCS=rsa.h
+INCSDIR=/usr/include/netpgp
+
+.include bsd.lib.mk
Index: src/crypto/external/bsd/netpgp/dist/src/librsa/libnetpgprsa.3
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/src/librsa/libnetpgprsa.3:1.1.2.1
--- /dev/null Sun May 6 17:46:45 2012
+++ src/crypto/external/bsd/netpgp/dist/src/librsa/libnetpgprsa.3 Sun May 6 17:46:45 2012
@@ -0,0 +1,114 @@
+.\ $NetBSD: libnetpgprsa.3,v 1.1.2.1 2012/05/06 17:46:45 agc Exp $
+.\
+.\ Copyright (c) 2012 Alistair Crooks a...@netbsd.org
+.\ All rights reserved.
+.\
+.\ Redistribution and use in source and binary forms, with or without
+.\ modification, are permitted provided that the following conditions
+.\ are met:
+.\ 1. Redistributions of source code must retain the above copyright
+.\notice, this list of conditions and the following disclaimer.
+.\ 2. Redistributions in binary form must reproduce the above copyright
+.\notice, this list of conditions and the following disclaimer in the
+.\documentation and/or other materials provided with the distribution.
+.\
+.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\
+.Dd April 13, 2012
+.Dt LIBNETPGPRSA 3
+.Os
+.Sh NAME
+.Nm libnetpgprsa
+.Nd BIGNUM library of multi-precision integers
+.Sh LIBRARY
+.Lb libnetpgprsa
+.Sh SYNOPSIS
+.In netpgp/rsa.h
+.Ft RSA *
+.Fo RSA_new
+.Fa void
+.Fc
+.Ft int
+.Fo RSA_size
+.Fa const RSA *rsa
+.Fc
+.Ft void
+.Fo RSA_free
+.Fa RSA *rsa
+.Fc
+.Ft int
+.Fo RSA_check_key
+.Fa RSA *rsa
+.Fc
+.Ft RSA *
+.Fo RSA_generate_key
+.Fa int num unsigned long e void (*callback)(int, int, void *) void *callbackarg
+.Fc
+.Ft int
+.Fo RSA_public_encrypt
+.Fa int siglen const uint8_t *signature uint8_t *to RSA *rsa int padding
+.Fc
+.Ft int
+.Fo RSA_private_encrypt
+.Fa int siglen const uint8_t *signature uint8_t *to RSA *rsa int padding
+.Fc
+.Ft int
+.Fo RSA_private_decrypt
+.Fa int siglen const uint8_t *signature uint8_t *to RSA *rsa int padding
+.Fc
+.Pp
+.Ft DSA *
+.Fo DSA_new
+.Fa void
+.Fc
+.Ft int
+.Fo DSA_size
+.Fa const DSA *dsa
+.Fc
+.Ft void
+.Fo DSA_free
+.Fa DSA *dsa
+.Fc
+.Ft DSA_SIG *
+.Fo DSA_SIG_new
+.Fa void
+.Fc
+.Ft void
+.Fo DSA_SIG_free
+.Fa DSA_SIG *sig
+.Fc
+.Ft int
+.Fo DSA_do_verify
+.Fa const unsigned char *digest int digestlen DSA_SIG *sig DSA *dsa
+.Fc
+.Ft int
+.Fo DSA_do_sign
+.Fa const unsigned char *digest int digestlen DSA *dsa
+.Fc
+.Sh DESCRIPTION
+.Nm
+is a small library which provides RSA signing,
+encryption and decryption, and DSA signing.
+RSA and DSA verification are provided by the
+.Xr libnetpgpverify 3
+library.
+.Pp
+.Sh SEE ALSO
+.Xr libnetpgpbn 3
+.Xr libnetpgpverify 3
+.Sh HISTORY
+The
+.Nm
+library first appeared in
+.Nx 7.0 .
+.Sh AUTHORS
+.An Alistair Crooks Aq a...@netbsd.org
Index: src/crypto/external/bsd/netpgp/dist/src/librsa/rsa.c
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/src/librsa/rsa.c:1.1.2.1
--- /dev/null Sun May
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/dist/src/libverify
Module Name:src
Committed By: agc
Date: Sun May 6 17:49:30 UTC 2012
Added Files:
src/crypto/external/bsd/netpgp/dist/src/libverify
[agc-netpgp-standalone]:
Makefile libnetpgpverify.3 verify.c verify.h
Log Message:
Add a library solely consisting of signature verification functions.
This is because verfiication is a much more common occurrence than signing,
and requires only public keys to accomplish. Keeping this in its own library
allows the small library to be linked into applications without also linking
every kind of other function.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 \
src/crypto/external/bsd/netpgp/dist/src/libverify/Makefile \
src/crypto/external/bsd/netpgp/dist/src/libverify/libnetpgpverify.3 \
src/crypto/external/bsd/netpgp/dist/src/libverify/verify.c \
src/crypto/external/bsd/netpgp/dist/src/libverify/verify.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/crypto/external/bsd/netpgp/dist/src/libverify/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/src/libverify/Makefile:1.1.2.1
--- /dev/null Sun May 6 17:49:30 2012
+++ src/crypto/external/bsd/netpgp/dist/src/libverify/Makefile Sun May 6 17:49:30 2012
@@ -0,0 +1,10 @@
+LIB=netpgpverify
+SRCS= verify.c
+CPPFLAGS+=-I${.CURDIR}/../bn -I${.CURDIR}/../rsa
+MKMAN=no
+WARNS=4
+
+INCS=verify.h
+INCSDIR=/usr/include/netpgp
+
+.include bsd.lib.mk
Index: src/crypto/external/bsd/netpgp/dist/src/libverify/libnetpgpverify.3
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/src/libverify/libnetpgpverify.3:1.1.2.1
--- /dev/null Sun May 6 17:49:30 2012
+++ src/crypto/external/bsd/netpgp/dist/src/libverify/libnetpgpverify.3 Sun May 6 17:49:30 2012
@@ -0,0 +1,72 @@
+.\ $NetBSD: libnetpgpverify.3,v 1.1.2.1 2012/05/06 17:49:30 agc Exp $
+.\
+.\ Copyright (c) 2012 Alistair Crooks a...@netbsd.org
+.\ All rights reserved.
+.\
+.\ Redistribution and use in source and binary forms, with or without
+.\ modification, are permitted provided that the following conditions
+.\ are met:
+.\ 1. Redistributions of source code must retain the above copyright
+.\notice, this list of conditions and the following disclaimer.
+.\ 2. Redistributions in binary form must reproduce the above copyright
+.\notice, this list of conditions and the following disclaimer in the
+.\documentation and/or other materials provided with the distribution.
+.\
+.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\
+.Dd April 13, 2012
+.Dt LIBNETPGPVERIFY 3
+.Os
+.Sh NAME
+.Nm libnetpgpverify
+.Nd BIGNUM library of multi-precision integers
+.Sh LIBRARY
+.Lb libnetpgpverify
+.Sh SYNOPSIS
+.In netpgp/verify.h
+.Ft int
+.Fo RSA_public_decrypt
+.Fa int siglen const uint8_t *signature uint8_t *to RSA *rsa int padding
+.Fc
+.Sh DESCRIPTION
+.Nm
+is a very small library which isolates out the code
+to verify an
+.Dv RSA
+signature.
+It has been kept deliberately small and with few prerequisites to allow
+this library to be embedded easily in other applications and libraries.
+.Pp
+The
+.Fo RSA_public_decrypt
+function reads the message digest from
+.Dv siglen
+bytes of the
+.Dv signature
+using the signer's public key in
+.Dv rsa
+and places the resulting digest in
+.Dv to
+which must be long enough to hold the digest.
+.Dv padding
+was the padding with which the digest was originally calculated.
+.Sh SEE ALSO
+.Xr bn 3
+.Xr libnetpgpbn 3
+.Xr libnetpgprsa 3
+.Sh HISTORY
+The
+.Nm
+library first appeared in
+.Nx 7.0 .
+.Sh AUTHORS
+.An Alistair Crooks Aq a...@netbsd.org
Index: src/crypto/external/bsd/netpgp/dist/src/libverify/verify.c
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/src/libverify/verify.c:1.1.2.1
--- /dev/null Sun May 6 17:49:30 2012
+++ src/crypto/external/bsd/netpgp/dist/src/libverify/verify.c Sun May 6 17:49:30 2012
@@ -0,0 +1,145 @@
+/*-
+ * Copyright (c) 2012 Alistair Crooks a...@netbsd.org
+ * 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
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/bin
Module Name:src
Committed By: agc
Date: Sun May 6 17:57:11 UTC 2012
Added Files:
src/crypto/external/bsd/netpgp/bin/hkpc [agc-netpgp-standalone]:
Makefile
src/crypto/external/bsd/netpgp/bin/hkpd [agc-netpgp-standalone]:
Makefile
src/crypto/external/bsd/netpgp/bin/netpgp [agc-netpgp-standalone]:
Makefile
src/crypto/external/bsd/netpgp/bin/netpgpkeys [agc-netpgp-standalone]:
Makefile
src/crypto/external/bsd/netpgp/bin/netpgpverify [agc-netpgp-standalone]:
Makefile
src/crypto/external/bsd/netpgp/bin/pgp2ssh [agc-netpgp-standalone]:
Makefile
Log Message:
reachover build infrastructure for standalone version of netpgp
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/bin/hkpc/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/bin/hkpd/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/bin/netpgp/Makefile
cvs rdiff -u -r0 -r1.1.2.1 \
src/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile
cvs rdiff -u -r0 -r1.1.2.1 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r0 -r1.1.2.1 \
src/crypto/external/bsd/netpgp/bin/pgp2ssh/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/crypto/external/bsd/netpgp/bin/hkpc/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/hkpc/Makefile:1.1.2.1
--- /dev/null Sun May 6 17:57:11 2012
+++ src/crypto/external/bsd/netpgp/bin/hkpc/Makefile Sun May 6 17:57:11 2012
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1.2.1 2012/05/06 17:57:11 agc Exp $
+
+.include bsd.own.mk
+
+PROG=hkpc
+BINDIR=/usr/bin
+SRCS=hkpc.c main.c
+
+LIBNETPGPDIR!= cd ${.CURDIR}/../../lib/netpgp ${PRINTOBJDIR}
+LDADD+= -L${LIBNETPGPDIR} -lnetpgp
+DPADD+= ${LIBNETPGPDIR}/libnetpgp.a
+
+LIBMJDIR!= cd ${.CURDIR}/../../lib/mj ${PRINTOBJDIR}
+LDADD+= -L${LIBMJDIR} -lmj
+DPADD+= ${LIBMJDIR}/libmj.a
+
+LDADD+= -lz -lbz2
+DPADD+= ${LIBZ} ${LIBBZ2}
+
+WARNS=0
+MAN=hkpc.1
+
+EXTDIST= ${.CURDIR}/../../dist/src/hkpclient
+.PATH: ${EXTDIST}/src/hkpclient
+
+.include bsd.prog.mk
Index: src/crypto/external/bsd/netpgp/bin/hkpd/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/hkpd/Makefile:1.1.2.1
--- /dev/null Sun May 6 17:57:11 2012
+++ src/crypto/external/bsd/netpgp/bin/hkpd/Makefile Sun May 6 17:57:11 2012
@@ -0,0 +1,50 @@
+# $NetBSD: Makefile,v 1.1.2.1 2012/05/06 17:57:11 agc Exp $
+
+.include bsd.own.mk
+
+PROG=hkpd
+BINDIR=/usr/sbin
+SRCS=hkpd.c main.c
+
+LIBNETPGPDIR!= cd ${.CURDIR}/../../lib/netpgp ${PRINTOBJDIR}
+LDADD+= -L${LIBNETPGPDIR} -lnetpgp
+DPADD+= ${LIBNETPGPDIR}/libnetpgp.a
+
+LIBMJDIR!= cd ${.CURDIR}/../../lib/mj ${PRINTOBJDIR}
+LDADD+= -L${LIBMJDIR} -lmj
+DPADD+= ${LIBMJDIR}/libmj.a
+
+LIBNETRSADIR!= cd ${.CURDIR}/../../lib/rsa ${PRINTOBJDIR}
+LDADD+= -L${LIBNETRSADIR} -lnetpgprsa
+DPADD+= ${LIBNETRSADIR}/libnetpgprsa.a
+
+LIBNETBNDIR!= cd ${.CURDIR}/../../lib/bn ${PRINTOBJDIR}
+LDADD+= -L${LIBNETBNDIR} -lnetpgpbn
+DPADD+= ${LIBNETBNDIR}/libnetpgpbn.a
+
+LIBNETCIPHERDIR!= cd ${.CURDIR}/../../lib/cipher ${PRINTOBJDIR}
+LDADD+= -L${LIBNETCIPHERDIR} -lnetpgpcipher
+DPADD+= ${LIBNETCIPHERDIR}/libnetpgpcipher.a
+
+LIBNETPGPVERIFYDIR!= cd ${.CURDIR}/../../lib/verify ${PRINTOBJDIR}
+LDADD+= -L${LIBNETPGPVERIFYDIR} -lnetpgpverify
+DPADD+= ${LIBNETPGPVERIFYDIR}/libnetpgpverify.a
+
+LDADD+= -lz -lbz2
+DPADD+= ${LIBZ} ${LIBBZ2}
+
+MAN=hkpd.1
+WARNS=0 # anything over 0 will fail at the link stage with IDEA errors
+
+EXTDIST= ${.CURDIR}/../dist/src/hkpd
+.PATH: ${EXTDIST}/src/hkpd
+
+.include bsd.prog.mk
+
+t: ${PROG}
+ ./${PROG} -D
+ sleep 1
+ ftp -o- 'http://localhost:11371/pks/lookup?op=indexsearch=agcoptions=json'
+ ftp -o- 'http://localhost:11371/pks/lookup?op=getsearch=agcoptions=json'
+ ftp -o- 'http://localhost:11371/pks/lookup?op=getsearch=agcoptions=mr'
+ pkill hkpd
Index: src/crypto/external/bsd/netpgp/bin/netpgp/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/netpgp/Makefile:1.1.2.1
--- /dev/null Sun May 6 17:57:11 2012
+++ src/crypto/external/bsd/netpgp/bin/netpgp/Makefile Sun May 6 17:57:11 2012
@@ -0,0 +1,50 @@
+# $NetBSD: Makefile,v 1.1.2.1 2012/05/06 17:57:11 agc Exp $
+
+.include bsd.own.mk
+
+PROG= netpgp
+BINDIR= /usr/bin
+
+CPPFLAGS+= -I${EXTDIST}/include
+
+LIBNETPGPDIR!= cd ${.CURDIR}/../../lib/netpgp ${PRINTOBJDIR}
+LDADD+= -L${LIBNETPGPDIR} -lnetpgp
+DPADD+= ${LIBNETPGPDIR}/libnetpgp.a
+
+LIBNETPGPVERIFYDIR!= cd ${.CURDIR}/../../lib/verify ${PRINTOBJDIR}
+LDADD+= -L${LIBNETPGPVERIFYDIR} -lnetpgpverify
+DPADD+= ${LIBNETPGPVERIFYDIR}/libnetpgpverify.a
+
+LIBNETCIPHERDIR!= cd ${.CURDIR}/../../lib/cipher ${PRINTOBJDIR}
+LDADD+= -L${LIBNETCIPHERDIR} -lnetpgpcipher
+DPADD+= ${LIBNETCIPHERDIR}/libnetpgpcipher.a
+
+LIBNETRSADIR!= cd ${.CURDIR}/../../lib/rsa ${PRINTOBJDIR}
+LDADD+=
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/lib
Module Name:src
Committed By: agc
Date: Sun May 6 18:07:02 UTC 2012
Modified Files:
src/crypto/external/bsd/netpgp/lib [agc-netpgp-standalone]: Makefile
Added Files:
src/crypto/external/bsd/netpgp/lib/bn [agc-netpgp-standalone]: Makefile
shlib_version
src/crypto/external/bsd/netpgp/lib/cipher [agc-netpgp-standalone]:
Makefile shlib_version
src/crypto/external/bsd/netpgp/lib/mj [agc-netpgp-standalone]: Makefile
shlib_version
src/crypto/external/bsd/netpgp/lib/netpgp [agc-netpgp-standalone]:
Makefile shlib_version
src/crypto/external/bsd/netpgp/lib/paa [agc-netpgp-standalone]:
Makefile shlib_version
src/crypto/external/bsd/netpgp/lib/rsa [agc-netpgp-standalone]:
Makefile shlib_version
src/crypto/external/bsd/netpgp/lib/verify [agc-netpgp-standalone]:
Makefile shlib_version
Log Message:
Add reachover build infrastructure for lib components of netpgp
standalone
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.6.1 src/crypto/external/bsd/netpgp/lib/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/bn/Makefile \
src/crypto/external/bsd/netpgp/lib/bn/shlib_version
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/cipher/Makefile \
src/crypto/external/bsd/netpgp/lib/cipher/shlib_version
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/mj/Makefile \
src/crypto/external/bsd/netpgp/lib/mj/shlib_version
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/netpgp/Makefile \
src/crypto/external/bsd/netpgp/lib/netpgp/shlib_version
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/paa/Makefile \
src/crypto/external/bsd/netpgp/lib/paa/shlib_version
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/rsa/Makefile \
src/crypto/external/bsd/netpgp/lib/rsa/shlib_version
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/verify/Makefile \
src/crypto/external/bsd/netpgp/lib/verify/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/lib/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/Makefile:1.13 src/crypto/external/bsd/netpgp/lib/Makefile:1.13.6.1
--- src/crypto/external/bsd/netpgp/lib/Makefile:1.13 Thu Oct 13 17:23:28 2011
+++ src/crypto/external/bsd/netpgp/lib/Makefile Sun May 6 18:07:01 2012
@@ -1,29 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2011/10/13 17:23:28 plunky Exp $
+# $NetBSD: Makefile,v 1.13.6.1 2012/05/06 18:07:01 agc Exp $
-.include bsd.own.mk
+SUBDIR+= bn mj .WAIT
+SUBDIR+= cipher rsa
+SUBDIR+= netpgp verify
+#SUBDIR+= libpaa
-USE_FORT?= yes
-
-LIB= netpgp
-SRCS+= compress.c create.c crypto.c
-SRCS+= keyring.c misc.c netpgp.c openssl_crypto.c packet-parse.c
-SRCS+= packet-print.c packet-show.c reader.c signature.c
-SRCS+= symmetric.c validate.c writer.c
-SRCS+= ssh2pgp.c bufgap.c
-CPPFLAGS+= -I${.CURDIR} -I${EXTDIST}/include
-MAN= libnetpgp.3
-WARNS?= 4
-
-EXTDIST=${.CURDIR}/../dist
-
-.PATH: ${EXTDIST}/include ${EXTDIST}/src/lib
-
-INCS+= netpgp.h
-INCSDIR=/usr/include
-
-LIBDPLIBS+= mj ${.CURDIR}/../libmj
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
-LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
-LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
-
-.include bsd.lib.mk
+.include bsd.subdir.mk
Added files:
Index: src/crypto/external/bsd/netpgp/lib/bn/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/bn/Makefile:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/bn/Makefile Sun May 6 18:07:01 2012
@@ -0,0 +1,14 @@
+LIB=netpgpbn
+SRCS= bignum.c digest.c misc.c rand.c
+SRCS+= stubs.c
+MAN=libnetpgpbn.3
+WARNS=4
+CPPFLAGS+=-I${EXTDIST}/src/libcipher
+
+INCS=bn.h digest.h
+INCSDIR=/usr/include/netpgp
+
+EXTDIST= ${.CURDIR}/../../dist
+.PATH: ${EXTDIST}/src/libbn
+
+.include bsd.lib.mk
Index: src/crypto/external/bsd/netpgp/lib/bn/shlib_version
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/bn/shlib_version:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/bn/shlib_version Sun May 6 18:07:01 2012
@@ -0,0 +1,2 @@
+major=0
+minor=0
Index: src/crypto/external/bsd/netpgp/lib/cipher/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/cipher/Makefile:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/cipher/Makefile Sun May 6 18:07:01 2012
@@ -0,0 +1,15 @@
+LIB=netpgpcipher
+SRCS= rijndael-alg-fst.c rijndael-api-fst.c rijndael.c
+SRCS+= cast.c
+SRCS+= modes.c
+SRCS+= camellia.c
+MAN=libnetpgpcipher.3
+WARNS=4
+
+EXTDIST= ${.CURDIR}/../../dist
+.PATH: ${EXTDIST}/src/libcipher
+
+INCS=aes.h rijndael.h cast.h camellia.h
+INCSDIR=/usr/include/netpgp
+
+.include bsd.lib.mk
Index: src/crypto/external/bsd/netpgp/lib/cipher/shlib_version
diff -u
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/lib
Module Name:src Committed By: agc Date: Sun May 6 18:08:12 UTC 2012 Removed Files: src/crypto/external/bsd/netpgp/lib [agc-netpgp-standalone]: shlib_version Log Message: clean up a file which has now moved location To generate a diff of this commit: cvs rdiff -u -r1.4 -r0 src/crypto/external/bsd/netpgp/lib/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp
Module Name:src Committed By: agc Date: Sun May 6 18:14:17 UTC 2012 Modified Files: src/crypto/external/bsd/netpgp [agc-netpgp-standalone]: Makefile Removed Files: src/crypto/external/bsd/netpgp/hkpc [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/hkpd [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/libmj [agc-netpgp-standalone]: Makefile shlib_version src/crypto/external/bsd/netpgp/libpaa [agc-netpgp-standalone]: Makefile shlib_version src/crypto/external/bsd/netpgp/libpaa/client [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/libpaa/server [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/netpgp [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/netpgpkeys [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/netpgpverify [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/pgp2ssh [agc-netpgp-standalone]: Makefile Log Message: get rid of the old reachover infrastructure (which was horribly non-standard anyway). Replace with the new reachover build infrastructure for standalone netpgp To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.10.1 src/crypto/external/bsd/netpgp/Makefile cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/hkpc/Makefile cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/hkpd/Makefile cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/libmj/Makefile cvs rdiff -u -r1.2 -r0 src/crypto/external/bsd/netpgp/libmj/shlib_version cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/libpaa/Makefile \ src/crypto/external/bsd/netpgp/libpaa/shlib_version cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/libpaa/client/Makefile cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/libpaa/server/Makefile cvs rdiff -u -r1.3 -r0 src/crypto/external/bsd/netpgp/netpgp/Makefile cvs rdiff -u -r1.3 -r0 src/crypto/external/bsd/netpgp/netpgpkeys/Makefile cvs rdiff -u -r1.5 -r0 src/crypto/external/bsd/netpgp/netpgpverify/Makefile cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/pgp2ssh/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/Makefile diff -u src/crypto/external/bsd/netpgp/Makefile:1.5 src/crypto/external/bsd/netpgp/Makefile:1.5.10.1 --- src/crypto/external/bsd/netpgp/Makefile:1.5 Thu Sep 2 06:00:11 2010 +++ src/crypto/external/bsd/netpgp/Makefile Sun May 6 18:14:16 2012 @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2010/09/02 06:00:11 agc Exp $ +# $NetBSD: Makefile,v 1.5.10.1 2012/05/06 18:14:16 agc Exp $ -SUBDIR= libmj .WAIT SUBDIR+= lib .WAIT -SUBDIR+= netpgp netpgpkeys netpgpverify -#SUBDIR+= hkpc hkpd +SUBDIR+= bin .include bsd.subdir.mk
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/bin
Module Name:src Committed By: agc Date: Sun May 6 18:15:26 UTC 2012 Added Files: src/crypto/external/bsd/netpgp/bin [agc-netpgp-standalone]: Makefile Log Message: Reachover Makefile for the bin directory for standalone netpgp To generate a diff of this commit: cvs rdiff -u -r0 -r1.3.6.2 src/crypto/external/bsd/netpgp/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/crypto/external/bsd/netpgp/bin/Makefile diff -u /dev/null src/crypto/external/bsd/netpgp/bin/Makefile:1.3.6.2 --- /dev/null Sun May 6 18:15:26 2012 +++ src/crypto/external/bsd/netpgp/bin/Makefile Sun May 6 18:15:26 2012 @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.3.6.2 2012/05/06 18:15:26 agc Exp $ + +SUBDIR+= netpgp netpgpkeys netpgpverify +#SUBDIR+= hkpc hkpd pgp2ssh + +.include bsd.subdir.mk
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/lib
Module Name:src Committed By: agc Date: Sun May 6 18:18:40 UTC 2012 Added Files: src/crypto/external/bsd/netpgp/lib/netpgp [agc-netpgp-standalone]: config.h Removed Files: src/crypto/external/bsd/netpgp/lib [agc-netpgp-standalone]: config.h Log Message: Move the autoconf-generated config.h file to its destination in the reachover infrastructure. To generate a diff of this commit: cvs rdiff -u -r1.8 -r0 src/crypto/external/bsd/netpgp/lib/config.h cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/netpgp/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/crypto/external/bsd/netpgp/lib/netpgp/config.h diff -u /dev/null src/crypto/external/bsd/netpgp/lib/netpgp/config.h:1.1.2.1 --- /dev/null Sun May 6 18:18:40 2012 +++ src/crypto/external/bsd/netpgp/lib/netpgp/config.h Sun May 6 18:18:40 2012 @@ -0,0 +1,177 @@ +/* src/lib/config.h. Generated from config.h.in by configure. */ +/* src/lib/config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the bzlib.h header file. */ +#define HAVE_BZLIB_H 1 + +/* Define to 1 if you have the CommonCrypto/CommonDigest.h header file. */ +/* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */ + +/* Define to 1 if you have the direct.h header file. */ +/* #undef HAVE_DIRECT_H */ + +/* Define to 1 if you have the dlfcn.h header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the dmalloc.h header file. */ +/* #undef HAVE_DMALLOC_H */ + +/* Define to 1 if you have the errno.h header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the fcntl.h header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the inttypes.h header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the limits.h header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if the system has the type `long long int'. */ +#define HAVE_LONG_LONG_INT 1 + +/* Define to 1 if you have the malloc.h header file. */ +#define HAVE_MALLOC_H 1 + +/* Define to 1 if you have the memory.h header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the openssl/aes.h header file. */ +#define HAVE_OPENSSL_AES_H 1 + +/* Define to 1 if you have the openssl/bn.h header file. */ +#define HAVE_OPENSSL_BN_H 1 + +/* Define to 1 if you have the openssl/camellia.h header file. */ +#define HAVE_OPENSSL_CAMELLIA_H 1 + +/* Define to 1 if you have the openssl/cast.h header file. */ +#define HAVE_OPENSSL_CAST_H 1 + +/* Define to 1 if you have the openssl/des.h header file. */ +#define HAVE_OPENSSL_DES_H 1 + +/* Define to 1 if you have the openssl/dsa.h header file. */ +#define HAVE_OPENSSL_DSA_H 1 + +/* Define to 1 if you have the openssl/err.h header file. */ +#define HAVE_OPENSSL_ERR_H 1 + +/* Define to 1 if you have the openssl/idea.h header file. */ +#define HAVE_OPENSSL_IDEA_H 1 + +/* Define to 1 if you have the openssl/md5.h header file. */ +#define HAVE_OPENSSL_MD5_H 1 + +/* Define to 1 if you have the openssl/rand.h header file. */ +#define HAVE_OPENSSL_RAND_H 1 + +/* Define to 1 if you have the openssl/rsa.h header file. */ +#define HAVE_OPENSSL_RSA_H 1 + +/* Define to 1 if you have the openssl/sha.h header file. */ +#define HAVE_OPENSSL_SHA_H 1 + +/* Define to 1 if the system has the type `SHA256_CTX'. */ +#define HAVE_SHA256_CTX 1 + +/* Define to 1 if you have the stdint.h header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the stdlib.h header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the strings.h header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the string.h header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the sys/cdefs.h header file. */ +#define HAVE_SYS_CDEFS_H 1 + +/* Define to 1 if you have the sys/file.h header file. */ +#define HAVE_SYS_FILE_H 1 + +/* Define to 1 if you have the sys/mman.h header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the sys/param.h header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the sys/resource.h header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the sys/stat.h header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the sys/types.h header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the sys/uio.h header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have the unistd.h header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the zlib.h header file. */ +#define HAVE_ZLIB_H 1 + +/* Name of package */ +#define PACKAGE netpgp + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT Alistair Crooks a...@netbsd.org c0596823 + +/* Define to the full name of this package. */ +#define PACKAGE_NAME netpgp + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING
CVS commit: src/sys/arch/x68k
Module Name:src
Committed By: tsutsui
Date: Sun May 6 19:46:18 UTC 2012
Modified Files:
src/sys/arch/x68k/dev: fd.c
src/sys/arch/x68k/x68k: machdep.c
Log Message:
Make x68k's floppy driver actually work with proper bounce buffer xfer ops
on machines with extended high memories:
- dev/fd.c:
- add missing bus_dmamap_sync(9) POSTREAD/POSTWRITE ops
- x68k/machdep.c:
- update avail_end variable (which is used to check DMA'able memory range
in intio.c) properly per probed extended memory regions
The problem was found during debugging XM6i's FDC emulation by
Y.Sugahara, isaki@, and me.
Should be pulled up to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/x68k/dev/fd.c
cvs rdiff -u -r1.181 -r1.182 src/sys/arch/x68k/x68k/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/dev/fd.c
diff -u src/sys/arch/x68k/dev/fd.c:1.96 src/sys/arch/x68k/dev/fd.c:1.97
--- src/sys/arch/x68k/dev/fd.c:1.96 Thu Feb 2 19:43:01 2012
+++ src/sys/arch/x68k/dev/fd.c Sun May 6 19:46:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.96 2012/02/02 19:43:01 tls Exp $ */
+/* $NetBSD: fd.c,v 1.97 2012/05/06 19:46:18 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fd.c,v 1.96 2012/02/02 19:43:01 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: fd.c,v 1.97 2012/05/06 19:46:18 tsutsui Exp $);
#include opt_ddb.h
#include opt_m68k_arch.h
@@ -148,6 +148,7 @@ struct fdc_softc {
u_int8_t *sc_addr; /* physical address */
struct dmac_channel_stat *sc_dmachan; /* intio DMA channel */
struct dmac_dma_xfer *sc_xfer; /* DMA transfer */
+ int sc_read;
struct fd_softc *sc_fd[4]; /* pointers to children */
TAILQ_HEAD(drivehead, fd_softc) sc_drives;
@@ -324,6 +325,7 @@ fdc_dmastart(struct fdc_softc *fdc, int
(u_int8_t*) (fdc-sc_addr +
fddata)); /* XXX */
+ fdc-sc_read = read;
dmac_start_xfer(fdc-sc_dmachan-ch_softc, fdc-sc_xfer);
}
@@ -332,6 +334,10 @@ fdcdmaintr(void *arg)
{
struct fdc_softc *fdc = arg;
+ bus_dmamap_sync(fdc-sc_dmat, fdc-sc_dmamap,
+ 0, fdc-sc_dmamap-dm_mapsize,
+ fdc-sc_read ?
+ BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(fdc-sc_dmat, fdc-sc_dmamap);
return 0;
Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.181 src/sys/arch/x68k/x68k/machdep.c:1.182
--- src/sys/arch/x68k/x68k/machdep.c:1.181 Sun Jan 29 12:43:00 2012
+++ src/sys/arch/x68k/x68k/machdep.c Sun May 6 19:46:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.181 2012/01/29 12:43:00 isaki Exp $ */
+/* $NetBSD: machdep.c,v 1.182 2012/05/06 19:46:18 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.181 2012/01/29 12:43:00 isaki Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.182 2012/05/06 19:46:18 tsutsui Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -174,6 +174,7 @@ void
x68k_init(void)
{
u_int i;
+ paddr_t msgbuf_pa;
/*
* Tell the VM system about available physical memory.
@@ -181,17 +182,25 @@ x68k_init(void)
uvm_page_physload(atop(avail_start), atop(avail_end),
atop(avail_start), atop(avail_end),
VM_FREELIST_MAINMEM);
+
+ /*
+ * avail_end was pre-decremented in pmap_bootstrap to compensate
+ * for msgbuf pages, but avail_end is also used to check DMA'able
+ * memory range for intio devices and it would be updated per
+ * probed extended memories, so explicitly save msgbuf address here.
+ */
+ msgbuf_pa = avail_end;
+
#ifdef EXTENDED_MEMORY
setmemrange();
#endif
/*
* Initialize error message buffer (at end of core).
- * avail_end was pre-decremented in pmap_bootstrap to compensate.
*/
for (i = 0; i btoc(MSGBUFSIZE); i++)
pmap_kenter_pa((vaddr_t)msgbufaddr + i * PAGE_SIZE,
- avail_end + i * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, 0);
+ msgbuf_pa + i * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, 0);
pmap_update(pmap_kernel());
initmsgbuf(msgbufaddr, m68k_round_page(MSGBUFSIZE));
}
@@ -1146,6 +1155,8 @@ setmemrange(void)
atop(mlist[i].base), atop(h),
VM_FREELIST_HIGHMEM);
mem_size += h - (u_long) mlist[i].base;
+ if (avail_end h)
+avail_end = h;
}
}
CVS commit: src/usr.bin/grep
Module Name:src
Committed By: joerg
Date: Sun May 6 21:56:08 UTC 2012
Modified Files:
src/usr.bin/grep: util.c
Log Message:
Make the matchall case a full short cut.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/grep/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/grep/util.c
diff -u src/usr.bin/grep/util.c:1.13 src/usr.bin/grep/util.c:1.14
--- src/usr.bin/grep/util.c:1.13 Mon Apr 18 23:22:42 2011
+++ src/usr.bin/grep/util.c Sun May 6 21:56:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.13 2011/04/18 23:22:42 joerg Exp $ */
+/* $NetBSD: util.c,v 1.14 2012/05/06 21:56:08 joerg Exp $ */
/* $FreeBSD: head/usr.bin/grep/util.c 211496 2010-08-19 09:28:59Z des $ */
/* $OpenBSD: util.c,v 1.39 2010/07/02 22:18:03 tedu Exp $ */
@@ -34,7 +34,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: util.c,v 1.13 2011/04/18 23:22:42 joerg Exp $);
+__RCSID($NetBSD: util.c,v 1.14 2012/05/06 21:56:08 joerg Exp $);
#include sys/stat.h
#include sys/types.h
@@ -295,78 +295,86 @@ procline(struct str *l, int nottext)
unsigned int i;
int c = 0, m = 0, r = 0;
- if (!matchall) {
- /* Loop to process the whole line */
- while (st = l-len) {
- pmatch.rm_so = st;
- pmatch.rm_eo = l-len;
+ if (matchall) {
+ /* Short cut the case of (not) matching wild card pattern */
+ if (vflag)
+ return (0);
+ if ((binbehave == BINFILE_BIN nottext) || cflag || qflag ||
+ lflag || Lflag)
+ return (1);
+ printline(l, ':', matches, m);
+ return (1);
+ }
- /* Loop to compare with all the patterns */
- for (i = 0; i patterns; i++) {
+ /* Loop to process the whole line */
+ while (st = l-len) {
+ pmatch.rm_so = st;
+ pmatch.rm_eo = l-len;
+
+ /* Loop to compare with all the patterns */
+ for (i = 0; i patterns; i++) {
/*
* XXX: grep_search() is a workaround for speed up and should be
* removed in the future. See fastgrep.c.
*/
-if (fg_pattern[i].pattern) {
- r = grep_search(fg_pattern[i],
- (unsigned char *)l-dat,
- l-len, pmatch);
- r = (r == 0) ? 0 : REG_NOMATCH;
- st = pmatch.rm_eo;
-} else {
- r = regexec(r_pattern[i], l-dat, 1,
- pmatch, eflags);
- r = (r == 0) ? 0 : REG_NOMATCH;
- st = pmatch.rm_eo;
-}
-if (r == REG_NOMATCH)
- continue;
-/* Check for full match */
-if (r == 0 xflag)
- if (pmatch.rm_so != 0 ||
- (size_t)pmatch.rm_eo != l-len)
- r = REG_NOMATCH;
-/* Check for whole word match */
-if (r == 0 fg_pattern[i].word
-pmatch.rm_so != 0) {
- wint_t wbegin, wend;
-
- wbegin = wend = L' ';
- if (pmatch.rm_so != 0
- sscanf(l-dat[pmatch.rm_so - 1],
- %lc, wbegin) != 1)
- r = REG_NOMATCH;
- else if ((size_t)pmatch.rm_eo != l-len
- sscanf(l-dat[pmatch.rm_eo],
- %lc, wend) != 1)
- r = REG_NOMATCH;
- else if (iswword(wbegin) || iswword(wend))
- r = REG_NOMATCH;
-}
-if (r == 0) {
- if (m == 0)
- c++;
- if (m MAX_LINE_MATCHES)
- matches[m++] = pmatch;
- /* matches - skip further patterns */
- if ((color != NULL !oflag) || qflag || lflag)
- break;
-}
+ if (fg_pattern[i].pattern) {
+r = grep_search(fg_pattern[i],
+(unsigned char *)l-dat,
+l-len, pmatch);
+r = (r == 0) ? 0 : REG_NOMATCH;
+st = pmatch.rm_eo;
+ } else {
+r = regexec(r_pattern[i], l-dat, 1,
+pmatch, eflags);
+r = (r == 0) ? 0 : REG_NOMATCH;
+st = pmatch.rm_eo;
}
-
- if (vflag) {
-c = !c;
-break;
+ if (r == REG_NOMATCH)
+continue;
+ /* Check for full match */
+ if (r == 0 xflag)
+if (pmatch.rm_so != 0 ||
+(size_t)pmatch.rm_eo != l-len)
+ r = REG_NOMATCH;
+ /* Check for whole word match */
+ if (r == 0 fg_pattern[i].word
+ pmatch.rm_so != 0) {
+wint_t wbegin, wend;
+
+wbegin = wend = L' ';
+if (pmatch.rm_so != 0
+sscanf(l-dat[pmatch.rm_so - 1],
+%lc, wbegin) != 1)
+ r = REG_NOMATCH;
+else if ((size_t)pmatch.rm_eo != l-len
+sscanf(l-dat[pmatch.rm_eo],
+%lc, wend) != 1)
+ r = REG_NOMATCH;
+else if (iswword(wbegin) || iswword(wend))
+ r = REG_NOMATCH;
}
- /* One pass if we are not recording matches */
- if ((color != NULL !oflag) || qflag || lflag)
-break;
+ if (r == 0) {
+if (m == 0)
+ c++;
+if (m MAX_LINE_MATCHES)
+ matches[m++] = pmatch;
+/* matches - skip further patterns */
+if ((color != NULL !oflag) || qflag || lflag)
+ break;
+ }
+ }
- if (st == (size_t)pmatch.rm_so)
-break; /* No matches */
+ if (vflag) {
+ c = !c;
+ break;
}
- } else
- c = !vflag;
+ /* One pass if we are not recording matches */
+ if ((color != NULL !oflag) || qflag || lflag)
+ break;
+
+ if (st == (size_t)pmatch.rm_so)
+ break; /* No
CVS commit: src/usr.bin/grep
Module Name:src
Committed By: joerg
Date: Sun May 6 22:27:01 UTC 2012
Modified Files:
src/usr.bin/grep: grep.c grep.h util.c
Log Message:
Remove matchall handling for now, it doesn't work correctly and as such,
it is a premature optimisation.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/grep/grep.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/grep/grep.h
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/grep/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/grep/grep.c
diff -u src/usr.bin/grep/grep.c:1.10 src/usr.bin/grep/grep.c:1.11
--- src/usr.bin/grep/grep.c:1.10 Fri Sep 16 15:39:26 2011
+++ src/usr.bin/grep/grep.c Sun May 6 22:27:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: grep.c,v 1.10 2011/09/16 15:39:26 joerg Exp $ */
+/* $NetBSD: grep.c,v 1.11 2012/05/06 22:27:00 joerg Exp $ */
/* $FreeBSD: head/usr.bin/grep/grep.c 211519 2010-08-19 22:55:17Z delphij $ */
/* $OpenBSD: grep.c,v 1.42 2010/07/02 22:18:03 tedu Exp $ */
@@ -34,7 +34,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: grep.c,v 1.10 2011/09/16 15:39:26 joerg Exp $);
+__RCSID($NetBSD: grep.c,v 1.11 2012/05/06 22:27:00 joerg Exp $);
#include sys/stat.h
#include sys/types.h
@@ -80,9 +80,6 @@ const char *errstr[] = {
int cflags = 0;
int eflags = REG_STARTEND;
-/* Shortcut for matching all cases like empty regex */
-bool matchall;
-
/* Searching patterns */
unsigned int patterns, pattern_sz;
char **pattern;
@@ -229,11 +226,8 @@ static void
add_pattern(char *pat, size_t len)
{
- /* Check if we can do a shortcut */
- if (len == 0 || matchall) {
- matchall = true;
- return;
- }
+ /* TODO: Check for empty patterns and shortcut */
+
/* Increase size if necessary */
if (patterns == pattern_sz) {
pattern_sz *= 2;
Index: src/usr.bin/grep/grep.h
diff -u src/usr.bin/grep/grep.h:1.7 src/usr.bin/grep/grep.h:1.8
--- src/usr.bin/grep/grep.h:1.7 Mon Apr 18 22:46:48 2011
+++ src/usr.bin/grep/grep.h Sun May 6 22:27:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: grep.h,v 1.7 2011/04/18 22:46:48 joerg Exp $ */
+/* $NetBSD: grep.h,v 1.8 2012/05/06 22:27:00 joerg Exp $ */
/* $OpenBSD: grep.h,v 1.15 2010/04/05 03:03:55 tedu Exp $ */
/* $FreeBSD: head/usr.bin/grep/grep.h 211496 2010-08-19 09:28:59Z des $ */
@@ -120,7 +120,7 @@ extern char *label;
extern const char *color;
extern int binbehave, devbehave, dirbehave, filebehave, grepbehave, linkbehave;
-extern bool matchall, notfound;
+extern bool notfound;
extern int tail;
extern unsigned int dpatterns, fpatterns, patterns;
extern char**pattern;
Index: src/usr.bin/grep/util.c
diff -u src/usr.bin/grep/util.c:1.14 src/usr.bin/grep/util.c:1.15
--- src/usr.bin/grep/util.c:1.14 Sun May 6 21:56:08 2012
+++ src/usr.bin/grep/util.c Sun May 6 22:27:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.14 2012/05/06 21:56:08 joerg Exp $ */
+/* $NetBSD: util.c,v 1.15 2012/05/06 22:27:01 joerg Exp $ */
/* $FreeBSD: head/usr.bin/grep/util.c 211496 2010-08-19 09:28:59Z des $ */
/* $OpenBSD: util.c,v 1.39 2010/07/02 22:18:03 tedu Exp $ */
@@ -34,7 +34,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: util.c,v 1.14 2012/05/06 21:56:08 joerg Exp $);
+__RCSID($NetBSD: util.c,v 1.15 2012/05/06 22:27:01 joerg Exp $);
#include sys/stat.h
#include sys/types.h
@@ -227,12 +227,8 @@ procfile(const char *fn)
for (first = true, c = 0; c == 0 || !(lflag || qflag); ) {
ln.off += ln.len + 1;
- if ((ln.dat = grep_fgetln(f, ln.len)) == NULL || ln.len == 0) {
- if (ln.line_no == 0 matchall)
-exit(0);
- else
-break;
- }
+ if ((ln.dat = grep_fgetln(f, ln.len)) == NULL || ln.len == 0)
+ break;
if (ln.len 0 ln.dat[ln.len - 1] == line_sep)
--ln.len;
ln.line_no++;
@@ -295,17 +291,6 @@ procline(struct str *l, int nottext)
unsigned int i;
int c = 0, m = 0, r = 0;
- if (matchall) {
- /* Short cut the case of (not) matching wild card pattern */
- if (vflag)
- return (0);
- if ((binbehave == BINFILE_BIN nottext) || cflag || qflag ||
- lflag || Lflag)
- return (1);
- printline(l, ':', matches, m);
- return (1);
- }
-
/* Loop to process the whole line */
while (st = l-len) {
pmatch.rm_so = st;
CVS commit: src/usr.bin/grep
Module Name:src
Committed By: joerg
Date: Sun May 6 22:32:05 UTC 2012
Modified Files:
src/usr.bin/grep: util.c
Log Message:
Consistently short cut the pattern loop on mismatches.
Don't assign 1 conditionally, if unconditional works as well.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/grep/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/grep/util.c
diff -u src/usr.bin/grep/util.c:1.15 src/usr.bin/grep/util.c:1.16
--- src/usr.bin/grep/util.c:1.15 Sun May 6 22:27:01 2012
+++ src/usr.bin/grep/util.c Sun May 6 22:32:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.15 2012/05/06 22:27:01 joerg Exp $ */
+/* $NetBSD: util.c,v 1.16 2012/05/06 22:32:05 joerg Exp $ */
/* $FreeBSD: head/usr.bin/grep/util.c 211496 2010-08-19 09:28:59Z des $ */
/* $OpenBSD: util.c,v 1.39 2010/07/02 22:18:03 tedu Exp $ */
@@ -34,7 +34,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: util.c,v 1.15 2012/05/06 22:27:01 joerg Exp $);
+__RCSID($NetBSD: util.c,v 1.16 2012/05/06 22:32:05 joerg Exp $);
#include sys/stat.h
#include sys/types.h
@@ -317,36 +317,32 @@ procline(struct str *l, int nottext)
if (r == REG_NOMATCH)
continue;
/* Check for full match */
- if (r == 0 xflag)
-if (pmatch.rm_so != 0 ||
-(size_t)pmatch.rm_eo != l-len)
- r = REG_NOMATCH;
+ if (xflag
+ (pmatch.rm_so != 0 ||
+ (size_t)pmatch.rm_eo != l-len))
+continue;
/* Check for whole word match */
- if (r == 0 fg_pattern[i].word
- pmatch.rm_so != 0) {
+ if (fg_pattern[i].word pmatch.rm_so != 0) {
wint_t wbegin, wend;
wbegin = wend = L' ';
if (pmatch.rm_so != 0
sscanf(l-dat[pmatch.rm_so - 1],
%lc, wbegin) != 1)
- r = REG_NOMATCH;
-else if ((size_t)pmatch.rm_eo != l-len
+ continue;
+if ((size_t)pmatch.rm_eo != l-len
sscanf(l-dat[pmatch.rm_eo],
%lc, wend) != 1)
- r = REG_NOMATCH;
-else if (iswword(wbegin) || iswword(wend))
- r = REG_NOMATCH;
- }
- if (r == 0) {
-if (m == 0)
- c++;
-if (m MAX_LINE_MATCHES)
- matches[m++] = pmatch;
-/* matches - skip further patterns */
-if ((color != NULL !oflag) || qflag || lflag)
- break;
+ continue;
+if (iswword(wbegin) || iswword(wend))
+ continue;
}
+ c = 1;
+ if (m MAX_LINE_MATCHES)
+matches[m++] = pmatch;
+ /* matches - skip further patterns */
+ if ((color != NULL !oflag) || qflag || lflag)
+break;
}
if (vflag) {
CVS commit: src/external/bsd/bzip2
Module Name:src Committed By: wiz Date: Mon May 7 00:21:47 UTC 2012 Update of /cvsroot/src/external/bsd/bzip2 In directory ivanova.netbsd.org:/tmp/cvs-serv26893 Log Message: Re-import bzip2-1.0.5 in more appropriate location. Status: Vendor Tag: JSEWARD Release Tags: bzip2-1-0-5 N src/external/bsd/bzip2/CHANGES N src/external/bsd/bzip2/LICENSE N src/external/bsd/bzip2/Makefile N src/external/bsd/bzip2/Makefile-libbz2_so N src/external/bsd/bzip2/README N src/external/bsd/bzip2/README.COMPILATION.PROBLEMS N src/external/bsd/bzip2/README.XML.STUFF N src/external/bsd/bzip2/bz-common.xsl N src/external/bsd/bzip2/bz-fo.xsl N src/external/bsd/bzip2/bz-html.xsl N src/external/bsd/bzip2/bzdiff N src/external/bsd/bzip2/bzgrep N src/external/bsd/bzip2/bzip.css N src/external/bsd/bzip2/bzmore N src/external/bsd/bzip2/dlltest.dsp N src/external/bsd/bzip2/entities.xml N src/external/bsd/bzip2/format.pl N src/external/bsd/bzip2/libbz2.def N src/external/bsd/bzip2/libbz2.dsp N src/external/bsd/bzip2/makefile.msc N src/external/bsd/bzip2/manual.html N src/external/bsd/bzip2/manual.pdf N src/external/bsd/bzip2/words0 N src/external/bsd/bzip2/manual.ps N src/external/bsd/bzip2/manual.xml N src/external/bsd/bzip2/sample1.bz2 N src/external/bsd/bzip2/sample1.ref N src/external/bsd/bzip2/sample2.bz2 N src/external/bsd/bzip2/sample2.ref N src/external/bsd/bzip2/sample3.bz2 N src/external/bsd/bzip2/sample3.ref N src/external/bsd/bzip2/words1 N src/external/bsd/bzip2/words2 N src/external/bsd/bzip2/words3 N src/external/bsd/bzip2/xmlproc.sh N src/external/bsd/bzip2/blocksort.c N src/external/bsd/bzip2/bzip2.c N src/external/bsd/bzip2/bzip2recover.c N src/external/bsd/bzip2/bzlib.c N src/external/bsd/bzip2/bzlib.h N src/external/bsd/bzip2/bzlib_private.h N src/external/bsd/bzip2/compress.c N src/external/bsd/bzip2/crctable.c N src/external/bsd/bzip2/decompress.c N src/external/bsd/bzip2/dlltest.c N src/external/bsd/bzip2/huffman.c N src/external/bsd/bzip2/mk251.c N src/external/bsd/bzip2/randtable.c N src/external/bsd/bzip2/spewG.c N src/external/bsd/bzip2/unzcrash.c N src/external/bsd/bzip2/bzdiff.1 N src/external/bsd/bzip2/bzgrep.1 N src/external/bsd/bzip2/bzip2.1 N src/external/bsd/bzip2/bzmore.1 No conflicts created by this import
CVS commit: src/external/bsd/bzip2
Module Name:src Committed By: wiz Date: Mon May 7 00:30:06 UTC 2012 Modified Files: src/external/bsd/bzip2: bzip2.1 bzip2.c bzip2recover.c bzlib.c bzlib_private.h decompress.c Added Files: src/external/bsd/bzip2: bzip2netbsd Removed Files: src/external/bsd/bzip2: manual.pdf manual.ps Log Message: Merge changes from dist/bzip2: man page converted to mdoc compiler warning fixes integer overflow fix remove files that aren't used on NetBSD Add adapted bzip2netbsd script. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/bzip2/bzip2.1 \ src/external/bsd/bzip2/bzip2.c src/external/bsd/bzip2/bzip2recover.c \ src/external/bsd/bzip2/bzlib.c src/external/bsd/bzip2/bzlib_private.h \ src/external/bsd/bzip2/decompress.c cvs rdiff -u -r0 -r1.1 src/external/bsd/bzip2/bzip2netbsd cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/bzip2/manual.pdf \ src/external/bsd/bzip2/manual.ps 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/bzip2/bzip2.1 diff -u src/external/bsd/bzip2/bzip2.1:1.1.1.1 src/external/bsd/bzip2/bzip2.1:1.2 --- src/external/bsd/bzip2/bzip2.1:1.1.1.1 Mon May 7 00:21:47 2012 +++ src/external/bsd/bzip2/bzip2.1 Mon May 7 00:30:05 2012 @@ -1,456 +1,510 @@ -.\ $NetBSD: bzip2.1,v 1.1.1.1 2012/05/07 00:21:47 wiz Exp $ +.\ $NetBSD: bzip2.1,v 1.2 2012/05/07 00:30:05 wiz Exp $ .\ -.PU -.TH bzip2 1 -.SH NAME -bzip2, bunzip2 \- a block-sorting file compressor, v1.0.4 -.br -bzcat \- decompresses files to stdout -.br -bzip2recover \- recovers data from damaged bzip2 files - -.SH SYNOPSIS -.ll +8 -.B bzip2 -.RB [ \-cdfkqstvzVL123456789 ] -[ -.I filenames \... -] -.ll -8 -.br -.B bunzip2 -.RB [ \-fkvsVL ] -[ -.I filenames \... -] -.br -.B bzcat -.RB [ \-s ] -[ -.I filenames \... -] -.br -.B bzip2recover -.I filename - -.SH DESCRIPTION -.I bzip2 +.Dd May 14, 2010 +.Dt BZIP2 1 +.Os +.Sh NAME +.Nm bzip2 , +.Nm bunzip2 , +.Nm bzcat , +.Nm bzip2recover +.Nd block-sorting file compressor +.Sh SYNOPSIS +.Nm bzip2 +.Op Fl 123456789cdfkLqstVvz +.Op Ar filename Ar +.Pp +.Nm bunzip2 +.Op Fl fkLVvs +.Op Ar filename Ar +.Pp +.Nm bzcat +.Op Fl s +.Op Ar filename Ar +.Pp +.Nm bzip2recover +.Ar filename +.Sh DESCRIPTION +.Nm bzip2 compresses files using the Burrows-Wheeler block sorting -text compression algorithm, and Huffman coding. Compression is -generally considerably better than that achieved by more conventional -LZ77/LZ78-based compressors, and approaches the performance of the PPM -family of statistical compressors. - -The command-line options are deliberately very similar to -those of -.I GNU gzip, +text compression algorithm, and Huffman coding. +Compression is generally considerably better than that achieved by +more conventional LZ77/LZ78-based compressors, and approaches the +performance of the PPM family of statistical compressors. +.Pp +.Nm bzcat +decompresses files to stdout, and +.Nm bzip2recover +recovers data from damaged bzip2 files. +.Pp +The command-line options are deliberately very similar to +those of +.Xr gzip 1 , but they are not identical. - -.I bzip2 -expects a list of file names to accompany the -command-line flags. Each file is replaced by a compressed version of -itself, with the name original_name.bz2. -Each compressed file -has the same modification date, permissions, and, when possible, -ownership as the corresponding original, so that these properties can -be correctly restored at decompression time. File name handling is -naive in the sense that there is no mechanism for preserving original -file names, permissions, ownerships or dates in filesystems which lack -these concepts, or have serious file name length restrictions, such as -MS-DOS. - -.I bzip2 +.Pp +.Nm bzip2 +expects a list of file names to accompany the command-line flags. +Each file is replaced by a compressed version of +itself, with the name +.Dq Pa original_name.bz2 . +Each compressed file has the same modification date, permissions, and, +when possible, ownership as the corresponding original, so that these +properties can be correctly restored at decompression time. +File name handling is naive in the sense that there is no mechanism +for preserving original file names, permissions, ownerships or dates +in filesystems which lack these concepts, or have serious file name +length restrictions, such as +.Tn MS-DOS . +.Nm bzip2 and -.I bunzip2 -will by default not overwrite existing -files. If you want this to happen, specify the \-f flag. - +.Nm bunzip2 +will by default not overwrite existing files. +If you want this to happen, specify the +.Fl f +flag. +.Pp If no file names are specified, -.I bzip2 -compresses from standard -input to standard output. In this case, -.I bzip2 -will decline to -write compressed output to a terminal, as this would be entirely -incomprehensible and therefore pointless. - -.I bunzip2
CVS commit: src
Module Name:src
Committed By: wiz
Date: Mon May 7 00:35:35 UTC 2012
Modified Files:
src/doc: 3RDPARTY
src/lib/libbz2: Makefile
src/tests/usr.bin/bzip2: Makefile
src/usr.bin/bzip2: Makefile
src/usr.bin/bzip2recover: Makefile
Removed Files:
src/dist/bzip2: CHANGES LICENSE Makefile Makefile-libbz2_so README
README.COMPILATION.PROBLEMS README.XML.STUFF blocksort.c
bz-common.xsl bz-fo.xsl bz-html.xsl bzdiff bzdiff.1 bzgrep bzgrep.1
bzip.css bzip2.1 bzip2.c bzip2netbsd bzip2recover.c bzlib.c bzlib.h
bzlib_private.h bzmore bzmore.1 compress.c crctable.c decompress.c
dlltest.c dlltest.dsp entities.xml format.pl huffman.c libbz2.def
libbz2.dsp makefile.msc manual.html manual.xml mk251.c randtable.c
sample1.bz2 sample1.ref sample2.bz2 sample2.ref sample3.bz2
sample3.ref spewG.c unzcrash.c words0 words1 words2 words3
xmlproc.sh
Log Message:
Finish move of bzip2 from dist/bzip2 to external/bsd/bzip2.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r0 src/dist/bzip2/CHANGES src/dist/bzip2/LICENSE \
src/dist/bzip2/Makefile src/dist/bzip2/Makefile-libbz2_so \
src/dist/bzip2/README src/dist/bzip2/README.COMPILATION.PROBLEMS \
src/dist/bzip2/blocksort.c src/dist/bzip2/bzlib.h \
src/dist/bzip2/compress.c src/dist/bzip2/crctable.c \
src/dist/bzip2/dlltest.c src/dist/bzip2/huffman.c \
src/dist/bzip2/randtable.c src/dist/bzip2/words3
cvs rdiff -u -r1.1.1.1 -r0 src/dist/bzip2/README.XML.STUFF \
src/dist/bzip2/bz-common.xsl src/dist/bzip2/bz-fo.xsl \
src/dist/bzip2/bz-html.xsl src/dist/bzip2/bzip.css src/dist/bzip2/bzmore \
src/dist/bzip2/dlltest.dsp src/dist/bzip2/entities.xml \
src/dist/bzip2/format.pl src/dist/bzip2/libbz2.def \
src/dist/bzip2/libbz2.dsp src/dist/bzip2/manual.xml \
src/dist/bzip2/sample1.bz2 src/dist/bzip2/sample1.ref \
src/dist/bzip2/sample2.bz2 src/dist/bzip2/sample2.ref \
src/dist/bzip2/sample3.bz2 src/dist/bzip2/sample3.ref \
src/dist/bzip2/words1 src/dist/bzip2/xmlproc.sh
cvs rdiff -u -r1.1.1.2 -r0 src/dist/bzip2/bzdiff src/dist/bzip2/bzdiff.1 \
src/dist/bzip2/bzgrep src/dist/bzip2/bzgrep.1 src/dist/bzip2/bzmore.1 \
src/dist/bzip2/makefile.msc src/dist/bzip2/manual.html \
src/dist/bzip2/mk251.c src/dist/bzip2/spewG.c src/dist/bzip2/unzcrash.c \
src/dist/bzip2/words0 src/dist/bzip2/words2
cvs rdiff -u -r1.9 -r0 src/dist/bzip2/bzip2.1 src/dist/bzip2/bzip2.c \
src/dist/bzip2/bzip2recover.c
cvs rdiff -u -r1.3 -r0 src/dist/bzip2/bzip2netbsd
cvs rdiff -u -r1.4 -r0 src/dist/bzip2/bzlib.c
cvs rdiff -u -r1.2 -r0 src/dist/bzip2/bzlib_private.h \
src/dist/bzip2/decompress.c
cvs rdiff -u -r1.935 -r1.936 src/doc/3RDPARTY
cvs rdiff -u -r1.15 -r1.16 src/lib/libbz2/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/bzip2/Makefile
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/bzip2/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/bzip2recover/Makefile
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.935 src/doc/3RDPARTY:1.936
--- src/doc/3RDPARTY:1.935 Wed May 2 02:44:20 2012
+++ src/doc/3RDPARTY Mon May 7 00:35:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.935 2012/05/02 02:44:20 christos Exp $
+# $NetBSD: 3RDPARTY,v 1.936 2012/05/07 00:35:25 wiz Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -188,16 +188,16 @@ See /usr/src/external/bsd/byacc/byacc2ne
Package: bzip2
Version: 1.0.5
-Current Vers: 1.0.5
+Current Vers: 1.0.6
Maintainer: Julian Seward jsew...@acm.org
Archive Site: http://sources.redhat.com/bzip2/
Home Page: http://www.bzip.org/
Mailing List:
Responsible:
License: BSD (4-clause)
-Location: dist/bzip2
+Location: external/bsd/bzip2
Notes:
-See /usr/src/dist/bzip2/bzip2netbsd for update instructions.
+See /usr/src/external/bsd/bzip2/bzip2netbsd for update instructions.
Package: Citrus XPG4DL
Version:
Index: src/lib/libbz2/Makefile
diff -u src/lib/libbz2/Makefile:1.15 src/lib/libbz2/Makefile:1.16
--- src/lib/libbz2/Makefile:1.15 Mon Jun 20 06:52:37 2011
+++ src/lib/libbz2/Makefile Mon May 7 00:35:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/06/20 06:52:37 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2012/05/07 00:35:26 wiz Exp $
USE_FORT?= yes # data driven bugs?
@@ -7,7 +7,7 @@ NOMAN= # defined
.include bsd.own.mk
LIB= bz2
-DIST= ${NETBSDSRCDIR}/dist/bzip2
+DIST= ${NETBSDSRCDIR}/external/bsd/bzip2
.PATH: ${DIST}
SRCS= blocksort.c huffman.c crctable.c randtable.c compress.c \
Index: src/tests/usr.bin/bzip2/Makefile
diff -u src/tests/usr.bin/bzip2/Makefile:1.1 src/tests/usr.bin/bzip2/Makefile:1.2
--- src/tests/usr.bin/bzip2/Makefile:1.1 Sat Mar 17 16:33:12 2012
+++
CVS commit: src/external/bsd/bzip2
Module Name:src Committed By: wiz Date: Mon May 7 00:41:52 UTC 2012 Update of /cvsroot/src/external/bsd/bzip2 In directory ivanova.netbsd.org:/tmp/cvs-serv3443 Log Message: Import bzip2-1.0.6: 1.0.6 (6 Sept 10) ~ * Security fix for CVE-2010-0405. This was reported by Mikolaj Izdebski. * Make the documentation build on Ubuntu 10.04 Status: Vendor Tag: JSEWARD Release Tags: bzip2-1-0-6 U src/external/bsd/bzip2/CHANGES U src/external/bsd/bzip2/LICENSE U src/external/bsd/bzip2/Makefile U src/external/bsd/bzip2/Makefile-libbz2_so U src/external/bsd/bzip2/README U src/external/bsd/bzip2/README.COMPILATION.PROBLEMS U src/external/bsd/bzip2/README.XML.STUFF U src/external/bsd/bzip2/bz-common.xsl U src/external/bsd/bzip2/bz-fo.xsl U src/external/bsd/bzip2/bz-html.xsl U src/external/bsd/bzip2/bzdiff U src/external/bsd/bzip2/bzgrep U src/external/bsd/bzip2/bzip.css U src/external/bsd/bzip2/bzmore U src/external/bsd/bzip2/dlltest.dsp U src/external/bsd/bzip2/entities.xml U src/external/bsd/bzip2/format.pl U src/external/bsd/bzip2/libbz2.def U src/external/bsd/bzip2/libbz2.dsp U src/external/bsd/bzip2/makefile.msc U src/external/bsd/bzip2/manual.html C src/external/bsd/bzip2/manual.pdf U src/external/bsd/bzip2/words0 C src/external/bsd/bzip2/manual.ps U src/external/bsd/bzip2/manual.xml U src/external/bsd/bzip2/sample1.bz2 U src/external/bsd/bzip2/sample1.ref U src/external/bsd/bzip2/sample2.bz2 U src/external/bsd/bzip2/sample2.ref U src/external/bsd/bzip2/sample3.bz2 U src/external/bsd/bzip2/sample3.ref U src/external/bsd/bzip2/words1 U src/external/bsd/bzip2/words2 U src/external/bsd/bzip2/words3 U src/external/bsd/bzip2/xmlproc.sh U src/external/bsd/bzip2/blocksort.c C src/external/bsd/bzip2/bzip2.c C src/external/bsd/bzip2/bzip2recover.c C src/external/bsd/bzip2/bzlib.c U src/external/bsd/bzip2/bzlib.h C src/external/bsd/bzip2/bzlib_private.h U src/external/bsd/bzip2/compress.c U src/external/bsd/bzip2/crctable.c C src/external/bsd/bzip2/decompress.c U src/external/bsd/bzip2/dlltest.c U src/external/bsd/bzip2/huffman.c U src/external/bsd/bzip2/mk251.c U src/external/bsd/bzip2/randtable.c U src/external/bsd/bzip2/spewG.c U src/external/bsd/bzip2/unzcrash.c U src/external/bsd/bzip2/bzdiff.1 U src/external/bsd/bzip2/bzgrep.1 C src/external/bsd/bzip2/bzip2.1 U src/external/bsd/bzip2/bzmore.1 8 conflicts created by this import. Use the following command to help the merge: cvs checkout -jJSEWARD:yesterday -jJSEWARD src/external/bsd/bzip2
CVS commit: src/external/bsd/bzip2
Module Name:src
Committed By: wiz
Date: Mon May 7 00:45:48 UTC 2012
Modified Files:
src/external/bsd/bzip2: bzip2.1 bzip2.c bzip2recover.c bzlib.c
bzlib_private.h decompress.c
Log Message:
merge 1.0.6
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bzip2/bzip2.1 \
src/external/bsd/bzip2/bzip2.c src/external/bsd/bzip2/bzip2recover.c \
src/external/bsd/bzip2/bzlib.c src/external/bsd/bzip2/bzlib_private.h \
src/external/bsd/bzip2/decompress.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/bzip2/bzip2.1
diff -u src/external/bsd/bzip2/bzip2.1:1.2 src/external/bsd/bzip2/bzip2.1:1.3
--- src/external/bsd/bzip2/bzip2.1:1.2 Mon May 7 00:30:05 2012
+++ src/external/bsd/bzip2/bzip2.1 Mon May 7 00:45:47 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: bzip2.1,v 1.2 2012/05/07 00:30:05 wiz Exp $
+.\ $NetBSD: bzip2.1,v 1.3 2012/05/07 00:45:47 wiz Exp $
.\
.Dd May 14, 2010
.Dt BZIP2 1
@@ -487,11 +487,11 @@ I/O error messages are not as helpful as
tries hard to detect I/O errors and exit cleanly, but the details of
what the problem is sometimes seem rather misleading.
.Pp
-This manual page pertains to version 1.0.5 of
+This manual page pertains to version 1.0.6 of
.Nm bzip2 .
Compressed data created by this version is entirely forwards and
backwards compatible with the previous public releases, versions
-0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and 1.0.3, but with the
+0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and above, but with the
following exception: 0.9.0 and above can correctly decompress multiple
concatenated compressed files.
0.1pl2 cannot do this; it will stop after decompressing just the first
Index: src/external/bsd/bzip2/bzip2.c
diff -u src/external/bsd/bzip2/bzip2.c:1.2 src/external/bsd/bzip2/bzip2.c:1.3
--- src/external/bsd/bzip2/bzip2.c:1.2 Mon May 7 00:30:05 2012
+++ src/external/bsd/bzip2/bzip2.c Mon May 7 00:45:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bzip2.c,v 1.2 2012/05/07 00:30:05 wiz Exp $ */
+/* $NetBSD: bzip2.c,v 1.3 2012/05/07 00:45:47 wiz Exp $ */
/*---*/
@@ -9,8 +9,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.5 of 10 December 2007
- Copyright (C) 1996-2007 Julian Seward jsew...@bzip.org
+ bzip2/libbzip2 version 1.0.6 of 6 September 2010
+ Copyright (C) 1996-2010 Julian Seward jsew...@bzip.org
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -1610,11 +1610,11 @@ void license ( void )
bzip2, a block-sorting file compressor.
Version %s.\n
\n
- Copyright (C) 1996-2007 by Julian Seward.\n
+ Copyright (C) 1996-2010 by Julian Seward.\n
\n
This program is free software; you can redistribute it and/or modify\n
it under the terms set out in the LICENSE file, which is included\n
- in the bzip2-1.0.5 source distribution.\n
+ in the bzip2-1.0.6 source distribution.\n
\n
This program is distributed in the hope that it will be useful,\n
but WITHOUT ANY WARRANTY; without even the implied warranty of\n
Index: src/external/bsd/bzip2/bzip2recover.c
diff -u src/external/bsd/bzip2/bzip2recover.c:1.2 src/external/bsd/bzip2/bzip2recover.c:1.3
--- src/external/bsd/bzip2/bzip2recover.c:1.2 Mon May 7 00:30:05 2012
+++ src/external/bsd/bzip2/bzip2recover.c Mon May 7 00:45:47 2012
@@ -1,5 +1,4 @@
-/* $NetBSD: bzip2recover.c,v 1.2 2012/05/07 00:30:05 wiz Exp $ */
-
+/* $NetBSD: bzip2recover.c,v 1.3 2012/05/07 00:45:47 wiz Exp $ */
/*---*/
/*--- Block recoverer program for bzip2 ---*/
@@ -10,8 +9,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.5 of 10 December 2007
- Copyright (C) 1996-2007 Julian Seward jsew...@bzip.org
+ bzip2/libbzip2 version 1.0.6 of 6 September 2010
+ Copyright (C) 1996-2010 Julian Seward jsew...@bzip.org
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -329,7 +328,7 @@ Int32 main ( Int32 argc, Char** argv )
inFileName[0] = outFileName[0] = 0;
fprintf ( stderr,
- bzip2recover 1.0.5: extracts blocks from damaged .bz2 files.\n );
+ bzip2recover 1.0.6: extracts blocks from damaged .bz2 files.\n );
if (argc != 2) {
fprintf ( stderr, %s: usage is `%s damaged_file_name'.\n,
Index: src/external/bsd/bzip2/bzlib.c
diff -u src/external/bsd/bzip2/bzlib.c:1.2 src/external/bsd/bzip2/bzlib.c:1.3
--- src/external/bsd/bzip2/bzlib.c:1.2 Mon May 7 00:30:05 2012
+++ src/external/bsd/bzip2/bzlib.c Mon May 7 00:45:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bzlib.c,v
CVS commit: src/sys/arch/i386/i386
Module Name:src
Committed By: jym
Date: Mon May 7 02:12:35 UTC 2012
Modified Files:
src/sys/arch/i386/i386: db_memrw.c
Log Message:
I am not quite sure that __data_start (set through location counter) is
a char... declare it as int, like amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/i386/db_memrw.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/i386/i386/db_memrw.c
diff -u src/sys/arch/i386/i386/db_memrw.c:1.25 src/sys/arch/i386/i386/db_memrw.c:1.26
--- src/sys/arch/i386/i386/db_memrw.c:1.25 Tue Mar 10 20:05:30 2009
+++ src/sys/arch/i386/i386/db_memrw.c Mon May 7 02:12:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: db_memrw.c,v 1.25 2009/03/10 20:05:30 bouyer Exp $ */
+/* $NetBSD: db_memrw.c,v 1.26 2012/05/07 02:12:35 jym Exp $ */
/*-
* Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_memrw.c,v 1.25 2009/03/10 20:05:30 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_memrw.c,v 1.26 2012/05/07 02:12:35 jym Exp $);
#include opt_xen.h
@@ -186,7 +186,7 @@ db_write_text(vaddr_t addr, size_t size,
void
db_write_bytes(vaddr_t addr, size_t size, const char *data)
{
- extern char __data_start;
+ extern int __data_start;
char *dst;
dst = (char *)addr;
CVS commit: src/sys/arch/i386/i386
Module Name:src
Committed By: jym
Date: Mon May 7 02:15:34 UTC 2012
Modified Files:
src/sys/arch/i386/i386: db_memrw.c
Log Message:
Remove XXXSMP comment and explain why no TLB shootdown is required here.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/i386/i386/db_memrw.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/i386/i386/db_memrw.c
diff -u src/sys/arch/i386/i386/db_memrw.c:1.26 src/sys/arch/i386/i386/db_memrw.c:1.27
--- src/sys/arch/i386/i386/db_memrw.c:1.26 Mon May 7 02:12:35 2012
+++ src/sys/arch/i386/i386/db_memrw.c Mon May 7 02:15:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: db_memrw.c,v 1.26 2012/05/07 02:12:35 jym Exp $ */
+/* $NetBSD: db_memrw.c,v 1.27 2012/05/07 02:15:34 jym Exp $ */
/*-
* Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_memrw.c,v 1.26 2012/05/07 02:12:35 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_memrw.c,v 1.27 2012/05/07 02:15:34 jym Exp $);
#include opt_xen.h
@@ -161,22 +161,13 @@ db_write_text(vaddr_t addr, size_t size,
*/
pmap_pte_set(pte, oldpte);
pmap_pte_flush();
-#if 0
+ pmap_update_pg(pgva);
/*
- * XXXSMP Not clear if this is needed for 100% correctness.
+ * MULTIPROCESSOR: no shootdown required as all other CPUs
+ * should be in CPUF_PAUSE state and will not cache the PTE
+ * with the write access set.
*/
- {
- int cpumask = 0;
- /*
- * shoot down in case other CPU mistakenly caches page.
- */
- pmap_tlb_shootdown(pmap_kernel(), pgva, 0, PG_G);
- pmap_tlb_shootwait();
- }
-#else
- pmap_update_pg(pgva);
-#endif
-
+
} while (size != 0);
}
CVS commit: src/sys/arch/i386/i386
Module Name:src
Committed By: jym
Date: Mon May 7 02:32:09 UTC 2012
Modified Files:
src/sys/arch/i386/i386: db_memrw.c
Log Message:
Use pmap_pte_*bits macros to set/clear bits in a PTE. Remove pmap_pte_flush
calls as these operations are synchronously flushed under Xen; they should
not be cached.
XXX the code can be shared between i386 and amd64, but I will merge
them once I figure out why db_write_text() can cause page faults for
certain CPUs in long mode (code looks correct, but single stepping or
adding debug printf's makes the bug magically disappear... sigh)
Bug reported by David Laight on port-amd64@ when attempting to set
breakpoints through ddb(4).
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/i386/i386/db_memrw.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/i386/i386/db_memrw.c
diff -u src/sys/arch/i386/i386/db_memrw.c:1.27 src/sys/arch/i386/i386/db_memrw.c:1.28
--- src/sys/arch/i386/i386/db_memrw.c:1.27 Mon May 7 02:15:34 2012
+++ src/sys/arch/i386/i386/db_memrw.c Mon May 7 02:32:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: db_memrw.c,v 1.27 2012/05/07 02:15:34 jym Exp $ */
+/* $NetBSD: db_memrw.c,v 1.28 2012/05/07 02:32:09 jym Exp $ */
/*-
* Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_memrw.c,v 1.27 2012/05/07 02:15:34 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_memrw.c,v 1.28 2012/05/07 02:32:09 jym Exp $);
#include opt_xen.h
@@ -97,7 +97,7 @@ db_read_bytes(vaddr_t addr, size_t size,
static void
db_write_text(vaddr_t addr, size_t size, const char *data)
{
- pt_entry_t *pte, oldpte, tmppte;
+ pt_entry_t *ppte, pte;
vaddr_t pgva;
size_t limit;
char *dst;
@@ -111,10 +111,10 @@ db_write_text(vaddr_t addr, size_t size,
/*
* Get the PTE for the page.
*/
- pte = kvtopte(addr);
- oldpte = *pte;
+ ppte = kvtopte(addr);
+ pte = *ppte;
- if ((oldpte PG_V) == 0) {
+ if ((pte PG_V) == 0) {
printf( address %p not a valid page\n, dst);
return;
}
@@ -122,7 +122,7 @@ db_write_text(vaddr_t addr, size_t size,
/*
* Get the VA for the page.
*/
- if (oldpte PG_PS)
+ if (pte PG_PS)
pgva = (vaddr_t)dst PG_LGFRAME;
else
pgva = x86_trunc_page((vaddr_t)dst);
@@ -132,7 +132,7 @@ db_write_text(vaddr_t addr, size_t size,
* with this mapping and subtract it from the
* total size.
*/
- if (oldpte PG_PS)
+ if (pte PG_PS)
limit = NBPD_L2 - ((vaddr_t)dst (NBPD_L2 - 1));
else
limit = PAGE_SIZE - ((vaddr_t)dst PGOFSET);
@@ -140,9 +140,11 @@ db_write_text(vaddr_t addr, size_t size,
limit = size;
size -= limit;
- tmppte = (oldpte ~PG_KR) | PG_KW;
- pmap_pte_set(pte, tmppte);
- pmap_pte_flush();
+ /*
+ * Make the kernel text page writable.
+ */
+ pmap_pte_clearbits(ppte, PG_KR);
+ pmap_pte_setbits(ppte, PG_KW);
pmap_update_pg(pgva);
/*
* MULTIPROCESSOR: no shootdown required as the PTE continues to
@@ -157,10 +159,10 @@ db_write_text(vaddr_t addr, size_t size,
*dst++ = *data++;
/*
- * Restore the old PTE.
+ * Turn the page back to read-only.
*/
- pmap_pte_set(pte, oldpte);
- pmap_pte_flush();
+ pmap_pte_clearbits(ppte, PG_KW);
+ pmap_pte_setbits(ppte, PG_KR);
pmap_update_pg(pgva);
/*
* MULTIPROCESSOR: no shootdown required as all other CPUs
CVS commit: [netbsd-6] src/crypto/external/bsd/openssl/dist/crypto/buffer
Module Name:src
Committed By: riz
Date: Mon May 7 02:57:22 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/buffer [netbsd-6]: buffer.c
Log Message:
Pull up following revision(s) (requested by drochner in ticket #203):
crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c: revision 1.3
fix for previous fix: correct error code (upstream rev.22474)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2.4.1 -r1.1.1.2.4.2 \
src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c:1.1.1.2.4.1 src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c:1.1.1.2.4.2
--- src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c:1.1.1.2.4.1 Mon Apr 23 16:54:03 2012
+++ src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c Mon May 7 02:57:22 2012
@@ -156,7 +156,7 @@ int BUF_MEM_grow_clean(BUF_MEM *str, siz
/* This limit is sufficient to ensure (len+3)/3*4 2**31 */
if (len LIMIT_BEFORE_EXPANSION)
{
- BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE);
+ BUFerr(BUF_F_BUF_MEM_GROW_CLEAN,ERR_R_MALLOC_FAILURE);
return 0;
}
n=(len+3)/3*4;
CVS commit: [netbsd-6] src/sys
Module Name:src
Committed By: riz
Date: Mon May 7 03:01:14 UTC 2012
Modified Files:
src/sys/fs/msdosfs [netbsd-6]: msdosfs_vnops.c
src/sys/fs/ntfs [netbsd-6]: ntfs_vnops.c
src/sys/fs/sysvbfs [netbsd-6]: sysvbfs_vnops.c
src/sys/fs/udf [netbsd-6]: udf_subr.c udf_vnops.c
src/sys/fs/v7fs [netbsd-6]: v7fs_vnops.c
src/sys/kern [netbsd-6]: vfs_subr.c vfs_wapbl.c
src/sys/miscfs/genfs [netbsd-6]: genfs_io.c
src/sys/miscfs/specfs [netbsd-6]: spec_vnops.c
src/sys/ufs/chfs [netbsd-6]: chfs_vnops.c
src/sys/ufs/ext2fs [netbsd-6]: ext2fs_readwrite.c ext2fs_vnops.c
src/sys/ufs/ffs [netbsd-6]: ffs_vfsops.c ffs_vnops.c
src/sys/ufs/ufs [netbsd-6]: ufs_readwrite.c
src/sys/uvm [netbsd-6]: uvm_pager.h
Log Message:
Pull up following revision(s) (requested by chs in ticket #204):
sys/fs/sysvbfs/sysvbfs_vnops.c: revision 1.44
sys/ufs/ffs/ffs_vfsops.c: revision 1.277
sys/fs/v7fs/v7fs_vnops.c: revision 1.11
sys/ufs/chfs/chfs_vnops.c: revision 1.7
sys/ufs/ext2fs/ext2fs_readwrite.c: revision 1.61
sys/miscfs/genfs/genfs_io.c: revision 1.54
sys/kern/vfs_wapbl.c: revision 1.52
sys/uvm/uvm_pager.h: revision 1.43
sys/ufs/ffs/ffs_vnops.c: revision 1.121
sys/kern/vfs_subr.c: revision 1.434
sys/fs/msdosfs/msdosfs_vnops.c: revision 1.83
sys/fs/ntfs/ntfs_vnops.c: revision 1.51
sys/fs/udf/udf_subr.c: revision 1.119
sys/miscfs/specfs/spec_vnops.c: revision 1.135
sys/ufs/ext2fs/ext2fs_vnops.c: revision 1.103
sys/fs/udf/udf_vnops.c: revision 1.71
sys/ufs/ufs/ufs_readwrite.c: revision 1.104
change vflushbuf() to take the full FSYNC_* flags.
translate FSYNC_LAZY into PGO_LAZY for VOP_PUTPAGES() so that
genfs_do_io() can set the appropriate io priority for the I/O.
this is the first part of addressing PR 46325.
mark all wapbl I/O as BPRIO_TIMECRITICAL.
this is the second part of addressing PR 46325.
To generate a diff of this commit:
cvs rdiff -u -r1.79.4.1 -r1.79.4.2 src/sys/fs/msdosfs/msdosfs_vnops.c
cvs rdiff -u -r1.49 -r1.49.10.1 src/sys/fs/ntfs/ntfs_vnops.c
cvs rdiff -u -r1.40 -r1.40.2.1 src/sys/fs/sysvbfs/sysvbfs_vnops.c
cvs rdiff -u -r1.118 -r1.118.6.1 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.69 -r1.69.6.1 src/sys/fs/udf/udf_vnops.c
cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/fs/v7fs/v7fs_vnops.c
cvs rdiff -u -r1.432 -r1.432.2.1 src/sys/kern/vfs_subr.c
cvs rdiff -u -r1.51 -r1.51.2.1 src/sys/kern/vfs_wapbl.c
cvs rdiff -u -r1.53 -r1.53.8.1 src/sys/miscfs/genfs/genfs_io.c
cvs rdiff -u -r1.134 -r1.134.8.1 src/sys/miscfs/specfs/spec_vnops.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/sys/ufs/chfs/chfs_vnops.c
cvs rdiff -u -r1.58 -r1.58.6.1 src/sys/ufs/ext2fs/ext2fs_readwrite.c
cvs rdiff -u -r1.101 -r1.101.6.1 src/sys/ufs/ext2fs/ext2fs_vnops.c
cvs rdiff -u -r1.275 -r1.275.2.1 src/sys/ufs/ffs/ffs_vfsops.c
cvs rdiff -u -r1.120 -r1.120.8.1 src/sys/ufs/ffs/ffs_vnops.c
cvs rdiff -u -r1.101 -r1.101.2.1 src/sys/ufs/ufs/ufs_readwrite.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/uvm/uvm_pager.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/fs/msdosfs/msdosfs_vnops.c
diff -u src/sys/fs/msdosfs/msdosfs_vnops.c:1.79.4.1 src/sys/fs/msdosfs/msdosfs_vnops.c:1.79.4.2
--- src/sys/fs/msdosfs/msdosfs_vnops.c:1.79.4.1 Fri Apr 6 17:40:20 2012
+++ src/sys/fs/msdosfs/msdosfs_vnops.c Mon May 7 03:01:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vnops.c,v 1.79.4.1 2012/04/06 17:40:20 riz Exp $ */
+/* $NetBSD: msdosfs_vnops.c,v 1.79.4.2 2012/05/07 03:01:13 riz Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: msdosfs_vnops.c,v 1.79.4.1 2012/04/06 17:40:20 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: msdosfs_vnops.c,v 1.79.4.2 2012/05/07 03:01:13 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -653,7 +653,8 @@ msdosfs_write(void *v)
if (!async oldoff 16 != uio-uio_offset 16) {
mutex_enter(vp-v_interlock);
error = VOP_PUTPAGES(vp, (oldoff 16) 16,
- (uio-uio_offset 16) 16, PGO_CLEANIT);
+ (uio-uio_offset 16) 16,
+ PGO_CLEANIT | PGO_LAZY);
}
} while (error == 0 uio-uio_resid 0);
@@ -1805,7 +1806,7 @@ msdosfs_fsync(void *v)
fstrans_start(vp-v_mount, FSTRANS_LAZY);
wait = (ap-a_flags FSYNC_WAIT) != 0;
- error = vflushbuf(vp, wait);
+ error = vflushbuf(vp, ap-a_flags);
if (error == 0 (ap-a_flags FSYNC_DATAONLY) == 0)
error = msdosfs_update(vp, NULL, NULL, wait ? UPDATE_WAIT : 0);
Index: src/sys/fs/ntfs/ntfs_vnops.c
diff -u src/sys/fs/ntfs/ntfs_vnops.c:1.49 src/sys/fs/ntfs/ntfs_vnops.c:1.49.10.1
--- src/sys/fs/ntfs/ntfs_vnops.c:1.49 Thu May 19 03:11:57 2011
+++ src/sys/fs/ntfs/ntfs_vnops.c Mon May 7 03:01:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_vnops.c,v 1.49 2011/05/19 03:11:57
CVS commit: [netbsd-6] src/sys/dev
Module Name:src
Committed By: riz
Date: Mon May 7 03:03:18 UTC 2012
Modified Files:
src/sys/dev [netbsd-6]: audio.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #205):
sys/dev/audio.c: revision 1.260
don't hold the thread lock while calling allocm() or freem(). fixes PR#46121
To generate a diff of this commit:
cvs rdiff -u -r1.257.2.2 -r1.257.2.3 src/sys/dev/audio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/audio.c
diff -u src/sys/dev/audio.c:1.257.2.2 src/sys/dev/audio.c:1.257.2.3
--- src/sys/dev/audio.c:1.257.2.2 Mon Apr 9 17:46:58 2012
+++ src/sys/dev/audio.c Mon May 7 03:03:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.257.2.2 2012/04/09 17:46:58 riz Exp $ */
+/* $NetBSD: audio.c,v 1.257.2.3 2012/05/07 03:03:18 riz Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -155,7 +155,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: audio.c,v 1.257.2.2 2012/04/09 17:46:58 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: audio.c,v 1.257.2.3 2012/05/07 03:03:18 riz Exp $);
#include audio.h
#if NAUDIO 0
@@ -390,6 +390,7 @@ audioattach(device_t parent, device_t se
mixer_devinfo_t mi;
int iclass, mclass, oclass, rclass, props;
int record_master_found, record_source_found;
+ bool can_capture, can_playback;
sc = device_private(self);
sc-dev = self;
@@ -452,32 +453,27 @@ audioattach(device_t parent, device_t se
aprint_naive(\n);
aprint_normal(\n);
- /*
- * XXX Would like to not hold the sc_lock around this whole block
- * escpially for audio_alloc_ring(), except that the latter calls
- * -round_blocksize() which demands the thread lock to be taken.
- *
- * Revisit.
- */
mutex_enter(sc-sc_lock);
- if (audio_can_playback(sc)) {
+ can_playback = audio_can_playback(sc);
+ can_capture = audio_can_capture(sc);
+ mutex_exit(sc-sc_lock);
+
+ if (can_playback) {
error = audio_alloc_ring(sc, sc-sc_pr,
AUMODE_PLAY, AU_RING_SIZE);
if (error) {
sc-hw_if = NULL;
- mutex_exit(sc-sc_lock);
aprint_error(audio: could not allocate play buffer\n);
return;
}
}
- if (audio_can_capture(sc)) {
+ if (can_capture) {
error = audio_alloc_ring(sc, sc-sc_rr,
AUMODE_RECORD, AU_RING_SIZE);
if (error) {
if (sc-sc_pr.s.start != 0)
audio_free_ring(sc, sc-sc_pr);
sc-hw_if = NULL;
- mutex_exit(sc-sc_lock);
aprint_error(audio: could not allocate record buffer\n);
return;
}
@@ -485,6 +481,7 @@ audioattach(device_t parent, device_t se
sc-sc_lastgain = 128;
+ mutex_enter(sc-sc_lock);
error = audio_set_defaults(sc, 0);
mutex_exit(sc-sc_lock);
if (error != 0) {
@@ -885,8 +882,11 @@ audio_alloc_ring(struct audio_softc *sc,
if (bufsize AUMINBUF)
bufsize = AUMINBUF;
ROUNDSIZE(bufsize);
- if (hw-round_buffersize)
+ if (hw-round_buffersize) {
+ mutex_enter(sc-sc_lock);
bufsize = hw-round_buffersize(hdl, direction, bufsize);
+ mutex_exit(sc-sc_lock);
+ }
if (hw-allocm)
r-s.start = hw-allocm(hdl, direction, bufsize);
else
CVS commit: [netbsd-6] src/sys/arch/sparc/sparc
Module Name:src
Committed By: riz
Date: Mon May 7 03:06:16 UTC 2012
Modified Files:
src/sys/arch/sparc/sparc [netbsd-6]: intr.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #206):
sys/arch/sparc/sparc/intr.c: revision 1.116
don't bother whining about bogusintr on zs.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.115.10.1 src/sys/arch/sparc/sparc/intr.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/sparc/sparc/intr.c
diff -u src/sys/arch/sparc/sparc/intr.c:1.115 src/sys/arch/sparc/sparc/intr.c:1.115.10.1
--- src/sys/arch/sparc/sparc/intr.c:1.115 Mon May 23 18:40:30 2011
+++ src/sys/arch/sparc/sparc/intr.c Mon May 7 03:06:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.115 2011/05/23 18:40:30 rmind Exp $ */
+/* $NetBSD: intr.c,v 1.115.10.1 2012/05/07 03:06:16 riz Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.115 2011/05/23 18:40:30 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.115.10.1 2012/05/07 03:06:16 riz Exp $);
#include opt_multiprocessor.h
#include opt_sparc_arch.h
@@ -131,6 +131,14 @@ bogusintr(struct clockframe *fp)
{
char bits[64];
+#if defined(MULTIPROCESSOR)
+ /*
+ * XXX as above.
+ */
+ if (fp-ipl == ZS_INTR_IPL)
+ return;
+#endif
+
snprintb(bits, sizeof(bits), PSR_BITS, fp-psr);
printf(cpu%d: bogus interrupt ipl 0x%x pc=0x%x npc=0x%x psr=%s\n,
cpu_number(), fp-ipl, fp-pc, fp-npc, bits);
CVS commit: [netbsd-6] src/tools
Module Name:src
Committed By: riz
Date: Mon May 7 03:08:35 UTC 2012
Modified Files:
src/tools/binutils [netbsd-6]: Makefile
src/tools/file [netbsd-6]: Makefile
src/tools/gmp [netbsd-6]: Makefile
src/tools/mpc [netbsd-6]: Makefile
src/tools/mpfr [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #207):
tools/gmp/Makefile: revision 1.2
tools/mpfr/Makefile: revision 1.2
tools/file/Makefile: revision 1.7
tools/binutils/Makefile: revision 1.22
tools/mpc/Makefile: revision 1.2
force ac_cv_path_mkdir to be set to nbinstall -d. this will avoid
gmp/configure from trying to use its install-sh for mkdir -p, and
should fix sourcesets created tarball builds.
force set ac_cv_mkdir_path to our install -d program.
fixes the remaining issues with 'sourcesets' and 'tools'.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.4.1 src/tools/binutils/Makefile
cvs rdiff -u -r1.6 -r1.6.8.1 src/tools/file/Makefile
cvs rdiff -u -r1.1 -r1.1.4.1 src/tools/gmp/Makefile
cvs rdiff -u -r1.1 -r1.1.4.1 src/tools/mpc/Makefile
cvs rdiff -u -r1.1 -r1.1.4.1 src/tools/mpfr/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/binutils/Makefile
diff -u src/tools/binutils/Makefile:1.21 src/tools/binutils/Makefile:1.21.4.1
--- src/tools/binutils/Makefile:1.21 Mon Oct 31 08:14:44 2011
+++ src/tools/binutils/Makefile Mon May 7 03:08:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2011/10/31 08:14:44 mrg Exp $
+# $NetBSD: Makefile,v 1.21.4.1 2012/05/07 03:08:35 riz Exp $
.include bsd.own.mk
@@ -29,6 +29,9 @@ INSTALL_TARGET+=install-gprof
CCADDFLAGS= -I${DESTDIR}/usr/include -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
+# Force avoiding possibly non-executable install-sh.
+CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install -d
+
NEWCONFIGDIR?= ${.CURDIR}/../..
MKNATIVE?= ${.CURDIR}/mknative-binutils
Index: src/tools/file/Makefile
diff -u src/tools/file/Makefile:1.6 src/tools/file/Makefile:1.6.8.1
--- src/tools/file/Makefile:1.6 Fri May 8 17:45:22 2009
+++ src/tools/file/Makefile Mon May 7 03:08:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/05/08 17:45:22 christos Exp $
+# $NetBSD: Makefile,v 1.6.8.1 2012/05/07 03:08:35 riz Exp $
#
GNUHOSTDIST= ${.CURDIR}/../../external/bsd/file/dist
@@ -14,3 +14,6 @@ CONFIGURE_ARGS= --program-prefix=${_TOOL
.NOTPARALLEL:
.include ${.CURDIR}/../Makefile.gnuhost
+
+# Force avoiding possibly non-executable install-sh.
+CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install -d
Index: src/tools/gmp/Makefile
diff -u src/tools/gmp/Makefile:1.1 src/tools/gmp/Makefile:1.1.4.1
--- src/tools/gmp/Makefile:1.1 Mon Jun 20 05:56:46 2011
+++ src/tools/gmp/Makefile Mon May 7 03:08:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/20 05:56:46 mrg Exp $
+# $NetBSD: Makefile,v 1.1.4.1 2012/05/07 03:08:35 riz Exp $
#
GNUHOSTDIST= ${.CURDIR}/../../external/lgpl3/gmp/dist
@@ -12,3 +12,6 @@ CONFIGURE_ARGS+=--disable-shared
# when variable is used.
CONFIGURE_ENV:= ${CONFIGURE_ENV:NPATH=*:NCFLAGS=*:NCXXFLAGS=*} \
PATH=${TOOLDIR:Q}/bin:PATH
+
+# Force avoiding possibly non-executable install-sh.
+CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install -d
Index: src/tools/mpc/Makefile
diff -u src/tools/mpc/Makefile:1.1 src/tools/mpc/Makefile:1.1.4.1
--- src/tools/mpc/Makefile:1.1 Mon Jun 20 05:56:46 2011
+++ src/tools/mpc/Makefile Mon May 7 03:08:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/20 05:56:46 mrg Exp $
+# $NetBSD: Makefile,v 1.1.4.1 2012/05/07 03:08:35 riz Exp $
#
GNUHOSTDIST= ${.CURDIR}/../../external/lgpl2/mpc/dist
@@ -9,3 +9,6 @@ CONFIGURE_ARGS+= --with-gmp=${TOOLDIR:Q}
CONFIGURE_ARGS+=--disable-shared
.include ${.CURDIR}/../Makefile.gnuhost
+
+# Force avoiding possibly non-executable install-sh.
+CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install -d
Index: src/tools/mpfr/Makefile
diff -u src/tools/mpfr/Makefile:1.1 src/tools/mpfr/Makefile:1.1.4.1
--- src/tools/mpfr/Makefile:1.1 Mon Jun 20 05:56:45 2011
+++ src/tools/mpfr/Makefile Mon May 7 03:08:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/20 05:56:45 mrg Exp $
+# $NetBSD: Makefile,v 1.1.4.1 2012/05/07 03:08:35 riz Exp $
#
GNUHOSTDIST= ${.CURDIR}/../../external/lgpl3/mpfr/dist
@@ -8,3 +8,6 @@ CONFIGURE_ARGS+= --with-gmp=${TOOLDIR:Q}
CONFIGURE_ARGS+=--disable-shared
.include ${.CURDIR}/../Makefile.gnuhost
+
+# Force avoiding possibly non-executable install-sh.
+CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install -d
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src
Committed By: riz
Date: Mon May 7 03:10:28 UTC 2012
Modified Files:
src/sys/dev/pci [netbsd-6]: if_bnxvar.h
Log Message:
Pull up following revision(s) (requested by gdt in ticket #208):
sys/dev/pci/if_bnxvar.h: revision 1.3
Use RX_PAGES for rx_bd_chain_{,r}seq.
Before, TX_PAGES was used, but no harm was done because TX_PAGES ==
RX_PAGES == 2. Found by Frank Kastenholz of BBN.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/dev/pci/if_bnxvar.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/pci/if_bnxvar.h
diff -u src/sys/dev/pci/if_bnxvar.h:1.2 src/sys/dev/pci/if_bnxvar.h:1.2.8.1
--- src/sys/dev/pci/if_bnxvar.h:1.2 Fri Jul 15 11:29:31 2011
+++ src/sys/dev/pci/if_bnxvar.h Mon May 7 03:10:28 2012
@@ -220,8 +220,8 @@ struct bnx_softc
bus_addr_t tx_bd_chain_paddr[TX_PAGES];
/* H/W maintained RX buffer descriptor chain structure. */
- bus_dma_segment_t rx_bd_chain_seg[TX_PAGES];
- int rx_bd_chain_rseg[TX_PAGES];
+ bus_dma_segment_t rx_bd_chain_seg[RX_PAGES];
+ int rx_bd_chain_rseg[RX_PAGES];
bus_dmamap_t rx_bd_chain_map[RX_PAGES];
struct rx_bd *rx_bd_chain[RX_PAGES];
bus_addr_t rx_bd_chain_paddr[RX_PAGES];
CVS commit: [netbsd-6] src/lib/libpthread
Module Name:src
Committed By: riz
Date: Mon May 7 03:12:33 UTC 2012
Modified Files:
src/lib/libpthread [netbsd-6]: pthread.c
Log Message:
Pull up following revision(s) (requested by enami in ticket #209):
lib/libpthread/pthread.c: revision 1.134
Store allocated lwpctl state in the thread actually forked,
which is the only thread lives in the child process.
The problem originally reported here:
https://bugs.ruby-lang.org/issues/6341
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.125.4.1 src/lib/libpthread/pthread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread.c
diff -u src/lib/libpthread/pthread.c:1.125 src/lib/libpthread/pthread.c:1.125.4.1
--- src/lib/libpthread/pthread.c:1.125 Sun Oct 2 18:18:56 2011
+++ src/lib/libpthread/pthread.c Mon May 7 03:12:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread.c,v 1.125 2011/10/02 18:18:56 christos Exp $ */
+/* $NetBSD: pthread.c,v 1.125.4.1 2012/05/07 03:12:33 riz Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: pthread.c,v 1.125 2011/10/02 18:18:56 christos Exp $);
+__RCSID($NetBSD: pthread.c,v 1.125.4.1 2012/05/07 03:12:33 riz Exp $);
#define __EXPOSE_STACK 1
@@ -83,7 +83,6 @@ pthread_queue_t pthread__allqueue;
static pthread_attr_t pthread_default_attr;
static lwpctl_t pthread__dummy_lwpctl = { .lc_curcpu = LWPCTL_CPU_NONE };
-static pthread_t pthread__first;
enum {
DIAGASSERT_ABORT = 10,
@@ -231,7 +230,6 @@ pthread__init(void)
}
/* Tell libc that we're here and it should role-play accordingly. */
- pthread__first = first;
pthread_atfork(NULL, NULL, pthread__fork_callback);
__isthreaded = 1;
}
@@ -239,13 +237,12 @@ pthread__init(void)
static void
pthread__fork_callback(void)
{
- struct __pthread_st *self;
+ struct __pthread_st *self = pthread__self();
/* lwpctl state is not copied across fork. */
- if (_lwp_ctl(LWPCTL_FEATURE_CURCPU, pthread__first-pt_lwpctl)) {
+ if (_lwp_ctl(LWPCTL_FEATURE_CURCPU, self-pt_lwpctl)) {
err(1, _lwp_ctl);
}
- self = pthread__self();
self-pt_lid = _lwp_self();
}
CVS commit: [netbsd-6] src/sbin/gpt
Module Name:src Committed By: riz Date: Mon May 7 03:15:12 UTC 2012 Modified Files: src/sbin/gpt [netbsd-6]: gpt.8 Log Message: Pull up following revision(s) (requested by jakllsch in ticket #210): sbin/gpt/gpt.8: revision 1.10 sbin/gpt/gpt.8: revision 1.11 fix a path Bump date to date of previous change. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.2.1 src/sbin/gpt/gpt.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/gpt/gpt.8 diff -u src/sbin/gpt/gpt.8:1.9 src/sbin/gpt/gpt.8:1.9.2.1 --- src/sbin/gpt/gpt.8:1.9 Fri Nov 11 13:26:45 2011 +++ src/sbin/gpt/gpt.8 Mon May 7 03:15:12 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: gpt.8,v 1.9 2011/11/11 13:26:45 wiz Exp $ +.\ $NetBSD: gpt.8,v 1.9.2.1 2012/05/07 03:15:12 riz Exp $ .\ .\ Copyright (c) 2002 Marcel Moolenaar .\ All rights reserved. @@ -26,7 +26,7 @@ .\ .\ $FreeBSD: src/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $ .\ -.Dd November 11, 2011 +.Dd March 9, 2012 .Dt GPT 8 .Os .Sh NAME @@ -145,7 +145,7 @@ option allows the user to specify the fi .Nm should read the bootcode from. The default is to read from -.Pa /usr/mdec/mbr_gpt . +.Pa /usr/mdec/gptmbr.bin . .Pp The .Fl i
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Mon May 7 03:16:45 UTC 2012
Modified Files:
src/etc/rc.d [netbsd-6]: staticroute
src/share/man/man5 [netbsd-6]: route.conf.5
Log Message:
Pull up following revision(s) (requested by gendalia in ticket #211):
share/man/man5/route.conf.5: revision 1.4
etc/rc.d/staticroute: revision 1.6
Add the ability for staticroute to evaluate lines from /etc/route.conf
as shell script fragments, add example to the route.conf man page of
evaluating variables.
Remove route.conf man page statement that staticroute is enabled in
rc.conf since that's incorrect.
Wrap the staticroute while in parens, per apb christos, and
quote all the arguments for the evals.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.8.1 src/etc/rc.d/staticroute
cvs rdiff -u -r1.3 -r1.3.20.1 src/share/man/man5/route.conf.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/staticroute
diff -u src/etc/rc.d/staticroute:1.5 src/etc/rc.d/staticroute:1.5.8.1
--- src/etc/rc.d/staticroute:1.5 Wed Oct 7 08:06:11 2009
+++ src/etc/rc.d/staticroute Mon May 7 03:16:45 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: staticroute,v 1.5 2009/10/07 08:06:11 tron Exp $
+# $NetBSD: staticroute,v 1.5.8.1 2012/05/07 03:16:45 riz Exp $
#
# PROVIDE: staticroute
@@ -20,26 +20,29 @@ staticroute_doit() {
if [ -s /etc/route.conf ]; then
echo $1 static routes.
- while read args; do
+ ( while read args; do
[ -z $args ] continue
case $args in
#*)
;;
+*)
if [ $2 = add ]; then
- eval ${args#*+} || retval=1
+ eval ${args#*+} || retval=1
fi
;;
-*)
if [ $2 = delete ]; then
- eval ${args#*-} || retval=1
+ eval ${args#*-} || retval=1
fi
;;
+ !*)
+eval ${args#*!} || retval=1
+;;
*)
-route -q $2 -$args || retval=1
+eval route -q $2 -$args || retval=1
;;
esac
- done /etc/route.conf
+ done /etc/route.conf )
fi
return $retval
Index: src/share/man/man5/route.conf.5
diff -u src/share/man/man5/route.conf.5:1.3 src/share/man/man5/route.conf.5:1.3.20.1
--- src/share/man/man5/route.conf.5:1.3 Thu May 8 15:34:39 2008
+++ src/share/man/man5/route.conf.5 Mon May 7 03:16:44 2012
@@ -1,4 +1,4 @@
-.\$NetBSD: route.conf.5,v 1.3 2008/05/08 15:34:39 wiz Exp $
+.\$NetBSD: route.conf.5,v 1.3.20.1 2012/05/07 03:16:44 riz Exp $
.\
.\ Copyright (c) 2004 Thomas Klausner
.\ All rights reserved.
@@ -23,7 +23,7 @@
.\ INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd June 24, 2004
+.Dd May 1, 2012
.Dt ROUTE.CONF 5
.Os
.Sh NAME
@@ -46,6 +46,9 @@ are run during start-up,
while lines starting with a minus sign
.Pq Sq \-
are run during system shutdown.
+If a line starts with a
+.Sq \! ,
+the rest of the line will get evaluated as a shell script fragment.
All other lines are passed to
.Xr route 8 .
During start-up, they are passed behind a
@@ -66,10 +69,17 @@ script that parses
.Nm .
.El
.Sh EXAMPLES
-In this example, if the
-.Pa staticroute
-script is enabled in
-.Xr rc.conf 5 ,
+In this example, the interface for the desired routing changes is set,
+the IP address on that interface is determined, and a route is added
+during startup, or deleted during system shutdown.
+.Bd -literal -offset indent
+# Set interface and determine current IP address for added route.
+!ifname=bnx0
+!ipaddr=$(/sbin/ifconfig ${ifname} | awk '$1 == inet {print $2}')
+net 10.10.1 -interface ${ipaddr}
+.Ed
+.Pp
+In this example,
IP forwarding is turned on during
start-up, and a static route added for 192.168.2.0.
During system shutdown, the route is removed
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon May 7 03:17:51 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 203-211. To generate a diff of this commit: cvs rdiff -u -r1.1.2.78 -r1.1.2.79 src/doc/CHANGES-6.0 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 diff -u src/doc/CHANGES-6.0:1.1.2.78 src/doc/CHANGES-6.0:1.1.2.79 --- src/doc/CHANGES-6.0:1.1.2.78 Thu Apr 26 03:04:34 2012 +++ src/doc/CHANGES-6.0 Mon May 7 03:17:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.78 2012/04/26 03:04:34 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.79 2012/05/07 03:17:51 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -1993,3 +1993,75 @@ sys/arch/sparc64/sparc64/trap.c 1.176 32-bit build fix for ticket #199. [martin, ticket #201] +crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c 1.3 + + Minor fix for ticket #197. + [drochner, ticket #203] + +sys/fs/msdosfs/msdosfs_vnops.c 1.83 via patch +sys/fs/ntfs/ntfs_vnops.c 1.51 via patch +sys/fs/sysvbfs/sysvbfs_vnops.c 1.44 via patch +sys/fs/udf/udf_subr.c1.119 via patch +sys/fs/udf/udf_vnops.c1.71 via patch +sys/fs/v7fs/v7fs_vnops.c 1.11 via patch +sys/kern/vfs_subr.c1.434 via patch +sys/kern/vfs_wapbl.c1.52 via patch +sys/miscfs/genfs/genfs_io.c 1.54 via patch +sys/miscfs/specfs/spec_vnops.c 1.135 via patch +sys/ufs/chfs/chfs_vnops.c 1.7 via patch +sys/ufs/ext2fs/ext2fs_readwrite.c 1.61 via patch +sys/ufs/ext2fs/ext2fs_vnops.c 1.103 via patch +sys/ufs/ffs/ffs_vfsops.c 1.277 via patch +sys/ufs/ffs/ffs_vnops.c1.121 via patch +sys/ufs/ufs/ufs_readwrite.c 1.104 via patch +sys/uvm/uvm_pager.h1.43 via patch + + Address WAPBL-related system freezes. PR#46325. + [chs, ticket #204] + +sys/dev/audio.c 1.260 + + Don't hold the thread lock while calling allocm() or freem(). PR#46121. + [mrg, ticket #205] + +sys/arch/sparc/sparc/intr.c 1.116 + + Sparc SMP fix: don't bother whining about bogus intr on zs. + [mrg, ticket #206] + +tools/binutils/Makefile1.22 +tools/file/Makefile1.7 +tools/gmp/Makefile1.2 +tools/mpc/Makefile1.2 +tools/mpfr/Makefile1.2 + + Fix source sets creation such that the extracted source + works properly for builds. + [mrg, ticket #207] + +sys/dev/pci/if_bnxvar.h1.3 + + Use correct constant in bnx(4). + [gdt, ticket #208] + +lib/libpthread/pthread.c 1.134 + + Store allocated lwpctl state in the thread actually forked, + which is the only thread lives in the child process. + The problem originally reported here: + https://bugs.ruby-lang.org/issues/6341 + [enami, ticket #209] + +sbin/gpt/gpt.8 1.10-1.11 + + Fix the documented pathname of /usr/mdec/gptmbr.bin . + [jakllsch, ticket #210] + +etc/rc.d/staticroute1.6 +share/man/man5/route.conf.5 1.4 + + Add the ability for staticroute to evaluate lines from /etc/route.conf + as shell script fragments, add example to the route.conf man page of + evaluating variables. + [gendalia, ticket #211] +
CVS commit: othersrc/external/bsd/progress
Module Name:othersrc
Committed By: agc
Date: Mon May 7 03:37:00 UTC 2012
Update of /cvsroot/othersrc/external/bsd/progress
In directory ivanova.netbsd.org:/tmp/cvs-serv218
Log Message:
Break out the routines (from tnftp) to calculate and draw a progress bar.
The code was originally written by Luke Mewburn - all mangling and bugs
courtesy of agc.
A quick (hypothetical) example of how to use this progress bar:
progress_t prog;
uint64_ttotal;
uint64_tdone;
total = 15768554;
progress_init(prog, test update bar, total);
for (done = 0 ; done total ; done += (total / 20) + ((random() %
20) * 1024)) {
progress_draw(prog, done);
sleep(1);
}
progress_complete(prog, done);
Status:
Vendor Tag: LUKEM
Release Tags: progress-base
N othersrc/external/bsd/progress/Makefile
N othersrc/external/bsd/progress/dist/progress.c
N othersrc/external/bsd/progress/dist/Makefile
N othersrc/external/bsd/progress/dist/main.c
N othersrc/external/bsd/progress/dist/libprogress.3
N othersrc/external/bsd/progress/dist/progress.h
N othersrc/external/bsd/progress/lib/shlib_version
N othersrc/external/bsd/progress/lib/Makefile
N othersrc/external/bsd/progress/bin/Makefile
No conflicts created by this import
CVS commit: src/doc
Module Name:src Committed By: agc Date: Sun May 6 07:28:48 UTC 2012 Modified Files: src/doc: BRANCHES Log Message: Document the new agc-netpgp-standalone branch under src/crypto/external/bsd/netpgp, used to develop a version of netpgp with its own BIGNUM/MPI, cipher and signature libraries. This will allow netpgp to be used without bootstrapping openssl first, in turn allowing netpgp to be used in places it would otherwise not be able to be used. To generate a diff of this commit: cvs rdiff -u -r1.322 -r1.323 src/doc/BRANCHES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/dev/lib/libscsitest
Module Name:src Committed By: martin Date: Sun May 6 16:33:02 UTC 2012 Modified Files: src/sys/rump/dev/lib/libscsitest: scsitest.c Log Message: If we are not delivering a host iso file (USE_TOSI_ISO is undefined), use -1 as file descriptor initially. The -2 value confused a few other checks later and led to inconsistent media present reports. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libscsitest/scsitest.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/scsipi
Module Name:src Committed By: martin Date: Sun May 6 16:42:20 UTC 2012 Modified Files: src/sys/dev/scsipi: cd.c Log Message: In cdopen: make the test for media presence always silent. In all cases requiring a message, we will most likely get that from the spinup attempt anyway. This avoids the spurious Check Condition on CDB, Not Ready, Medium Not Present, Tray Closed messages at boot/shutdown time. To generate a diff of this commit: cvs rdiff -u -r1.307 -r1.308 src/sys/dev/scsipi/cd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/dev/lib/libscsitest
Module Name:src Committed By: martin Date: Sun May 6 16:58:31 UTC 2012 Modified Files: src/sys/rump/dev/lib/libscsitest: scsitest.c Log Message: Revert previous and add a comment - I misunderstood what this code is emulating. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libscsitest/scsitest.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/scsipi
Module Name:src Committed By: martin Date: Sun May 6 17:23:10 UTC 2012 Modified Files: src/sys/dev/scsipi: cd.c Log Message: When ejecting a medium, invalidate the in core disklabel - it is not meaningfull anymore. This makes the following cdclose() use silent mode and finally fixes PR kern/43785. To generate a diff of this commit: cvs rdiff -u -r1.308 -r1.309 src/sys/dev/scsipi/cd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/dev/scsipi
Module Name:src Committed By: martin Date: Sun May 6 17:27:22 UTC 2012 Modified Files: src/tests/dev/scsipi: t_cd.c Log Message: Comment out the expected failure, as it does not trigger anymore. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/dev/scsipi/t_cd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/dist/src/libbn
Module Name:src Committed By: agc Date: Sun May 6 17:34:56 UTC 2012 Added Files: src/crypto/external/bsd/netpgp/dist/src/libbn [agc-netpgp-standalone]: Makefile bignum.c bn.h digest.c digest.h libnetpgpbn.3 misc.c misc.h rand.c rand.h stubs.c stubs.h Log Message: Add an API-alike equivalent library for openssl BIGNUM functionality. This is accomplished using the libtommath MPI implementation internally, without exporting any functions. All of the BIGNUM functionality to provide working netpgp signatures, verification, encryption and encryption is provided. Functions and macros included: BN_is_negative(x) BN_is_zero(a) BN_is_odd(a) BN_is_even(a) BIGNUM *BN_new(void); BIGNUM *BN_dup(const BIGNUM */*a*/); int BN_copy(BIGNUM */*b*/, const BIGNUM */*a*/); void BN_init(BIGNUM */*a*/); void BN_free(BIGNUM */*a*/); void BN_clear(BIGNUM */*a*/); void BN_clear_free(BIGNUM */*a*/); int BN_cmp(BIGNUM */*a*/, BIGNUM */*b*/); BIGNUM *BN_bin2bn(const uint8_t */*buf*/, int /*size*/, BIGNUM */*bn*/); int BN_bn2bin(const BIGNUM */*a*/, unsigned char */*b*/); char *BN_bn2hex(const BIGNUM */*a*/); char *BN_bn2dec(const BIGNUM */*a*/); int BN_hex2bn(BIGNUM **/*a*/, const char */*str*/); int BN_dec2bn(BIGNUM **/*a*/, const char */*str*/); int BN_print_fp(FILE */*fp*/, const BIGNUM */*a*/); int BN_add(BIGNUM */*r*/, const BIGNUM */*a*/, const BIGNUM */*b*/); int BN_sub(BIGNUM */*r*/, const BIGNUM */*a*/, const BIGNUM */*b*/); int BN_mul(BIGNUM */*r*/, const BIGNUM */*a*/, const BIGNUM */*b*/, BN_CTX */*ctx*/); int BN_div(BIGNUM */*q*/, BIGNUM */*r*/, const BIGNUM */*a*/, const BIGNUM */*b*/, BN_CTX */*ctx*/); void BN_swap(BIGNUM */*a*/, BIGNUM */*b*/); int BN_lshift(BIGNUM */*r*/, const BIGNUM */*a*/, int /*n*/); int BN_lshift1(BIGNUM */*r*/, BIGNUM */*a*/); int BN_rshift(BIGNUM */*r*/, const BIGNUM */*a*/, int /*n*/); int BN_rshift1(BIGNUM */*r*/, BIGNUM */*a*/); int BN_set_word(BIGNUM */*a*/, BN_ULONG /*w*/); void BN_set_negative(BIGNUM */*a*/, int /*n*/); int BN_num_bytes(const BIGNUM */*a*/); int BN_num_bits(const BIGNUM */*a*/); int BN_mod_exp(BIGNUM */*r*/, BIGNUM */*a*/, BIGNUM */*p*/, BIGNUM */*m*/, BN_CTX */*ctx*/); BIGNUM *BN_mod_inverse(BIGNUM */*ret*/, BIGNUM */*a*/, const BIGNUM */*n*/, BN_CTX */*ctx*/); int BN_mod_mul(BIGNUM */*ret*/, BIGNUM */*a*/, BIGNUM */*b*/, const BIGNUM */*m*/, BN_CTX */*ctx*/); int BN_mod_sub(BIGNUM */*r*/, BIGNUM */*a*/, BIGNUM */*b*/, const BIGNUM */*m*/, BN_CTX */*ctx*/); BN_CTX *BN_CTX_new(void); BIGNUM *BN_CTX_get(BN_CTX */*ctx*/); void BN_CTX_start(BN_CTX */*ctx*/); void BN_CTX_end(BN_CTX */*ctx*/); void BN_CTX_init(BN_CTX */*c*/); void BN_CTX_free(BN_CTX */*c*/); int BN_rand(BIGNUM */*rnd*/, int /*bits*/, int /*top*/, int /*bottom*/); int BN_rand_range(BIGNUM */*rnd*/, BIGNUM */*range*/); int BN_is_prime(const BIGNUM */*a*/, int /*checks*/, void (*callback)(int, int, void *), BN_CTX */*ctx*/, void */*cb_arg*/); const BIGNUM *BN_value_one(void); int BN_is_bit_set(const BIGNUM */*a*/, int /*n*/); To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 \ src/crypto/external/bsd/netpgp/dist/src/libbn/Makefile \ src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c \ src/crypto/external/bsd/netpgp/dist/src/libbn/bn.h \ src/crypto/external/bsd/netpgp/dist/src/libbn/digest.c \ src/crypto/external/bsd/netpgp/dist/src/libbn/digest.h \ src/crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3 \ src/crypto/external/bsd/netpgp/dist/src/libbn/misc.c \ src/crypto/external/bsd/netpgp/dist/src/libbn/misc.h \ src/crypto/external/bsd/netpgp/dist/src/libbn/rand.c \ src/crypto/external/bsd/netpgp/dist/src/libbn/rand.h \ src/crypto/external/bsd/netpgp/dist/src/libbn/stubs.c \ src/crypto/external/bsd/netpgp/dist/src/libbn/stubs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/dist/src/librsa
Module Name:src Committed By: agc Date: Sun May 6 17:46:45 UTC 2012 Added Files: src/crypto/external/bsd/netpgp/dist/src/librsa [agc-netpgp-standalone]: Makefile libnetpgprsa.3 rsa.c rsa.h rsastubs.c rsastubs.h Log Message: Add the RSA and DSA signature code to the agc-netpgp-standalone branch. Despite the library name, this library implements both RSA and DSA functionality. XXX There is still some work to do on DSA signatures and verification. XXX To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 \ src/crypto/external/bsd/netpgp/dist/src/librsa/Makefile \ src/crypto/external/bsd/netpgp/dist/src/librsa/libnetpgprsa.3 \ src/crypto/external/bsd/netpgp/dist/src/librsa/rsa.c \ src/crypto/external/bsd/netpgp/dist/src/librsa/rsa.h \ src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c \ src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/bin
Module Name:src Committed By: agc Date: Sun May 6 17:57:11 UTC 2012 Added Files: src/crypto/external/bsd/netpgp/bin/hkpc [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/bin/hkpd [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/bin/netpgp [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/bin/netpgpkeys [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/bin/netpgpverify [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/bin/pgp2ssh [agc-netpgp-standalone]: Makefile Log Message: reachover build infrastructure for standalone version of netpgp To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/bin/hkpc/Makefile cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/bin/hkpd/Makefile cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/bin/netpgp/Makefile cvs rdiff -u -r0 -r1.1.2.1 \ src/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile cvs rdiff -u -r0 -r1.1.2.1 \ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile cvs rdiff -u -r0 -r1.1.2.1 \ src/crypto/external/bsd/netpgp/bin/pgp2ssh/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/lib
Module Name:src Committed By: agc Date: Sun May 6 18:08:12 UTC 2012 Removed Files: src/crypto/external/bsd/netpgp/lib [agc-netpgp-standalone]: shlib_version Log Message: clean up a file which has now moved location To generate a diff of this commit: cvs rdiff -u -r1.4 -r0 src/crypto/external/bsd/netpgp/lib/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp
Module Name:src Committed By: agc Date: Sun May 6 18:14:17 UTC 2012 Modified Files: src/crypto/external/bsd/netpgp [agc-netpgp-standalone]: Makefile Removed Files: src/crypto/external/bsd/netpgp/hkpc [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/hkpd [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/libmj [agc-netpgp-standalone]: Makefile shlib_version src/crypto/external/bsd/netpgp/libpaa [agc-netpgp-standalone]: Makefile shlib_version src/crypto/external/bsd/netpgp/libpaa/client [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/libpaa/server [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/netpgp [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/netpgpkeys [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/netpgpverify [agc-netpgp-standalone]: Makefile src/crypto/external/bsd/netpgp/pgp2ssh [agc-netpgp-standalone]: Makefile Log Message: get rid of the old reachover infrastructure (which was horribly non-standard anyway). Replace with the new reachover build infrastructure for standalone netpgp To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.10.1 src/crypto/external/bsd/netpgp/Makefile cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/hkpc/Makefile cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/hkpd/Makefile cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/libmj/Makefile cvs rdiff -u -r1.2 -r0 src/crypto/external/bsd/netpgp/libmj/shlib_version cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/libpaa/Makefile \ src/crypto/external/bsd/netpgp/libpaa/shlib_version cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/libpaa/client/Makefile cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/libpaa/server/Makefile cvs rdiff -u -r1.3 -r0 src/crypto/external/bsd/netpgp/netpgp/Makefile cvs rdiff -u -r1.3 -r0 src/crypto/external/bsd/netpgp/netpgpkeys/Makefile cvs rdiff -u -r1.5 -r0 src/crypto/external/bsd/netpgp/netpgpverify/Makefile cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/pgp2ssh/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/bin
Module Name:src Committed By: agc Date: Sun May 6 18:15:26 UTC 2012 Added Files: src/crypto/external/bsd/netpgp/bin [agc-netpgp-standalone]: Makefile Log Message: Reachover Makefile for the bin directory for standalone netpgp To generate a diff of this commit: cvs rdiff -u -r0 -r1.3.6.2 src/crypto/external/bsd/netpgp/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/lib
Module Name:src Committed By: agc Date: Sun May 6 18:18:40 UTC 2012 Added Files: src/crypto/external/bsd/netpgp/lib/netpgp [agc-netpgp-standalone]: config.h Removed Files: src/crypto/external/bsd/netpgp/lib [agc-netpgp-standalone]: config.h Log Message: Move the autoconf-generated config.h file to its destination in the reachover infrastructure. To generate a diff of this commit: cvs rdiff -u -r1.8 -r0 src/crypto/external/bsd/netpgp/lib/config.h cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/netpgp/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x68k
Module Name:src Committed By: tsutsui Date: Sun May 6 19:46:18 UTC 2012 Modified Files: src/sys/arch/x68k/dev: fd.c src/sys/arch/x68k/x68k: machdep.c Log Message: Make x68k's floppy driver actually work with proper bounce buffer xfer ops on machines with extended high memories: - dev/fd.c: - add missing bus_dmamap_sync(9) POSTREAD/POSTWRITE ops - x68k/machdep.c: - update avail_end variable (which is used to check DMA'able memory range in intio.c) properly per probed extended memory regions The problem was found during debugging XM6i's FDC emulation by Y.Sugahara, isaki@, and me. Should be pulled up to netbsd-6. To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/sys/arch/x68k/dev/fd.c cvs rdiff -u -r1.181 -r1.182 src/sys/arch/x68k/x68k/machdep.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/grep
Module Name:src Committed By: joerg Date: Sun May 6 22:32:05 UTC 2012 Modified Files: src/usr.bin/grep: util.c Log Message: Consistently short cut the pattern loop on mismatches. Don't assign 1 conditionally, if unconditional works as well. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/usr.bin/grep/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/bzip2
Module Name:src Committed By: wiz Date: Mon May 7 00:30:06 UTC 2012 Modified Files: src/external/bsd/bzip2: bzip2.1 bzip2.c bzip2recover.c bzlib.c bzlib_private.h decompress.c Added Files: src/external/bsd/bzip2: bzip2netbsd Removed Files: src/external/bsd/bzip2: manual.pdf manual.ps Log Message: Merge changes from dist/bzip2: man page converted to mdoc compiler warning fixes integer overflow fix remove files that aren't used on NetBSD Add adapted bzip2netbsd script. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/bzip2/bzip2.1 \ src/external/bsd/bzip2/bzip2.c src/external/bsd/bzip2/bzip2recover.c \ src/external/bsd/bzip2/bzlib.c src/external/bsd/bzip2/bzlib_private.h \ src/external/bsd/bzip2/decompress.c cvs rdiff -u -r0 -r1.1 src/external/bsd/bzip2/bzip2netbsd cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/bzip2/manual.pdf \ src/external/bsd/bzip2/manual.ps Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: wiz Date: Mon May 7 00:35:35 UTC 2012 Modified Files: src/doc: 3RDPARTY src/lib/libbz2: Makefile src/tests/usr.bin/bzip2: Makefile src/usr.bin/bzip2: Makefile src/usr.bin/bzip2recover: Makefile Removed Files: src/dist/bzip2: CHANGES LICENSE Makefile Makefile-libbz2_so README README.COMPILATION.PROBLEMS README.XML.STUFF blocksort.c bz-common.xsl bz-fo.xsl bz-html.xsl bzdiff bzdiff.1 bzgrep bzgrep.1 bzip.css bzip2.1 bzip2.c bzip2netbsd bzip2recover.c bzlib.c bzlib.h bzlib_private.h bzmore bzmore.1 compress.c crctable.c decompress.c dlltest.c dlltest.dsp entities.xml format.pl huffman.c libbz2.def libbz2.dsp makefile.msc manual.html manual.xml mk251.c randtable.c sample1.bz2 sample1.ref sample2.bz2 sample2.ref sample3.bz2 sample3.ref spewG.c unzcrash.c words0 words1 words2 words3 xmlproc.sh Log Message: Finish move of bzip2 from dist/bzip2 to external/bsd/bzip2. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r0 src/dist/bzip2/CHANGES src/dist/bzip2/LICENSE \ src/dist/bzip2/Makefile src/dist/bzip2/Makefile-libbz2_so \ src/dist/bzip2/README src/dist/bzip2/README.COMPILATION.PROBLEMS \ src/dist/bzip2/blocksort.c src/dist/bzip2/bzlib.h \ src/dist/bzip2/compress.c src/dist/bzip2/crctable.c \ src/dist/bzip2/dlltest.c src/dist/bzip2/huffman.c \ src/dist/bzip2/randtable.c src/dist/bzip2/words3 cvs rdiff -u -r1.1.1.1 -r0 src/dist/bzip2/README.XML.STUFF \ src/dist/bzip2/bz-common.xsl src/dist/bzip2/bz-fo.xsl \ src/dist/bzip2/bz-html.xsl src/dist/bzip2/bzip.css src/dist/bzip2/bzmore \ src/dist/bzip2/dlltest.dsp src/dist/bzip2/entities.xml \ src/dist/bzip2/format.pl src/dist/bzip2/libbz2.def \ src/dist/bzip2/libbz2.dsp src/dist/bzip2/manual.xml \ src/dist/bzip2/sample1.bz2 src/dist/bzip2/sample1.ref \ src/dist/bzip2/sample2.bz2 src/dist/bzip2/sample2.ref \ src/dist/bzip2/sample3.bz2 src/dist/bzip2/sample3.ref \ src/dist/bzip2/words1 src/dist/bzip2/xmlproc.sh cvs rdiff -u -r1.1.1.2 -r0 src/dist/bzip2/bzdiff src/dist/bzip2/bzdiff.1 \ src/dist/bzip2/bzgrep src/dist/bzip2/bzgrep.1 src/dist/bzip2/bzmore.1 \ src/dist/bzip2/makefile.msc src/dist/bzip2/manual.html \ src/dist/bzip2/mk251.c src/dist/bzip2/spewG.c src/dist/bzip2/unzcrash.c \ src/dist/bzip2/words0 src/dist/bzip2/words2 cvs rdiff -u -r1.9 -r0 src/dist/bzip2/bzip2.1 src/dist/bzip2/bzip2.c \ src/dist/bzip2/bzip2recover.c cvs rdiff -u -r1.3 -r0 src/dist/bzip2/bzip2netbsd cvs rdiff -u -r1.4 -r0 src/dist/bzip2/bzlib.c cvs rdiff -u -r1.2 -r0 src/dist/bzip2/bzlib_private.h \ src/dist/bzip2/decompress.c cvs rdiff -u -r1.935 -r1.936 src/doc/3RDPARTY cvs rdiff -u -r1.15 -r1.16 src/lib/libbz2/Makefile cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/bzip2/Makefile cvs rdiff -u -r1.10 -r1.11 src/usr.bin/bzip2/Makefile cvs rdiff -u -r1.8 -r1.9 src/usr.bin/bzip2recover/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/bzip2
Module Name:src Committed By: wiz Date: Mon May 7 00:41:52 UTC 2012 Update of /cvsroot/src/external/bsd/bzip2 In directory ivanova.netbsd.org:/tmp/cvs-serv3443 Log Message: Import bzip2-1.0.6: 1.0.6 (6 Sept 10) ~ * Security fix for CVE-2010-0405. This was reported by Mikolaj Izdebski. * Make the documentation build on Ubuntu 10.04 Status: Vendor Tag: JSEWARD Release Tags: bzip2-1-0-6 U src/external/bsd/bzip2/CHANGES U src/external/bsd/bzip2/LICENSE U src/external/bsd/bzip2/Makefile U src/external/bsd/bzip2/Makefile-libbz2_so U src/external/bsd/bzip2/README U src/external/bsd/bzip2/README.COMPILATION.PROBLEMS U src/external/bsd/bzip2/README.XML.STUFF U src/external/bsd/bzip2/bz-common.xsl U src/external/bsd/bzip2/bz-fo.xsl U src/external/bsd/bzip2/bz-html.xsl U src/external/bsd/bzip2/bzdiff U src/external/bsd/bzip2/bzgrep U src/external/bsd/bzip2/bzip.css U src/external/bsd/bzip2/bzmore U src/external/bsd/bzip2/dlltest.dsp U src/external/bsd/bzip2/entities.xml U src/external/bsd/bzip2/format.pl U src/external/bsd/bzip2/libbz2.def U src/external/bsd/bzip2/libbz2.dsp U src/external/bsd/bzip2/makefile.msc U src/external/bsd/bzip2/manual.html C src/external/bsd/bzip2/manual.pdf U src/external/bsd/bzip2/words0 C src/external/bsd/bzip2/manual.ps U src/external/bsd/bzip2/manual.xml U src/external/bsd/bzip2/sample1.bz2 U src/external/bsd/bzip2/sample1.ref U src/external/bsd/bzip2/sample2.bz2 U src/external/bsd/bzip2/sample2.ref U src/external/bsd/bzip2/sample3.bz2 U src/external/bsd/bzip2/sample3.ref U src/external/bsd/bzip2/words1 U src/external/bsd/bzip2/words2 U src/external/bsd/bzip2/words3 U src/external/bsd/bzip2/xmlproc.sh U src/external/bsd/bzip2/blocksort.c C src/external/bsd/bzip2/bzip2.c C src/external/bsd/bzip2/bzip2recover.c C src/external/bsd/bzip2/bzlib.c U src/external/bsd/bzip2/bzlib.h C src/external/bsd/bzip2/bzlib_private.h U src/external/bsd/bzip2/compress.c U src/external/bsd/bzip2/crctable.c C src/external/bsd/bzip2/decompress.c U src/external/bsd/bzip2/dlltest.c U src/external/bsd/bzip2/huffman.c U src/external/bsd/bzip2/mk251.c U src/external/bsd/bzip2/randtable.c U src/external/bsd/bzip2/spewG.c U src/external/bsd/bzip2/unzcrash.c U src/external/bsd/bzip2/bzdiff.1 U src/external/bsd/bzip2/bzgrep.1 C src/external/bsd/bzip2/bzip2.1 U src/external/bsd/bzip2/bzmore.1 8 conflicts created by this import. Use the following command to help the merge: cvs checkout -jJSEWARD:yesterday -jJSEWARD src/external/bsd/bzip2
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: jym Date: Mon May 7 02:12:35 UTC 2012 Modified Files: src/sys/arch/i386/i386: db_memrw.c Log Message: I am not quite sure that __data_start (set through location counter) is a char... declare it as int, like amd64. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/i386/db_memrw.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/i386/i386
Module Name:src Committed By: jym Date: Mon May 7 02:32:09 UTC 2012 Modified Files: src/sys/arch/i386/i386: db_memrw.c Log Message: Use pmap_pte_*bits macros to set/clear bits in a PTE. Remove pmap_pte_flush calls as these operations are synchronously flushed under Xen; they should not be cached. XXX the code can be shared between i386 and amd64, but I will merge them once I figure out why db_write_text() can cause page faults for certain CPUs in long mode (code looks correct, but single stepping or adding debug printf's makes the bug magically disappear... sigh) Bug reported by David Laight on port-amd64@ when attempting to set breakpoints through ddb(4). To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/i386/i386/db_memrw.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/crypto/external/bsd/openssl/dist/crypto/buffer
Module Name:src Committed By: riz Date: Mon May 7 02:57:22 UTC 2012 Modified Files: src/crypto/external/bsd/openssl/dist/crypto/buffer [netbsd-6]: buffer.c Log Message: Pull up following revision(s) (requested by drochner in ticket #203): crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c: revision 1.3 fix for previous fix: correct error code (upstream rev.22474) To generate a diff of this commit: cvs rdiff -u -r1.1.1.2.4.1 -r1.1.1.2.4.2 \ src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys
Module Name:src Committed By: riz Date: Mon May 7 03:01:14 UTC 2012 Modified Files: src/sys/fs/msdosfs [netbsd-6]: msdosfs_vnops.c src/sys/fs/ntfs [netbsd-6]: ntfs_vnops.c src/sys/fs/sysvbfs [netbsd-6]: sysvbfs_vnops.c src/sys/fs/udf [netbsd-6]: udf_subr.c udf_vnops.c src/sys/fs/v7fs [netbsd-6]: v7fs_vnops.c src/sys/kern [netbsd-6]: vfs_subr.c vfs_wapbl.c src/sys/miscfs/genfs [netbsd-6]: genfs_io.c src/sys/miscfs/specfs [netbsd-6]: spec_vnops.c src/sys/ufs/chfs [netbsd-6]: chfs_vnops.c src/sys/ufs/ext2fs [netbsd-6]: ext2fs_readwrite.c ext2fs_vnops.c src/sys/ufs/ffs [netbsd-6]: ffs_vfsops.c ffs_vnops.c src/sys/ufs/ufs [netbsd-6]: ufs_readwrite.c src/sys/uvm [netbsd-6]: uvm_pager.h Log Message: Pull up following revision(s) (requested by chs in ticket #204): sys/fs/sysvbfs/sysvbfs_vnops.c: revision 1.44 sys/ufs/ffs/ffs_vfsops.c: revision 1.277 sys/fs/v7fs/v7fs_vnops.c: revision 1.11 sys/ufs/chfs/chfs_vnops.c: revision 1.7 sys/ufs/ext2fs/ext2fs_readwrite.c: revision 1.61 sys/miscfs/genfs/genfs_io.c: revision 1.54 sys/kern/vfs_wapbl.c: revision 1.52 sys/uvm/uvm_pager.h: revision 1.43 sys/ufs/ffs/ffs_vnops.c: revision 1.121 sys/kern/vfs_subr.c: revision 1.434 sys/fs/msdosfs/msdosfs_vnops.c: revision 1.83 sys/fs/ntfs/ntfs_vnops.c: revision 1.51 sys/fs/udf/udf_subr.c: revision 1.119 sys/miscfs/specfs/spec_vnops.c: revision 1.135 sys/ufs/ext2fs/ext2fs_vnops.c: revision 1.103 sys/fs/udf/udf_vnops.c: revision 1.71 sys/ufs/ufs/ufs_readwrite.c: revision 1.104 change vflushbuf() to take the full FSYNC_* flags. translate FSYNC_LAZY into PGO_LAZY for VOP_PUTPAGES() so that genfs_do_io() can set the appropriate io priority for the I/O. this is the first part of addressing PR 46325. mark all wapbl I/O as BPRIO_TIMECRITICAL. this is the second part of addressing PR 46325. To generate a diff of this commit: cvs rdiff -u -r1.79.4.1 -r1.79.4.2 src/sys/fs/msdosfs/msdosfs_vnops.c cvs rdiff -u -r1.49 -r1.49.10.1 src/sys/fs/ntfs/ntfs_vnops.c cvs rdiff -u -r1.40 -r1.40.2.1 src/sys/fs/sysvbfs/sysvbfs_vnops.c cvs rdiff -u -r1.118 -r1.118.6.1 src/sys/fs/udf/udf_subr.c cvs rdiff -u -r1.69 -r1.69.6.1 src/sys/fs/udf/udf_vnops.c cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/fs/v7fs/v7fs_vnops.c cvs rdiff -u -r1.432 -r1.432.2.1 src/sys/kern/vfs_subr.c cvs rdiff -u -r1.51 -r1.51.2.1 src/sys/kern/vfs_wapbl.c cvs rdiff -u -r1.53 -r1.53.8.1 src/sys/miscfs/genfs/genfs_io.c cvs rdiff -u -r1.134 -r1.134.8.1 src/sys/miscfs/specfs/spec_vnops.c cvs rdiff -u -r1.2 -r1.2.4.1 src/sys/ufs/chfs/chfs_vnops.c cvs rdiff -u -r1.58 -r1.58.6.1 src/sys/ufs/ext2fs/ext2fs_readwrite.c cvs rdiff -u -r1.101 -r1.101.6.1 src/sys/ufs/ext2fs/ext2fs_vnops.c cvs rdiff -u -r1.275 -r1.275.2.1 src/sys/ufs/ffs/ffs_vfsops.c cvs rdiff -u -r1.120 -r1.120.8.1 src/sys/ufs/ffs/ffs_vnops.c cvs rdiff -u -r1.101 -r1.101.2.1 src/sys/ufs/ufs/ufs_readwrite.c cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/uvm/uvm_pager.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/dev
Module Name:src Committed By: riz Date: Mon May 7 03:03:18 UTC 2012 Modified Files: src/sys/dev [netbsd-6]: audio.c Log Message: Pull up following revision(s) (requested by mrg in ticket #205): sys/dev/audio.c: revision 1.260 don't hold the thread lock while calling allocm() or freem(). fixes PR#46121 To generate a diff of this commit: cvs rdiff -u -r1.257.2.2 -r1.257.2.3 src/sys/dev/audio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/arch/sparc/sparc
Module Name:src Committed By: riz Date: Mon May 7 03:06:16 UTC 2012 Modified Files: src/sys/arch/sparc/sparc [netbsd-6]: intr.c Log Message: Pull up following revision(s) (requested by mrg in ticket #206): sys/arch/sparc/sparc/intr.c: revision 1.116 don't bother whining about bogusintr on zs. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.115.10.1 src/sys/arch/sparc/sparc/intr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/tools
Module Name:src Committed By: riz Date: Mon May 7 03:08:35 UTC 2012 Modified Files: src/tools/binutils [netbsd-6]: Makefile src/tools/file [netbsd-6]: Makefile src/tools/gmp [netbsd-6]: Makefile src/tools/mpc [netbsd-6]: Makefile src/tools/mpfr [netbsd-6]: Makefile Log Message: Pull up following revision(s) (requested by mrg in ticket #207): tools/gmp/Makefile: revision 1.2 tools/mpfr/Makefile: revision 1.2 tools/file/Makefile: revision 1.7 tools/binutils/Makefile: revision 1.22 tools/mpc/Makefile: revision 1.2 force ac_cv_path_mkdir to be set to nbinstall -d. this will avoid gmp/configure from trying to use its install-sh for mkdir -p, and should fix sourcesets created tarball builds. force set ac_cv_mkdir_path to our install -d program. fixes the remaining issues with 'sourcesets' and 'tools'. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.21.4.1 src/tools/binutils/Makefile cvs rdiff -u -r1.6 -r1.6.8.1 src/tools/file/Makefile cvs rdiff -u -r1.1 -r1.1.4.1 src/tools/gmp/Makefile cvs rdiff -u -r1.1 -r1.1.4.1 src/tools/mpc/Makefile cvs rdiff -u -r1.1 -r1.1.4.1 src/tools/mpfr/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src
Committed By: riz
Date: Mon May 7 03:10:28 UTC 2012
Modified Files:
src/sys/dev/pci [netbsd-6]: if_bnxvar.h
Log Message:
Pull up following revision(s) (requested by gdt in ticket #208):
sys/dev/pci/if_bnxvar.h: revision 1.3
Use RX_PAGES for rx_bd_chain_{,r}seq.
Before, TX_PAGES was used, but no harm was done because TX_PAGES ==
RX_PAGES == 2. Found by Frank Kastenholz of BBN.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/dev/pci/if_bnxvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/progress
Module Name:othersrc
Committed By: agc
Date: Mon May 7 03:37:00 UTC 2012
Update of /cvsroot/othersrc/external/bsd/progress
In directory ivanova.netbsd.org:/tmp/cvs-serv218
Log Message:
Break out the routines (from tnftp) to calculate and draw a progress bar.
The code was originally written by Luke Mewburn - all mangling and bugs
courtesy of agc.
A quick (hypothetical) example of how to use this progress bar:
progress_t prog;
uint64_ttotal;
uint64_tdone;
total = 15768554;
progress_init(prog, test update bar, total);
for (done = 0 ; done total ; done += (total / 20) + ((random() %
20) * 1024)) {
progress_draw(prog, done);
sleep(1);
}
progress_complete(prog, done);
Status:
Vendor Tag: LUKEM
Release Tags: progress-base
N othersrc/external/bsd/progress/Makefile
N othersrc/external/bsd/progress/dist/progress.c
N othersrc/external/bsd/progress/dist/Makefile
N othersrc/external/bsd/progress/dist/main.c
N othersrc/external/bsd/progress/dist/libprogress.3
N othersrc/external/bsd/progress/dist/progress.h
N othersrc/external/bsd/progress/lib/shlib_version
N othersrc/external/bsd/progress/lib/Makefile
N othersrc/external/bsd/progress/bin/Makefile
No conflicts created by this import
