CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src Committed By: agc Date: Thu Nov 4 06:40:25 UTC 2010 Added Files: src/crypto/external/bsd/netpgp/dist: rfc5581.txt Log Message: Add RFC5581 in the reference section - The Camellia Cipher in OpenPGP To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/netpgp/dist/rfc5581.txt 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/rfc5581.txt diff -u /dev/null src/crypto/external/bsd/netpgp/dist/rfc5581.txt:1.1 --- /dev/null Thu Nov 4 06:40:25 2010 +++ src/crypto/external/bsd/netpgp/dist/rfc5581.txt Thu Nov 4 06:40:25 2010 @@ -0,0 +1,171 @@ + + + + + + +Network Working GroupD. Shaw +Request for Comments: 5581 June 2009 +Updates: 4880 +Category: Informational + + + The Camellia Cipher in OpenPGP + +Status of This Memo + + This memo provides information for the Internet community. It does + not specify an Internet standard of any kind. Distribution of this + memo is unlimited. + +Copyright Notice + + Copyright (c) 2009 IETF Trust and the persons identified as the + document authors. All rights reserved. + + This document is subject to BCP 78 and the IETF Trust's Legal + Provisions Relating to IETF Documents in effect on the date of + publication of this document (http://trustee.ietf.org/license-info). + Please review these documents carefully, as they describe your rights + and restrictions with respect to this document. + +Abstract + + This document presents the necessary information to use the Camellia + symmetric block cipher in the OpenPGP protocol. + +Table of Contents + + 1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . . 2 + 2. Requirements Notation . . . . . . . . . . . . . . . . . . . . . 2 + 3. Camellia . . . . . . . . . . . . . . . . . . . . . . . . . . . 2 + 4. Security Considerations . . . . . . . . . . . . . . . . . . . . 2 + 5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . . 3 + 6. Normative References . . . . . . . . . . . . . . . . . . . . . 3 + + + + + + + + + + + + + +Shaw Informational [Page 1] + +RFC 5581 The Camellia Cipher in OpenPGPJune 2009 + + +1. Introduction + + The OpenPGP protocol [RFC4880] can support many different symmetric + ciphers. This document presents the necessary information to use the + Camellia [RFC3713] symmetric cipher in the OpenPGP protocol. + +2. Requirements Notation + + The key words MUST, MUST NOT, REQUIRED, SHALL, SHALL NOT, + SHOULD, SHOULD NOT, RECOMMENDED, MAY, and OPTIONAL in this + document are to be interpreted as described in [RFC2119]. + +3. Camellia + + Camellia is specified in [RFC3713]. It is a 128-bit symmetric block + cipher (as are AES and Twofish in OpenPGP) that supports 128-bit, + 192-bit, and 256-bit keys. This document defines the use of Camellia + in OpenPGP. + + +-++ + | Camellia Key Length | OpenPGP Symmetric-Key Algorithm Number | + +-++ + | 128 | 11 | + | 192 | 12 | + | 256 | 13 | + +-++ + + OpenPGP applications MAY implement Camellia. If implemented, + Camellia may be used in any place in OpenPGP where a symmetric cipher + is usable, and it is subject to the same usage requirements (such as + its presence in the Preferred Symmetric Algorithms signature + subpacket) as the other symmetric ciphers in OpenPGP. + + While the OpenPGP algorithm preferences system prevents + interoperability problems with public key encrypted messages, if + Camellia (or any other optional cipher) is used for encrypting + private keys, there could be interoperability problems when migrating + a private key from one system to another. A similar issue can arise + when using an optional cipher for symmetrically encrypted messages, + as this OpenPGP message type does not use the algorithm preferences + system. Those using optional ciphers in this manner should take care + they are using a cipher that their intended recipient can decrypt. + +4. Security Considerations + + At publication time, there are no known weak keys for Camellia, and + the Camellia algorithm is believed to be strong. However, as with + any technology involving cryptography, implementers should check the + + + +Shaw Informational [Page 2] + +RFC 5581 The Camellia Cipher in OpenPGP
CVS commit: src/crypto/external/bsd/netpgp/dist/ref
Module Name:src Committed By: agc Date: Thu Nov 4 06:41:45 UTC 2010 Added Files: src/crypto/external/bsd/netpgp/dist/ref: rfc5581.txt Log Message: Add RFC5581 in the reference section - The Camellia Cipher in OpenPGP To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/netpgp/dist/ref/rfc5581.txt 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/ref/rfc5581.txt diff -u /dev/null src/crypto/external/bsd/netpgp/dist/ref/rfc5581.txt:1.1 --- /dev/null Thu Nov 4 06:41:45 2010 +++ src/crypto/external/bsd/netpgp/dist/ref/rfc5581.txt Thu Nov 4 06:41:44 2010 @@ -0,0 +1,171 @@ + + + + + + +Network Working GroupD. Shaw +Request for Comments: 5581 June 2009 +Updates: 4880 +Category: Informational + + + The Camellia Cipher in OpenPGP + +Status of This Memo + + This memo provides information for the Internet community. It does + not specify an Internet standard of any kind. Distribution of this + memo is unlimited. + +Copyright Notice + + Copyright (c) 2009 IETF Trust and the persons identified as the + document authors. All rights reserved. + + This document is subject to BCP 78 and the IETF Trust's Legal + Provisions Relating to IETF Documents in effect on the date of + publication of this document (http://trustee.ietf.org/license-info). + Please review these documents carefully, as they describe your rights + and restrictions with respect to this document. + +Abstract + + This document presents the necessary information to use the Camellia + symmetric block cipher in the OpenPGP protocol. + +Table of Contents + + 1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . . 2 + 2. Requirements Notation . . . . . . . . . . . . . . . . . . . . . 2 + 3. Camellia . . . . . . . . . . . . . . . . . . . . . . . . . . . 2 + 4. Security Considerations . . . . . . . . . . . . . . . . . . . . 2 + 5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . . 3 + 6. Normative References . . . . . . . . . . . . . . . . . . . . . 3 + + + + + + + + + + + + + +Shaw Informational [Page 1] + +RFC 5581 The Camellia Cipher in OpenPGPJune 2009 + + +1. Introduction + + The OpenPGP protocol [RFC4880] can support many different symmetric + ciphers. This document presents the necessary information to use the + Camellia [RFC3713] symmetric cipher in the OpenPGP protocol. + +2. Requirements Notation + + The key words MUST, MUST NOT, REQUIRED, SHALL, SHALL NOT, + SHOULD, SHOULD NOT, RECOMMENDED, MAY, and OPTIONAL in this + document are to be interpreted as described in [RFC2119]. + +3. Camellia + + Camellia is specified in [RFC3713]. It is a 128-bit symmetric block + cipher (as are AES and Twofish in OpenPGP) that supports 128-bit, + 192-bit, and 256-bit keys. This document defines the use of Camellia + in OpenPGP. + + +-++ + | Camellia Key Length | OpenPGP Symmetric-Key Algorithm Number | + +-++ + | 128 | 11 | + | 192 | 12 | + | 256 | 13 | + +-++ + + OpenPGP applications MAY implement Camellia. If implemented, + Camellia may be used in any place in OpenPGP where a symmetric cipher + is usable, and it is subject to the same usage requirements (such as + its presence in the Preferred Symmetric Algorithms signature + subpacket) as the other symmetric ciphers in OpenPGP. + + While the OpenPGP algorithm preferences system prevents + interoperability problems with public key encrypted messages, if + Camellia (or any other optional cipher) is used for encrypting + private keys, there could be interoperability problems when migrating + a private key from one system to another. A similar issue can arise + when using an optional cipher for symmetrically encrypted messages, + as this OpenPGP message type does not use the algorithm preferences + system. Those using optional ciphers in this manner should take care + they are using a cipher that their intended recipient can decrypt. + +4. Security Considerations + + At publication time, there are no known weak keys for Camellia, and + the Camellia algorithm is believed to be strong. However, as with + any technology involving cryptography, implementers should check the + + + +Shaw Informational [Page 2] + +RFC 5581 The Camellia
CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src Committed By: agc Date: Thu Nov 4 06:42:22 UTC 2010 Removed Files: src/crypto/external/bsd/netpgp/dist: rfc5581.txt Log Message: put RFC 5581 in the reference section To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/dist/rfc5581.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src
Committed By: agc
Date: Thu Nov 4 06:45:28 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: crypto.h misc.c netpgp.c
openssl_crypto.c packet-show.c packet.h symmetric.c version.h
Log Message:
Update to version 3.99.13:
+ add ability in netpgpkeys(1) to specify the cipher (symmetric algorithm)
as specified in RFC 5581
+ add the camellia cipher implementation from openssl
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 \
src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/netpgp/dist/src/lib/misc.c
cvs rdiff -u -r1.78 -r1.79 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
cvs rdiff -u -r1.29 -r1.30 \
src/crypto/external/bsd/netpgp/dist/src/lib/openssl_crypto.c
cvs rdiff -u -r1.17 -r1.18 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c
cvs rdiff -u -r1.26 -r1.27 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet.h
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c
cvs rdiff -u -r1.42 -r1.43 \
src/crypto/external/bsd/netpgp/dist/src/lib/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h:1.22 src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h:1.23
--- src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h:1.22 Thu Nov 4 01:18:34 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h Thu Nov 4 06:45:28 2010
@@ -132,6 +132,7 @@
int __ops_elgamal_private_decrypt(uint8_t *, const uint8_t *, size_t,
const __ops_elgamal_seckey_t *, const __ops_elgamal_pubkey_t *);
+__ops_symm_alg_t __ops_str_to_cipher(const char *);
unsigned __ops_block_size(__ops_symm_alg_t);
unsigned __ops_key_size(__ops_symm_alg_t);
@@ -199,7 +200,8 @@
/* Keys */
__ops_key_t *__ops_rsa_new_selfsign_key(const int,
- const unsigned long, uint8_t *, const char *);
+ const unsigned long, uint8_t *, const char *,
+ const char *);
int __ops_dsa_size(const __ops_dsa_pubkey_t *);
DSA_SIG *__ops_dsa_sign(uint8_t *, unsigned,
Index: src/crypto/external/bsd/netpgp/dist/src/lib/misc.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.36 src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.37
--- src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.36 Sun Aug 15 16:36:24 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/misc.c Thu Nov 4 06:45:28 2010
@@ -57,7 +57,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: misc.c,v 1.36 2010/08/15 16:36:24 agc Exp $);
+__RCSID($NetBSD: misc.c,v 1.37 2010/11/04 06:45:28 agc Exp $);
#endif
#include sys/types.h
@@ -793,6 +793,37 @@
}
}
+/* structure to map string to cipher def */
+typedef struct str2cipher_t {
+ const char *s; /* cipher name */
+ __ops_symm_alg_t i; /* cipher def */
+} str2cipher_t;
+
+static str2cipher_t str2cipher[] = {
+ { cast5, OPS_SA_CAST5 },
+ { idea, OPS_SA_IDEA },
+ { aes128, OPS_SA_AES_128 },
+ { aes256, OPS_SA_AES_256 },
+ { camellia128, OPS_SA_CAMELLIA_128 },
+ { camellia256, OPS_SA_CAMELLIA_256 },
+ { tripledes, OPS_SA_TRIPLEDES },
+ { NULL, 0 }
+};
+
+/* convert from a string to a cipher definition */
+__ops_symm_alg_t
+__ops_str_to_cipher(const char *cipher)
+{
+ str2cipher_t *sp;
+
+ for (sp = str2cipher ; cipher sp-s ; sp++) {
+ if (netpgp_strcasecmp(cipher, sp-s) == 0) {
+ return sp-i;
+ }
+ }
+ return OPS_SA_DEFAULT_CIPHER;
+}
+
void
__ops_random(void *dest, size_t length)
{
Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.78 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.79
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.78 Sun Oct 31 19:45:53 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Thu Nov 4 06:45:28 2010
@@ -34,7 +34,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: netpgp.c,v 1.78 2010/10/31 19:45:53 stacktic Exp $);
+__RCSID($NetBSD: netpgp.c,v 1.79 2010/11/04 06:45:28 agc Exp $);
#endif
#include sys/types.h
@@ -1108,10 +1108,13 @@
if (id) {
(void) snprintf(newid, sizeof(newid), %s, id);
} else {
- (void) snprintf(newid, sizeof(newid), RSA %d-bit key %...@localhost, numbits, getenv(LOGNAME));
+ (void) snprintf(newid, sizeof(newid),
+ RSA %d-bit key %...@localhost, numbits, getenv(LOGNAME));
}
uid = (uint8_t *)newid;
- key = __ops_rsa_new_selfsign_key(numbits, 65537UL, uid, netpgp_getvar(netpgp, hash));
+ key = __ops_rsa_new_selfsign_key(numbits, 65537UL, uid,
+ netpgp_getvar(netpgp, hash),
+ netpgp_getvar(netpgp, cipher));
if (key == NULL) {
(void)
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys
Module Name:src
Committed By: agc
Date: Thu Nov 4 06:46:15 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.1
netpgpkeys.c
Log Message:
+ add ability in netpgpkeys(1) to specify the cipher (symmetric algorithm)
as specified in RFC 5581
+ add the camellia cipher implementation from openssl
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1:1.15 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1:1.16
--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1:1.15 Wed Nov 3 02:36:13 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1 Thu Nov 4 06:46:15 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: netpgpkeys.1,v 1.15 2010/11/03 02:36:13 agc Exp $
+.\ $NetBSD: netpgpkeys.1,v 1.16 2010/11/04 06:46:15 agc Exp $
.\
.\ Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -67,11 +67,13 @@
.Pp
where the long options for all commands are:
.Pp
+.Op Fl Fl cipher Ns = Ns Ar cipher\-algorithm
+.br
.Op Fl Fl coredumps
.br
-.Op Fl Fl hash Ns = Ns Ar hash-algorithm
+.Op Fl Fl hash Ns = Ns Ar hash\-algorithm
.br
-.Op Fl Fl homedir Ns = Ns Ar home-directory
+.Op Fl Fl homedir Ns = Ns Ar home\-directory
.br
.Op Fl Fl keyring Ns = Ns Ar keyring
.br
@@ -196,14 +198,17 @@
In addition to one of the preceding commands, a number of qualifiers
or options may be given.
.Bl -tag -width Ar
-.It Fl Fl hash Ar hash-algorithm
+.It Fl Fl cipher Ar cipher\-algorithm
+Specify the cipher to be used for symmetric encryption.
+The default cipher is CAST5.
+.It Fl Fl hash Ar hash\-algorithm
Specify the hash algorithm which is used during fingerprint calculation.
For reference, at the present time,
.Xr ssh-keygen 1
uses
.Dq MD5
for its fingerprint values.
-.It Fl Fl homedir Ar home-directory
+.It Fl Fl homedir Ar home\-directory
Keyrings are normally located, for historical reasons, within
the user's home directory in a subdirectory called
.Dq Pa .gnupg
@@ -232,7 +237,7 @@
The trust for a signed key is given by the other signers of that key.
The 16 hexadecimal digit user identity should be used when specifying
user identities - email addresses and names are provided as aliases.
-.It Fl Fl pass-fd Ns = Ns Ar fd
+.It Fl Fl pass\-fd Ns = Ns Ar fd
This option is intended for the use of external programs which may
like to use the
.Xr libnetpgp 3
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.20 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.21
--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.20 Sun Oct 31 20:05:04 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c Thu Nov 4 06:46:15 2010
@@ -93,6 +93,7 @@
PASSWDFD,
RESULTS,
SSHKEYFILE,
+ CIPHER,
/* debug */
OPS_DEBUG
@@ -135,6 +136,7 @@
{verbose, no_argument, NULL, VERBOSE},
{pass-fd, required_argument, NULL, PASSWDFD},
{results, required_argument, NULL, RESULTS},
+ {cipher, required_argument, NULL, CIPHER},
{ NULL, 0, NULL, 0},
};
@@ -318,6 +320,9 @@
netpgp_setvar(netpgp, ssh keys, 1);
netpgp_setvar(netpgp, sshkeyfile, arg);
break;
+ case CIPHER:
+ netpgp_setvar(netpgp, cipher, arg);
+ break;
case OPS_DEBUG:
netpgp_set_debug(arg);
break;
CVS commit: src/crypto/external/bsd/netpgp/lib
Module Name:src Committed By: agc Date: Thu Nov 4 07:02:25 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/lib: config.h Log Message: update version string to 20101103 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/netpgp/lib/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/lib/config.h diff -u src/crypto/external/bsd/netpgp/lib/config.h:1.7 src/crypto/external/bsd/netpgp/lib/config.h:1.8 --- src/crypto/external/bsd/netpgp/lib/config.h:1.7 Sat Aug 7 04:18:54 2010 +++ src/crypto/external/bsd/netpgp/lib/config.h Thu Nov 4 07:02:25 2010 @@ -43,6 +43,9 @@ /* 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 @@ -125,19 +128,19 @@ #define PACKAGE_NAME netpgp /* Define to the full name and version of this package. */ -#define PACKAGE_STRING netpgp 20100708 +#define PACKAGE_STRING netpgp 20101103 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME netpgp /* Define to the version of this package. */ -#define PACKAGE_VERSION 20100708 +#define PACKAGE_VERSION 20101103 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 20100708 +#define VERSION 20101103 /* Define for Solaris 2.5.1 so the uint32_t typedef from sys/synch.h, pthread.h, or semaphore.h is not used. If the typedef were allowed, the
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Thu Nov 4 07:03:41 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: symmetric.c Log Message: autoconf guard for openssl/camellia.h To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c diff -u src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c:1.13 src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c:1.14 --- src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c:1.13 Thu Nov 4 06:45:28 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c Thu Nov 4 07:03:41 2010 @@ -54,7 +54,7 @@ #if defined(__NetBSD__) __COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.); -__RCSID($NetBSD: symmetric.c,v 1.13 2010/11/04 06:45:28 agc Exp $); +__RCSID($NetBSD: symmetric.c,v 1.14 2010/11/04 07:03:41 agc Exp $); #endif #include crypto.h @@ -78,7 +78,9 @@ #include openssl/des.h #endif +#ifdef HAVE_OPENSSL_CAMELLIA_H #include openssl/camellia.h +#endif #include crypto.h #include netpgpdefs.h
CVS commit: [uebayasi-xip] src
Module Name:src
Committed By: uebayasi
Date: Thu Nov 4 07:30:00 UTC 2010
Modified Files:
src/external/gpl3/binutils/usr.sbin/mdsetimage [uebayasi-xip]:
mdsetimage.8 mdsetimage.c
src/sys/dev [uebayasi-xip]: xmd.c
src/usr.sbin/mdsetimage [uebayasi-xip]: mdsetimage.8 mdsetimage.c
Log Message:
xmd(4), mdsetimage(8): handle memory disk symbol names other than
the md(4)'s historical ones.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.2.1 \
src/external/gpl3/binutils/usr.sbin/mdsetimage/mdsetimage.8 \
src/external/gpl3/binutils/usr.sbin/mdsetimage/mdsetimage.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/dev/xmd.c
cvs rdiff -u -r1.9 -r1.9.48.1 src/usr.sbin/mdsetimage/mdsetimage.8
cvs rdiff -u -r1.19 -r1.19.2.1 src/usr.sbin/mdsetimage/mdsetimage.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/gpl3/binutils/usr.sbin/mdsetimage/mdsetimage.8
diff -u src/external/gpl3/binutils/usr.sbin/mdsetimage/mdsetimage.8:1.1 src/external/gpl3/binutils/usr.sbin/mdsetimage/mdsetimage.8:1.1.2.1
--- src/external/gpl3/binutils/usr.sbin/mdsetimage/mdsetimage.8:1.1 Tue Aug 18 20:22:20 2009
+++ src/external/gpl3/binutils/usr.sbin/mdsetimage/mdsetimage.8 Thu Nov 4 07:29:59 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: mdsetimage.8,v 1.1 2009/08/18 20:22:20 skrll Exp $
+.\ $NetBSD: mdsetimage.8,v 1.1.2.1 2010/11/04 07:29:59 uebayasi Exp $
.\
.\ Copyright (c) 1996 Christopher G. Demetriou
.\ All rights reserved.
@@ -27,7 +27,7 @@
.\
.\ Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp
.\
-.Dd September 27, 2002
+.Dd November 4, 2010
.Dt MDSETIMAGE 8
.Os
.Sh NAME
@@ -36,6 +36,8 @@
.Sh SYNOPSIS
.Nm
.Op Fl svx
+.Op Fl I Ar image_symbol
+.Op Fl S Ar size_symbol
.Op Fl b Ar bfdname
.Ar kernel
.Ar image
@@ -51,6 +53,13 @@
will typically be used by the kernel
as the root file system.
.Pp
+The
+.Fl I
+and
+.Fl S
+flags specify the symbol names of image and size of memory disk
+drivers respectively.
+.Pp
To recognize kernel executable format, the
.Fl b
flag specifies BFD name of kernel.
@@ -80,4 +89,5 @@
This is the opposite of the default behavior.
.Sh SEE ALSO
.Xr md 4 ,
+.Xr xmd 4 ,
.Xr mdconfig 8
Index: src/external/gpl3/binutils/usr.sbin/mdsetimage/mdsetimage.c
diff -u src/external/gpl3/binutils/usr.sbin/mdsetimage/mdsetimage.c:1.1 src/external/gpl3/binutils/usr.sbin/mdsetimage/mdsetimage.c:1.1.2.1
--- src/external/gpl3/binutils/usr.sbin/mdsetimage/mdsetimage.c:1.1 Tue Aug 18 20:22:20 2009
+++ src/external/gpl3/binutils/usr.sbin/mdsetimage/mdsetimage.c Thu Nov 4 07:30:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mdsetimage.c,v 1.1 2009/08/18 20:22:20 skrll Exp $ */
+/* $NetBSD: mdsetimage.c,v 1.1.2.1 2010/11/04 07:30:00 uebayasi Exp $ */
/* from: NetBSD: mdsetimage.c,v 1.15 2001/03/21 23:46:48 cgd Exp $ */
/*
@@ -38,7 +38,7 @@
#if !defined(lint)
__COPYRIGHT(@(#) Copyright (c) 1996\
Christopher G. Demetriou. All rights reserved.);
-__RCSID($NetBSD: mdsetimage.c,v 1.1 2009/08/18 20:22:20 skrll Exp $);
+__RCSID($NetBSD: mdsetimage.c,v 1.1.2.1 2010/11/04 07:30:00 uebayasi Exp $);
#endif /* not lint */
#include sys/types.h
@@ -58,13 +58,9 @@
struct symbols {
char *name;
size_t offset;
-} md_root_symbols[] = {
+};
#define X_MD_ROOT_IMAGE 0
- { _md_root_image, 0 },
#define X_MD_ROOT_SIZE 1
- { _md_root_size, 0 },
- { NULL, 0 }
-};
#define CHUNKSIZE (64 * 1024)
@@ -94,11 +90,21 @@
char *bfdname = NULL;
bfd *abfd;
ssize_t left_to_copy;
+ struct symbols md_root_symbols[3] = { { 0 } };
+
+ md_root_symbols[X_MD_ROOT_IMAGE].name = _md_root_image;
+ md_root_symbols[X_MD_ROOT_SIZE].name = _md_root_size;
setprogname(argv[0]);
- while ((ch = getopt(argc, argv, b:svx)) != -1)
+ while ((ch = getopt(argc, argv, I:S:b:svx)) != -1)
switch (ch) {
+ case 'I':
+ md_root_symbols[X_MD_ROOT_IMAGE].name = optarg;
+ break;
+ case 'S':
+ md_root_symbols[X_MD_ROOT_SIZE].name = optarg;
+ break;
case 'b':
bfdname = optarg;
break;
Index: src/sys/dev/xmd.c
diff -u src/sys/dev/xmd.c:1.1.2.5 src/sys/dev/xmd.c:1.1.2.6
--- src/sys/dev/xmd.c:1.1.2.5 Sat Oct 30 08:51:10 2010
+++ src/sys/dev/xmd.c Thu Nov 4 07:30:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: xmd.c,v 1.1.2.5 2010/10/30 08:51:10 uebayasi Exp $ */
+/* $NetBSD: xmd.c,v 1.1.2.6 2010/11/04 07:30:00 uebayasi Exp $ */
/*-
* Copyright (c) 2010 Tsubai Masanari. All rights reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xmd.c,v 1.1.2.5 2010/10/30 08:51:10 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: xmd.c,v 1.1.2.6 2010/11/04 07:30:00 uebayasi Exp $);
#include opt_xip.h
#include opt_xmd.h
@@ -86,9 +86,9 @@
CFATTACH_DECL3_NEW(xmd, sizeof(struct xmd_softc),
NULL, xmd_attach, xmd_detach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN);
-const char md_root_image[XMD_ROOT_SIZE DEV_BSHIFT] __aligned(PAGE_SIZE) =
+const char xmd_root_image[XMD_ROOT_SIZE
CVS commit: [uebayasi-xip] src/sys/miscfs/genfs
Module Name:src Committed By: uebayasi Date: Thu Nov 4 07:31:27 UTC 2010 Modified Files: src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c Log Message: Remove a XXX comment which is only confusing. To generate a diff of this commit: cvs rdiff -u -r1.36.2.27 -r1.36.2.28 src/sys/miscfs/genfs/genfs_io.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/miscfs/genfs/genfs_io.c diff -u src/sys/miscfs/genfs/genfs_io.c:1.36.2.27 src/sys/miscfs/genfs/genfs_io.c:1.36.2.28 --- src/sys/miscfs/genfs/genfs_io.c:1.36.2.27 Fri Oct 22 07:22:34 2010 +++ src/sys/miscfs/genfs/genfs_io.c Thu Nov 4 07:31:27 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: genfs_io.c,v 1.36.2.27 2010/10/22 07:22:34 uebayasi Exp $ */ +/* $NetBSD: genfs_io.c,v 1.36.2.28 2010/11/04 07:31:27 uebayasi Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.27 2010/10/22 07:22:34 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.28 2010/11/04 07:31:27 uebayasi Exp $); #include opt_xip.h @@ -781,9 +781,6 @@ * Return direct pages of XIP vnode. The block addresses of XIP * vnode pages are returned back to the VM fault handler as the * actually mapped physical addresses. - * - * XXX Should be merged into genfs_do_getpages() after - * XXX genfs_do_getpages() and genfs_do_io() are merged. */ static int genfs_do_getpages_xip(void *v)
CVS commit: src/crypto/external/bsd/netpgp/dist/src/libmj
Module Name:src
Committed By: agc
Date: Thu Nov 4 07:33:46 UTC 2010
Added Files:
src/crypto/external/bsd/netpgp/dist/src/libmj: Makefile.in
Log Message:
add a Makefile.in file for libmj
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.in
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.in:1.1
--- /dev/null Thu Nov 4 07:33:46 2010
+++ src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.in Thu Nov 4 07:33:46 2010
@@ -0,0 +1,573 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+...@set_make@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR) cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src/lib
+DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in mkinstalldirs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/ax_check_openssl.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo $(srcdir) | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+$(srcdir)/*) f=`echo $$p | sed s|^$$srcdirstrip/||`;; \
+*) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(man3dir)
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libmj_la_LIBADD =
+am_libmj_la_OBJECTS = libmj_la-mj.lo
+libmj_la_OBJECTS = $(am_libmj_la_OBJECTS)
+DEFAULT_INCLUDES = -...@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+SOURCES = $(libmj_la_SOURCES)
+DIST_SOURCES = $(libmj_la_SOURCES)
+man3dir = $(mandir)/man3
+NROFF = nroff
+MANS = $(dist_man_MANS) $(man3_MANS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOM4TE = @AUTOM4TE@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CANONICAL_HOST = @CANONICAL_HOST@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_INCLUDES = @OPENSSL_INCLUDES@
+OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Thu Nov 4 07:35:09 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: symmetric.c Log Message: Only include camellia cipher if openssl supports it To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 \ src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c diff -u src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c:1.14 src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c:1.15 --- src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c:1.14 Thu Nov 4 07:03:41 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c Thu Nov 4 07:35:08 2010 @@ -54,7 +54,7 @@ #if defined(__NetBSD__) __COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.); -__RCSID($NetBSD: symmetric.c,v 1.14 2010/11/04 07:03:41 agc Exp $); +__RCSID($NetBSD: symmetric.c,v 1.15 2010/11/04 07:35:08 agc Exp $); #endif #include crypto.h @@ -486,6 +486,7 @@ TRAILER }; +#ifndef OPENSSL_NO_CAMELLIA /* Camellia with 128-bit key (CAMELLIA) */ #define KEYBITS_CAMELLIA128 128 @@ -607,6 +608,7 @@ std_finish, TRAILER }; +#endif static const __ops_crypt_t * @@ -623,10 +625,12 @@ return aes128; case OPS_SA_AES_256: return aes256; +#ifndef OPENSSL_NO_CAMELLIA case OPS_SA_CAMELLIA_128: return camellia128; case OPS_SA_CAMELLIA_256: return camellia256; +#endif case OPS_SA_TRIPLEDES: return tripledes; default:
CVS commit: src/crypto/external/bsd/netpgp/dist/src/libmj
Module Name:src Committed By: agc Date: Thu Nov 4 07:47:30 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/libmj: Makefile.am Log Message: use the correct manual page name To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am diff -u src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am:1.1 src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am:1.2 --- src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am:1.1 Sat Aug 7 04:13:57 2010 +++ src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am Thu Nov 4 07:47:30 2010 @@ -1,4 +1,4 @@ -## $NetBSD: Makefile.am,v 1.1 2010/08/07 04:13:57 agc Exp $ +## $NetBSD: Makefile.am,v 1.2 2010/11/04 07:47:30 agc Exp $ AM_CFLAGS = $(WARNCFLAGS) @@ -9,6 +9,6 @@ libmj_la_SOURCES = \ mj.c \ -man3_MANS = mj.3 +man3_MANS = libmj.3 -dist_man_MANS = mj.3 +dist_man_MANS = libmj.3
CVS commit: [uebayasi-xip] src/sys
Module Name:src
Committed By: uebayasi
Date: Thu Nov 4 08:47:38 UTC 2010
Modified Files:
src/sys/arch/m68k/m68k [uebayasi-xip]: pmap_motorola.c
src/sys/arch/mips/mips [uebayasi-xip]: pmap.c
src/sys/arch/powerpc/ibm4xx [uebayasi-xip]: pmap.c
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
src/sys/uvm [uebayasi-xip]: uvm_bio.c uvm_fault.c uvm_page.c uvm_page.h
Log Message:
Split physical device segment pages from managed to managed
device. Cache that information as a flag PG_DEVICE so that callers
don't need to walk physsegs everytime.
Remove PQ_FIXED, which means that page daemon doesn't need to know
device segment pages at all. But still fault handlers need to know
them.
I think this is what I can do best now.
To generate a diff of this commit:
cvs rdiff -u -r1.55.2.5 -r1.55.2.6 src/sys/arch/m68k/m68k/pmap_motorola.c
cvs rdiff -u -r1.188.2.6 -r1.188.2.7 src/sys/arch/mips/mips/pmap.c
cvs rdiff -u -r1.60.2.7 -r1.60.2.8 src/sys/arch/powerpc/ibm4xx/pmap.c
cvs rdiff -u -r1.36.2.28 -r1.36.2.29 src/sys/miscfs/genfs/genfs_io.c
cvs rdiff -u -r1.68.2.11 -r1.68.2.12 src/sys/uvm/uvm_bio.c
cvs rdiff -u -r1.166.2.21 -r1.166.2.22 src/sys/uvm/uvm_fault.c
cvs rdiff -u -r1.153.2.58 -r1.153.2.59 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.59.2.32 -r1.59.2.33 src/sys/uvm/uvm_page.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/m68k/m68k/pmap_motorola.c
diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.55.2.5 src/sys/arch/m68k/m68k/pmap_motorola.c:1.55.2.6
--- src/sys/arch/m68k/m68k/pmap_motorola.c:1.55.2.5 Sun Oct 31 03:46:17 2010
+++ src/sys/arch/m68k/m68k/pmap_motorola.c Thu Nov 4 08:47:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.c,v 1.55.2.5 2010/10/31 03:46:17 uebayasi Exp $*/
+/* $NetBSD: pmap_motorola.c,v 1.55.2.6 2010/11/04 08:47:36 uebayasi Exp $*/
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@
#include opt_m68k_arch.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_motorola.c,v 1.55.2.5 2010/10/31 03:46:17 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_motorola.c,v 1.55.2.6 2010/11/04 08:47:36 uebayasi Exp $);
#include sys/param.h
#include sys/systm.h
@@ -285,7 +285,8 @@
struct pv_entry *pmap_alloc_pv(void);
void pmap_free_pv(struct pv_entry *);
-#define PAGE_IS_MANAGED(pa) (pmap_initialized uvm_pageismanaged(pa))
+#define PAGE_IS_MANAGED(pa) (pmap_initialized \
+ (uvm_pageismanaged(pa) || uvm_pageismanaged_device(pa))
static inline struct pv_header *
pa_to_pvh(paddr_t pa)
Index: src/sys/arch/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.188.2.6 src/sys/arch/mips/mips/pmap.c:1.188.2.7
--- src/sys/arch/mips/mips/pmap.c:1.188.2.6 Sun Oct 31 03:46:18 2010
+++ src/sys/arch/mips/mips/pmap.c Thu Nov 4 08:47:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.188.2.6 2010/10/31 03:46:18 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.188.2.7 2010/11/04 08:47:37 uebayasi Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.188.2.6 2010/10/31 03:46:18 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.188.2.7 2010/11/04 08:47:37 uebayasi Exp $);
/*
* Manages physical address maps.
@@ -225,7 +225,8 @@
bool pmap_initialized = false;
-#define PAGE_IS_MANAGED(pa) (pmap_initialized uvm_pageismanaged(pa))
+#define PAGE_IS_MANAGED(pa) (pmap_initialized \
+ (uvm_pageismanaged(pa) || uvm_pageismanaged_device(pa))
#define PMAP_IS_ACTIVE(pm) \
((pm) == pmap_kernel() || \
@@ -1553,7 +1554,7 @@
pmap_mmap(vaddr_t addr, off_t off)
{
- return mips_btop(vtophys(addr + off));
+ return mips_btop(MIPS_KSEG0_TO_PHYS(addr + off));
}
/*
Index: src/sys/arch/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.60.2.7 src/sys/arch/powerpc/ibm4xx/pmap.c:1.60.2.8
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.60.2.7 Sun Oct 31 03:46:18 2010
+++ src/sys/arch/powerpc/ibm4xx/pmap.c Thu Nov 4 08:47:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.60.2.7 2010/10/31 03:46:18 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.60.2.8 2010/11/04 08:47:37 uebayasi Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.60.2.7 2010/10/31 03:46:18 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.60.2.8 2010/11/04 08:47:37 uebayasi Exp $);
#include opt_xip.h
@@ -851,7 +851,8 @@
if (flags PMAP_WIRED)
flags |= prot;
- managed = ((flags PMAP_NOCACHE) == 0) uvm_pageismanaged(pa);
+ managed = ((flags PMAP_NOCACHE) == 0)
+ (uvm_pageismanaged(pa) || uvm_pageismanaged_device(pa));
/*
* Generate TTE.
Index: src/sys/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.36.2.28 src/sys/miscfs/genfs/genfs_io.c:1.36.2.29
---
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: plunky Date: Thu Nov 4 08:54:44 UTC 2010 Modified Files: src/distrib/sets/lists/base: ad.mips64eb Log Message: add some missing tags To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/base/ad.mips64eb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.23 src/distrib/sets/lists/base/ad.mips64eb:1.24 --- src/distrib/sets/lists/base/ad.mips64eb:1.23 Tue Nov 2 16:34:33 2010 +++ src/distrib/sets/lists/base/ad.mips64eb Thu Nov 4 08:54:44 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.23 2010/11/02 16:34:33 joerg Exp $ +# $NetBSD: ad.mips64eb,v 1.24 2010/11/04 08:54:44 plunky Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -51,8 +51,8 @@ ./usr/lib/64/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic ./usr/lib/64/libasn1.so.8 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libasn1.so.8.0 base-compat-shlib compat,pic,kerberos -./usr/lib/64/libbfd.so.11 base-compat-shlib compat,pic -./usr/lib/64/libbfd.so.11.0 base-compat-shlib compat,pic +./usr/lib/64/libbfd.so.11 base-compat-shlib compat,pic,binutils +./usr/lib/64/libbfd.so.11.0 base-compat-shlib compat,pic,binutils ./usr/lib/64/libbind9.so.5 base-compat-shlib compat,pic ./usr/lib/64/libbind9.so.5.1 base-compat-shlib compat,pic ./usr/lib/64/libbluetooth.so.4 base-compat-shlib compat,pic @@ -137,12 +137,12 @@ ./usr/lib/64/libnetpgp.so.3.0 base-compat-shlib compat,pic,crypto ./usr/lib/64/libobjc.so.3 base-compat-shlib compat,pic ./usr/lib/64/libobjc.so.3.0 base-compat-shlib compat,pic -./usr/lib/64/libopcodes.so.4 base-compat-shlib compat,pic -./usr/lib/64/libopcodes.so.4.0 base-compat-shlib compat,pic +./usr/lib/64/libopcodes.so.4 base-compat-shlib compat,pic,binutils +./usr/lib/64/libopcodes.so.4.0 base-compat-shlib compat,pic,binutils ./usr/lib/64/libossaudio.so.1 base-compat-shlib compat,pic ./usr/lib/64/libossaudio.so.1.0 base-compat-shlib compat,pic -./usr/lib/64/libpam.so.3 base-compat-shlib compat,pic -./usr/lib/64/libpam.so.3.0 base-compat-shlib compat,pic +./usr/lib/64/libpam.so.3 base-compat-shlib compat,pic,pam +./usr/lib/64/libpam.so.3.0 base-compat-shlib compat,pic,pam ./usr/lib/64/librefuse.so.2 base-compat-shlib compat,pic ./usr/lib/64/librefuse.so.2.0 base-compat-shlib compat,pic ./usr/lib/64/libp2k.so.2 base-compat-shlib compat,pic
CVS commit: src/sys/dev/usb
Module Name:src Committed By: pooka Date: Thu Nov 4 09:18:39 UTC 2010 Modified Files: src/sys/dev/usb: usbdevs Log Message: add dlink3 and netgear3 To generate a diff of this commit: cvs rdiff -u -r1.566 -r1.567 src/sys/dev/usb/usbdevs 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/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.566 src/sys/dev/usb/usbdevs:1.567 --- src/sys/dev/usb/usbdevs:1.566 Wed Nov 3 20:46:15 2010 +++ src/sys/dev/usb/usbdevs Thu Nov 4 09:18:39 2010 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.566 2010/11/03 20:46:15 christos Exp $ +$NetBSD: usbdevs,v 1.567 2010/11/04 09:18:39 pooka Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -461,6 +461,7 @@ vendor AINCOMM 0x12fd Aincomm vendor MOBILITY 0x1342 Mobility vendor DICKSMITH 0x1371 Dick Smith Electronics +vendor NETGEAR3 0x1385 Netgear vendor BALTECH 0x13ad Baltech vendor CISCOLINKSYS 0x13b1 Cisco-Linksys vendor SHARK 0x13d2 Shark @@ -502,6 +503,7 @@ vendor WINCHIPHEAD2 0x1a86 QinHeng Electronics vendor DLINK 0x2001 D-Link vendor PLANEX2 0x2019 Planex Communications +vendor DLINK3 0x2101 D-Link vendor ERICSSON 0x2282 Ericsson vendor MOTOROLA2 0x22b8 Motorola vendor PINNACLE 0x2304 Pinnacle Systems
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: pooka
Date: Thu Nov 4 09:19:15 UTC 2010
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.559 -r1.560 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.560 -r1.561 src/sys/dev/usb/usbdevs_data.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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.559 src/sys/dev/usb/usbdevs.h:1.560
--- src/sys/dev/usb/usbdevs.h:1.559 Wed Nov 3 20:46:58 2010
+++ src/sys/dev/usb/usbdevs.h Thu Nov 4 09:19:14 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.559 2010/11/03 20:46:58 christos Exp $ */
+/* $NetBSD: usbdevs.h,v 1.560 2010/11/04 09:19:14 pooka Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.566 2010/11/03 20:46:15 christos Exp
+ * NetBSD: usbdevs,v 1.567 2010/11/04 09:18:39 pooka Exp
*/
/*
@@ -468,6 +468,7 @@
#define USB_VENDOR_AINCOMM 0x12fd /* Aincomm */
#define USB_VENDOR_MOBILITY 0x1342 /* Mobility */
#define USB_VENDOR_DICKSMITH 0x1371 /* Dick Smith Electronics */
+#define USB_VENDOR_NETGEAR3 0x1385 /* Netgear */
#define USB_VENDOR_BALTECH 0x13ad /* Baltech */
#define USB_VENDOR_CISCOLINKSYS 0x13b1 /* Cisco-Linksys */
#define USB_VENDOR_SHARK 0x13d2 /* Shark */
@@ -509,6 +510,7 @@
#define USB_VENDOR_WINCHIPHEAD2 0x1a86 /* QinHeng Electronics */
#define USB_VENDOR_DLINK 0x2001 /* D-Link */
#define USB_VENDOR_PLANEX2 0x2019 /* Planex Communications */
+#define USB_VENDOR_DLINK3 0x2101 /* D-Link */
#define USB_VENDOR_ERICSSON 0x2282 /* Ericsson */
#define USB_VENDOR_MOTOROLA2 0x22b8 /* Motorola */
#define USB_VENDOR_PINNACLE 0x2304 /* Pinnacle Systems */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.560 src/sys/dev/usb/usbdevs_data.h:1.561
--- src/sys/dev/usb/usbdevs_data.h:1.560 Wed Nov 3 20:46:58 2010
+++ src/sys/dev/usb/usbdevs_data.h Thu Nov 4 09:19:14 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.560 2010/11/03 20:46:58 christos Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.561 2010/11/04 09:19:14 pooka Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.566 2010/11/03 20:46:15 christos Exp
+ * NetBSD: usbdevs,v 1.567 2010/11/04 09:18:39 pooka Exp
*/
/*
@@ -1651,6 +1651,10 @@
Dick Smith Electronics,
},
{
+ USB_VENDOR_NETGEAR3,
+ Netgear,
+ },
+ {
USB_VENDOR_BALTECH,
Baltech,
},
@@ -1815,6 +1819,10 @@
Planex Communications,
},
{
+ USB_VENDOR_DLINK3,
+ D-Link,
+ },
+ {
USB_VENDOR_ERICSSON,
Ericsson,
},
@@ -1939,7 +1947,7 @@
GNU Radio USRP,
},
};
-const int usb_nvendors = 475;
+const int usb_nvendors = 477;
const struct usb_product usb_products[] = {
{
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys
Module Name:src Committed By: wiz Date: Thu Nov 4 09:30:33 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.1 Log Message: Bump date for --cipher. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 \ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1 diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1:1.16 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1:1.17 --- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1:1.16 Thu Nov 4 06:46:15 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1 Thu Nov 4 09:30:33 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: netpgpkeys.1,v 1.16 2010/11/04 06:46:15 agc Exp $ +.\ $NetBSD: netpgpkeys.1,v 1.17 2010/11/04 09:30:33 wiz Exp $ .\ .\ Copyright (c) 2009, 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd August 9, 2010 +.Dd November 4, 2010 .Dt NETPGPKEYS 1 .Os .Sh NAME
CVS commit: src/etc/mtree
Module Name:src Committed By: pooka Date: Thu Nov 4 11:50:27 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: + tests/lib/libc/stdio To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.56 src/etc/mtree/NetBSD.dist.base:1.57 --- src/etc/mtree/NetBSD.dist.base:1.56 Wed Nov 3 21:46:36 2010 +++ src/etc/mtree/NetBSD.dist.base Thu Nov 4 11:50:27 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.56 2010/11/03 21:46:36 christos Exp $ +# $NetBSD: NetBSD.dist.base,v 1.57 2010/11/04 11:50:27 pooka Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -239,6 +239,7 @@ ./usr/libdata/debug/usr/tests/lib/libc ./usr/libdata/debug/usr/tests/lib/libc/gen ./usr/libdata/debug/usr/tests/lib/libc/hash +./usr/libdata/debug/usr/tests/lib/libc/stdio ./usr/libdata/debug/usr/tests/lib/libc/stdlib ./usr/libdata/debug/usr/tests/lib/libdes ./usr/libdata/debug/usr/tests/lib/libevent @@ -1178,6 +1179,7 @@ ./usr/tests/lib/libc ./usr/tests/lib/libc/gen ./usr/tests/lib/libc/hash +./usr/tests/lib/libc/stdio ./usr/tests/lib/libc/stdlib ./usr/tests/lib/libdes ./usr/tests/lib/semaphore
CVS commit: src/sys/arch/evbarm/integrator
Module Name:src Committed By: uebayasi Date: Thu Nov 4 12:16:15 UTC 2010 Modified Files: src/sys/arch/evbarm/integrator: int_bus_dma.c Log Message: Fix DEBUG kernel build. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/integrator/int_bus_dma.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/evbarm/integrator/int_bus_dma.c diff -u src/sys/arch/evbarm/integrator/int_bus_dma.c:1.16 src/sys/arch/evbarm/integrator/int_bus_dma.c:1.17 --- src/sys/arch/evbarm/integrator/int_bus_dma.c:1.16 Mon Mar 5 08:37:38 2007 +++ src/sys/arch/evbarm/integrator/int_bus_dma.c Thu Nov 4 12:16:15 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: int_bus_dma.c,v 1.16 2007/03/05 08:37:38 matt Exp $ */ +/* $NetBSD: int_bus_dma.c,v 1.17 2010/11/04 12:16:15 uebayasi Exp $ */ /* * Copyright (c) 2002 Wasabi Systems, Inc. @@ -42,7 +42,7 @@ #define _ARM32_BUS_DMA_PRIVATE #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: int_bus_dma.c,v 1.16 2007/03/05 08:37:38 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: int_bus_dma.c,v 1.17 2010/11/04 12:16:15 uebayasi Exp $); #include sys/param.h #include sys/systm.h @@ -87,6 +87,7 @@ #define ID_BUFTYPE_UIO 3 #define ID_BUFTYPE_RAW 4 +#undef DEBUG #define DEBUG(x) static struct arm32_dma_range integrator_dma_ranges[DRAM_BLOCKS];
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pgoyette Date: Thu Nov 4 13:00:07 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add files for lib/libc/stdio tests. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.148 src/distrib/sets/lists/tests/mi:1.149 --- src/distrib/sets/lists/tests/mi:1.148 Wed Oct 20 09:22:34 2010 +++ src/distrib/sets/lists/tests/mi Thu Nov 4 13:00:07 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.148 2010/10/20 09:22:34 jmmv Exp $ +# $NetBSD: mi,v 1.149 2010/11/04 13:00:07 pgoyette Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1490,6 +1490,9 @@ ./usr/tests/lib/libc/stdlib/Atffile tests-lib-tests atf ./usr/tests/lib/libc/stdlib/t_environment tests-lib-tests atf ./usr/tests/lib/libc/stdlib/t_mi_vector_hash tests-lib-tests atf +./usr/tests/lib/libc/stdio tests-lib-tests +./usr/tests/lib/libc/stdio/Atffile tests-lib-tests atf +./usr/tests/lib/libc/stdio/t_fmemopen tests-lib-tests atf ./usr/tests/lib/libc/string tests-obsolete obsolete ./usr/tests/lib/libc/string/Atffile tests-obsolete obsolete ./usr/tests/lib/libc/string/t_popcount tests-obsolete obsolete
CVS commit: src/etc/mtree
Module Name:src Committed By: pgoyette Date: Thu Nov 4 13:01:42 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Remove lib/libc/stdio - no longer anything in there. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.57 src/etc/mtree/NetBSD.dist.base:1.58 --- src/etc/mtree/NetBSD.dist.base:1.57 Thu Nov 4 11:50:27 2010 +++ src/etc/mtree/NetBSD.dist.base Thu Nov 4 13:01:42 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.57 2010/11/04 11:50:27 pooka Exp $ +# $NetBSD: NetBSD.dist.base,v 1.58 2010/11/04 13:01:42 pgoyette Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -239,7 +239,6 @@ ./usr/libdata/debug/usr/tests/lib/libc ./usr/libdata/debug/usr/tests/lib/libc/gen ./usr/libdata/debug/usr/tests/lib/libc/hash -./usr/libdata/debug/usr/tests/lib/libc/stdio ./usr/libdata/debug/usr/tests/lib/libc/stdlib ./usr/libdata/debug/usr/tests/lib/libdes ./usr/libdata/debug/usr/tests/lib/libevent
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: pgoyette Date: Thu Nov 4 13:13:43 UTC 2010 Modified Files: src/sys/dev/pcmcia: slhci_pcmcia.c Log Message: Don't include the now non-existent usb_port.h To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pcmcia/slhci_pcmcia.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/pcmcia/slhci_pcmcia.c diff -u src/sys/dev/pcmcia/slhci_pcmcia.c:1.6 src/sys/dev/pcmcia/slhci_pcmcia.c:1.7 --- src/sys/dev/pcmcia/slhci_pcmcia.c:1.6 Tue May 12 14:42:19 2009 +++ src/sys/dev/pcmcia/slhci_pcmcia.c Thu Nov 4 13:13:43 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: slhci_pcmcia.c,v 1.6 2009/05/12 14:42:19 cegger Exp $ */ +/* $NetBSD: slhci_pcmcia.c,v 1.7 2010/11/04 13:13:43 pgoyette Exp $ */ /* * Not (c) 2007 Matthew Orgass * This file is public domain, meaning anyone can make any use of part or all @@ -11,7 +11,7 @@ /* Glue for RATOC USB HOST CF+ Card (SL811HS chip) */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: slhci_pcmcia.c,v 1.6 2009/05/12 14:42:19 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: slhci_pcmcia.c,v 1.7 2010/11/04 13:13:43 pgoyette Exp $); #include sys/param.h #include sys/device.h @@ -26,7 +26,6 @@ #include dev/pcmcia/pcmciadevs.h #include dev/usb/usb.h -#include dev/usb/usb_port.h #include dev/usb/usbdi.h #include dev/usb/usbdivar.h
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Thu Nov 4 13:21:08 UTC 2010
Modified Files:
src/sys/dev/usb: if_otus.c
Log Message:
sprinkle static.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/if_otus.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/usb/if_otus.c
diff -u src/sys/dev/usb/if_otus.c:1.5 src/sys/dev/usb/if_otus.c:1.6
--- src/sys/dev/usb/if_otus.c:1.5 Wed Nov 3 18:28:31 2010
+++ src/sys/dev/usb/if_otus.c Thu Nov 4 09:21:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_otus.c,v 1.5 2010/11/03 22:28:31 dyoung Exp $ */
+/* $NetBSD: if_otus.c,v 1.6 2010/11/04 13:21:08 christos Exp $ */
/* $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $ */
/*-
@@ -566,7 +566,7 @@
CFATTACH_DECL_NEW(otus, sizeof(struct otus_softc), otus_match, otus_attach,
otus_detach, otus_activate);
-int
+Static int
otus_match(device_t parent, cfdata_t match, void *aux)
{
struct usb_attach_arg *uaa = aux;
@@ -578,7 +578,7 @@
UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
}
-void
+Static void
otus_attach(device_t parent, device_t self, void *aux)
{
struct otus_softc *sc = device_private(self);
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Thu Nov 4 13:22:21 UTC 2010 Modified Files: src/share/man/man4: otus.4 Log Message: Remove paragraph about pkg_add'ing the firmware, it's coming with the base system. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/otus.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/otus.4 diff -u src/share/man/man4/otus.4:1.2 src/share/man/man4/otus.4:1.3 --- src/share/man/man4/otus.4:1.2 Wed Nov 3 20:11:33 2010 +++ src/share/man/man4/otus.4 Thu Nov 4 13:22:20 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: otus.4,v 1.2 2010/11/03 20:11:33 christos Exp $ +.\ $NetBSD: otus.4,v 1.3 2010/11/04 13:22:20 wiz Exp $ .\ $OpenBSD: otus.4,v 1.14 2010/08/18 18:49:36 damien Exp $ .\ .\ Copyright (c) 2009 Damien Bergamini damien.bergam...@free.fr @@ -15,7 +15,7 @@ .\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\ -.Dd November 1, 2010 +.Dd November 4, 2010 .Dt OTUS 4 .Os .Sh NAME @@ -79,12 +79,6 @@ .Pp Although these firmware files are freely redistributable, their usage is restricted. -A prepackaged version of the firmware, designed to be used with -.Xr pkg_add 1 , -can be found at: -.Bd -literal -offset 3n -http://damien.bergamini.free.fr/packages/openbsd/otus-firmware-1.0.tgz -.Ed .Sh HARDWARE The following adapters should work: .Pp
CVS commit: src
Module Name:src Committed By: pooka Date: Thu Nov 4 13:24:27 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.base Log Message: debug entries are sacred too To generate a diff of this commit: cvs rdiff -u -r1.149 -r1.150 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.58 -r1.59 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.149 src/distrib/sets/lists/tests/mi:1.150 --- src/distrib/sets/lists/tests/mi:1.149 Thu Nov 4 13:00:07 2010 +++ src/distrib/sets/lists/tests/mi Thu Nov 4 13:24:26 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.149 2010/11/04 13:00:07 pgoyette Exp $ +# $NetBSD: mi,v 1.150 2010/11/04 13:24:26 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -313,6 +313,8 @@ ./usr/libdata/debug/usr/tests/lib/libc/gen/t_glob_star.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/hashtests-lib-debug ./usr/libdata/debug/usr/tests/lib/libc/hash/t_sha2.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/stdiotests-lib-debug +./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fmemopen.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stdlibtests-lib-debug ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_environment.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_mi_vector_hash.debug tests-lib-debug debug,atf Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.58 src/etc/mtree/NetBSD.dist.base:1.59 --- src/etc/mtree/NetBSD.dist.base:1.58 Thu Nov 4 13:01:42 2010 +++ src/etc/mtree/NetBSD.dist.base Thu Nov 4 13:24:27 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.58 2010/11/04 13:01:42 pgoyette Exp $ +# $NetBSD: NetBSD.dist.base,v 1.59 2010/11/04 13:24:27 pooka Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -239,6 +239,7 @@ ./usr/libdata/debug/usr/tests/lib/libc ./usr/libdata/debug/usr/tests/lib/libc/gen ./usr/libdata/debug/usr/tests/lib/libc/hash +./usr/libdata/debug/usr/tests/lib/libc/stdio ./usr/libdata/debug/usr/tests/lib/libc/stdlib ./usr/libdata/debug/usr/tests/lib/libdes ./usr/libdata/debug/usr/tests/lib/libevent
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys
Module Name:src Committed By: agc Date: Thu Nov 4 13:45:31 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.c Log Message: Add the new --cipher option to usage message, pointed out by Thomas Klausner -- thanks, wiz! To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 \ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.21 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.22 --- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.21 Thu Nov 4 06:46:15 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c Thu Nov 4 13:45:30 2010 @@ -62,6 +62,7 @@ \t--get-key keyid [options] OR\n \t--version\n where options are:\n + \t[--cipher=cipher name] AND/OR\n \t[--coredumps] AND/OR\n \t[--hash=hash alg] AND/OR\n \t[--homedir=homedir] AND/OR\n
CVS commit: src/lib/libedit
Module Name:src Committed By: christos Date: Thu Nov 4 13:53:12 UTC 2010 Modified Files: src/lib/libedit: eln.c Log Message: PR/43998, PR/44021: In narrow history emulation, don't treat UTF-8 character sets specially as far as history goes since we always need to do the conversion from narrow [history] to wide [editline]. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libedit/eln.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/libedit/eln.c diff -u src/lib/libedit/eln.c:1.8 src/lib/libedit/eln.c:1.9 --- src/lib/libedit/eln.c:1.8 Sat Aug 28 11:44:59 2010 +++ src/lib/libedit/eln.c Thu Nov 4 09:53:12 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: eln.c,v 1.8 2010/08/28 15:44:59 christos Exp $ */ +/* $NetBSD: eln.c,v 1.9 2010/11/04 13:53:12 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include config.h #if !defined(lint) !defined(SCCSID) -__RCSID($NetBSD: eln.c,v 1.8 2010/08/28 15:44:59 christos Exp $); +__RCSID($NetBSD: eln.c,v 1.9 2010/11/04 13:53:12 christos Exp $); #endif /* not lint not SCCSID */ #include histedit.h @@ -217,8 +217,7 @@ hist_fun_t fun = va_arg(ap, hist_fun_t); ptr_t ptr = va_arg(ap, ptr_t); ret = hist_set(el, fun, ptr); - if (!(el-el_flags CHARSET_IS_UTF8)) - el-el_flags |= NARROW_HISTORY; + el-el_flags |= NARROW_HISTORY; break; } /* XXX: do we need to change el_rfunc_t? */
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Thu Nov 4 14:08:31 UTC 2010
Modified Files:
src/sys/dev/usb: if_otus.c
Log Message:
more static
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/if_otus.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/usb/if_otus.c
diff -u src/sys/dev/usb/if_otus.c:1.6 src/sys/dev/usb/if_otus.c:1.7
--- src/sys/dev/usb/if_otus.c:1.6 Thu Nov 4 09:21:08 2010
+++ src/sys/dev/usb/if_otus.c Thu Nov 4 10:08:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_otus.c,v 1.6 2010/11/04 13:21:08 christos Exp $ */
+/* $NetBSD: if_otus.c,v 1.7 2010/11/04 14:08:31 christos Exp $ */
/* $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $ */
/*-
@@ -636,7 +636,7 @@
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc-sc_udev, sc-sc_dev);
}
-int
+Static int
otus_detach(device_t self, int flags)
{
struct otus_softc *sc = device_private(self);
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Thu Nov 4 15:38:45 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: Makefile.in config.h.in create.c create.h crypto.c crypto.h netpgp.c packet-parse.c readerwriter.h symmetric.c writer.c writer.h Log Message: allow user-specification of cipher to be used when encrypting packets. preserve the CAST5 default for now. at the user level, this is specified using the --cipher=ciphername option. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in \ src/crypto/external/bsd/netpgp/dist/src/lib/writer.h cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in \ src/crypto/external/bsd/netpgp/dist/src/lib/readerwriter.h cvs rdiff -u -r1.34 -r1.35 \ src/crypto/external/bsd/netpgp/dist/src/lib/create.c cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/netpgp/dist/src/lib/create.h cvs rdiff -u -r1.28 -r1.29 \ src/crypto/external/bsd/netpgp/dist/src/lib/crypto.c \ src/crypto/external/bsd/netpgp/dist/src/lib/writer.c cvs rdiff -u -r1.23 -r1.24 \ src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h cvs rdiff -u -r1.79 -r1.80 \ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c cvs rdiff -u -r1.42 -r1.43 \ src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c cvs rdiff -u -r1.15 -r1.16 \ src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in diff -u src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.9 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.10 --- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.9 Sat Aug 7 04:16:40 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in Thu Nov 4 15:38:45 2010 @@ -57,12 +57,12 @@ libnetpgp_la-compress.lo libnetpgp_la-create.lo \ libnetpgp_la-crypto.lo libnetpgp_la-fastctype.lo \ libnetpgp_la-keyring.lo libnetpgp_la-misc.lo \ - libnetpgp_la-mj.lo libnetpgp_la-netpgp.lo \ - libnetpgp_la-openssl_crypto.lo libnetpgp_la-packet-parse.lo \ - libnetpgp_la-packet-print.lo libnetpgp_la-packet-show.lo \ - libnetpgp_la-reader.lo libnetpgp_la-signature.lo \ - libnetpgp_la-ssh2pgp.lo libnetpgp_la-symmetric.lo \ - libnetpgp_la-validate.lo libnetpgp_la-writer.lo + libnetpgp_la-netpgp.lo libnetpgp_la-openssl_crypto.lo \ + libnetpgp_la-packet-parse.lo libnetpgp_la-packet-print.lo \ + libnetpgp_la-packet-show.lo libnetpgp_la-reader.lo \ + libnetpgp_la-signature.lo libnetpgp_la-ssh2pgp.lo \ + libnetpgp_la-symmetric.lo libnetpgp_la-validate.lo \ + libnetpgp_la-writer.lo libnetpgp_la_OBJECTS = $(am_libnetpgp_la_OBJECTS) DEFAULT_INCLUDES = -...@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp @@ -213,7 +213,6 @@ fastctype.c \ keyring.c \ misc.c \ - mj.c \ netpgp.c \ openssl_crypto.c \ packet-parse.c \ @@ -322,7 +321,6 @@ @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libnetpgp_la-fastctype@am__quote@ @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libnetpgp_la-keyring@am__quote@ @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libnetpgp_la-misc@am__quote@ -...@amdep_true@@am__include@ @am__qu...@./$(DEPDIR)/libnetpgp_la-mj@am__quote@ @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libnetpgp_la-netpgp@am__quote@ @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libnetpgp_la-openssl_crypto@am__quote@ @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libnetpgp_la-packet-parse@am__quote@ @@ -405,13 +403,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnetpgp_la-misc.lo `test -f 'misc.c' || echo '$(srcdir)/'`misc.c -libnetpgp_la-mj.lo: mj.c -...@am__fastdepcc_true@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnetpgp_la-mj.lo -MD -MP -MF $(DEPDIR)/libnetpgp_la-mj.Tpo -c -o libnetpgp_la-mj.lo `test -f 'mj.c' || echo '$(srcdir)/'`mj.c -...@am__fastdepcc_true@ mv -f $(DEPDIR)/libnetpgp_la-mj.Tpo $(DEPDIR)/libnetpgp_la-mj.Plo -...@amdep_true@@am__fastdepCC_FALSE@ source='mj.c' object='libnetpgp_la-mj.lo' libtool=yes @AMDEPBACKSLASH@ -...@amdep_true@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -...@am__fastdepcc_false@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnetpgp_la-mj.lo `test -f 'mj.c'
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src Committed By: agc Date: Thu Nov 4 15:39:09 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile.in netpgp.1 netpgp.c Log Message: allow user-specification of cipher to be used when encrypting packets. at the user level, this is specified using the --cipher=ciphername option. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in cvs rdiff -u -r1.15 -r1.16 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in:1.4 src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in:1.5 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in:1.4 Sat Aug 7 04:23:56 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in Thu Nov 4 15:39:08 2010 @@ -81,26 +81,19 @@ CANONICAL_HOST = @CANONICAL_HOST@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ @OPENSSL_INCLUDES@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ @OPENSSL_INCLUDES@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ +CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ INSTALL = @INSTALL@ @@ -109,9 +102,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ -LDFLAGS = @LDFLAGS@ @OPENSSL_LDFLAGS@ +LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ @OPENSSL_LIBS@ +LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -148,9 +141,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.15 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.16 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.15 Wed Nov 3 02:36:12 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 Thu Nov 4 15:39:08 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: netpgp.1,v 1.15 2010/11/03 02:36:12 agc Exp $ +.\ $NetBSD: netpgp.1,v 1.16 2010/11/04 15:39:08 agc Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd August 9, 2010 +.Dd November 4, 2010 .Dt NETPGP 1 .Os .Sh NAME @@ -85,9 +85,11 @@ .Pp where the long options for all commands are: .Pp +.Op Fl Fl cipher Ns = Ns Ar ciphername +.br .Op Fl Fl coredumps .br -.Op Fl Fl homedir Ns = Ns Ar home-directory +.Op Fl Fl homedir Ns = Ns Ar home\-directory .br .Op Fl Fl keyring Ns = Ns Ar keyring .br @@ -202,6 +204,16 @@ .It Fl Fl armour , Fl armor This option, however it is spelled, wraps the signature as an ASCII-encoded piece of text, for ease of use. +.It Fl Fl cipher Ar ciphername +can be used to specify the symmetric encryption algorithm (or +cipher) which is used when encrypting data. +To decrypt this data, the same cipher will be needed, +so care should be taken at encryption time to make sure +that the person who decrypts the data has +access to the cipher used. +The default cipher algorithm is the +.Dq CAST5 +algorithm. .It Fl Fl detached When signing a file, place the resulting signature in a separate file from the one being signed. @@ -217,7 +229,7 @@ may also be used, although it is recommended that SHA256 be used, due to recent advances in generating collisions for the SHA1 hashing algorithm. -.It Fl Fl homedir Ar home-directory +.It Fl Fl homedir Ar home\-directory Keyrings are normally located, for historical reasons, within the user's home directory in a subdirectory called .Dq Pa .gnupg Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.15 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.16 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.15 Wed Sep 8 03:21:22 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c Thu Nov 4 15:39:08 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: netpgp.c,v 1.15 2010/09/08 03:21:22 agc Exp $ */ +/* $NetBSD: netpgp.c,v 1.16 2010/11/04 15:39:08 agc Exp $ */ /*- * Copyright (c) 2009 The NetBSD
CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src
Committed By: agc
Date: Thu Nov 4 15:39:43 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist: tst
Log Message:
add an additional test for the user-specified cipher
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/netpgp/dist/tst
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/tst
diff -u src/crypto/external/bsd/netpgp/dist/tst:1.29 src/crypto/external/bsd/netpgp/dist/tst:1.30
--- src/crypto/external/bsd/netpgp/dist/tst:1.29 Wed Sep 1 17:25:57 2010
+++ src/crypto/external/bsd/netpgp/dist/tst Thu Nov 4 15:39:42 2010
@@ -36,7 +36,7 @@
su root -c make install'
passed=0
-total=35
+total=36
rm -f passed
date passed
echo == sign/verify 180938 file
@@ -184,5 +184,9 @@
echo == single key listing
/usr/bin/netpgpkeys -l agc passed=$(expr $passed + 1)
echo 35 $passed passed
-rm -f a a.gpg b b.gpg c c.gpg d d.gpg e f f.sig g g.asc g2 a2 a3 a4 a5 h h.sig i i.asc
+echo == pipeline and memory encrypt/decrypt with specified cipher
+/usr/bin/netpgp -e --cipher camellia128 a | /usr/bin/netpgp -d a6
+diff a a6 passed=$(expr $passed + 1)
+echo 36 $passed passed
+rm -f a a.gpg b b.gpg c c.gpg d d.gpg e f f.sig g g.asc g2 a2 a3 a4 a5 a6 h h.sig i i.asc
echo Passed ${passed}/${total} tests
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Thu Nov 4 16:13:35 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: reader.c validate.c Log Message: Apply patch from Peter Pentchev in PR 44040 The patch fixes two problems when verifying a clearsigned message: - a copy/paste error - litdata should be cleartext - a use of an uninitialized variable, resulting in freeing an uninitialized pointer on the stack... resulting in a segfault To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 \ src/crypto/external/bsd/netpgp/dist/src/lib/reader.c cvs rdiff -u -r1.39 -r1.40 \ src/crypto/external/bsd/netpgp/dist/src/lib/validate.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/reader.c diff -u src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.42 src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.43 --- src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.42 Sun Aug 15 16:36:24 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/reader.c Thu Nov 4 16:13:35 2010 @@ -54,7 +54,7 @@ #if defined(__NetBSD__) __COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.); -__RCSID($NetBSD: reader.c,v 1.42 2010/08/15 16:36:24 agc Exp $); +__RCSID($NetBSD: reader.c,v 1.43 2010/11/04 16:13:35 agc Exp $); #endif #include sys/types.h @@ -681,8 +681,8 @@ process_dash_escaped: bad body length\n); return -1; } - /* don't send that one character, because it's part of the trailer */ + (void) memset(content2, 0x0, sizeof(content2)); CALLBACK(OPS_PTAG_CT_SIGNED_CLEARTEXT_TRAILER, cbinfo, content2); return total; } Index: src/crypto/external/bsd/netpgp/dist/src/lib/validate.c diff -u src/crypto/external/bsd/netpgp/dist/src/lib/validate.c:1.39 src/crypto/external/bsd/netpgp/dist/src/lib/validate.c:1.40 --- src/crypto/external/bsd/netpgp/dist/src/lib/validate.c:1.39 Sun Aug 15 16:36:24 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/validate.c Thu Nov 4 16:13:35 2010 @@ -54,7 +54,7 @@ #if defined(__NetBSD__) __COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.); -__RCSID($NetBSD: validate.c,v 1.39 2010/08/15 16:36:24 agc Exp $); +__RCSID($NetBSD: validate.c,v 1.40 2010/11/04 16:13:35 agc Exp $); #endif #include sys/types.h @@ -461,8 +461,8 @@ case OPS_PTAG_CT_SIGNED_CLEARTEXT_BODY: data-data.cleartext_body = content-cleartext_body; data-type = SIGNED_CLEARTEXT; - __ops_memory_add(data-mem, data-data.litdata_body.data, - data-data.litdata_body.length); + __ops_memory_add(data-mem, data-data.cleartext_body.data, + data-data.cleartext_body.length); return OPS_KEEP_MEMORY; case OPS_PTAG_CT_SIGNED_CLEARTEXT_TRAILER:
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src
Committed By: agc
Date: Thu Nov 4 16:24:22 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: validate.c
Log Message:
Apply the patch from Peter Pentchev in PR 44041
``When netpgp thinks (even for a little while, even if it
should change its mind almost immediately) that it's
processing a detached signature, it sends a message to that
effect to io-outs.
This kind of interferes with netpgp --cat :)''
Use io-errs instead of io-outs for the informational message.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 \
src/crypto/external/bsd/netpgp/dist/src/lib/validate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/validate.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/validate.c:1.40 src/crypto/external/bsd/netpgp/dist/src/lib/validate.c:1.41
--- src/crypto/external/bsd/netpgp/dist/src/lib/validate.c:1.40 Thu Nov 4 16:13:35 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/validate.c Thu Nov 4 16:24:22 2010
@@ -54,7 +54,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: validate.c,v 1.40 2010/11/04 16:13:35 agc Exp $);
+__RCSID($NetBSD: validate.c,v 1.41 2010/11/04 16:24:22 agc Exp $);
#endif
#include sys/types.h
@@ -508,7 +508,7 @@
data-detachname) {
/* check we have seen some data */
/* if not, need to read from detached name */
-(void) fprintf(io-outs,
+(void) fprintf(io-errs,
netpgp: assuming signed data in \%s\\n,
data-detachname);
data-mem = __ops_memory_new();
CVS commit: [netbsd-5] src/distrib/notes/common
Module Name:src
Committed By: pooka
Date: Thu Nov 4 16:48:29 UTC 2010
Modified Files:
src/distrib/notes/common [netbsd-5]: main
Log Message:
fill in bits for 5.1:
* SA list
* dedication
* statically linked pthreaders have been fixed
To generate a diff of this commit:
cvs rdiff -u -r1.425.2.8 -r1.425.2.9 src/distrib/notes/common/main
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.425.2.8 src/distrib/notes/common/main:1.425.2.9
--- src/distrib/notes/common/main:1.425.2.8 Wed Nov 3 08:03:32 2010
+++ src/distrib/notes/common/main Thu Nov 4 16:48:29 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: main,v 1.425.2.8 2010/11/03 08:03:32 snj Exp $
+.\ $NetBSD: main,v 1.425.2.9 2010/11/04 16:48:29 pooka Exp $
.\
.\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -451,6 +451,24 @@
.Nx
wouldn't exist.
.
+.Ss Dedication
+.Pp
+.
+.Nx
+5.1 is dedicated to the memory of Martti Kuparinen, who
+was the victim of a traffic accident in June 2010.
+.Pp
+Martti's technical contributions are too many to list here in full.
+He created and maintained numerous packages in pkgsrc, updated two
+packet filter solutions distributed with
+.Nx
+and improved several
+hardware drivers. Beyond that he was always helpful and friendly. His
+example encouraged users to contribute to the project and share their
+work with the community. Some of these users later became
+.Nx
+developers themselves thanks to Martti's efforts.
+.
.if \n[FOR_RELEASE] \{\
.Ss Changes Between the NetBSD 5.0 and 5.1 Releases
.Pp
@@ -507,6 +525,33 @@
.It
NetBSD-SA2009-013 (BIND named dynamic update Denial of Service vulnerability):
.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-013.txt.asc
+.It
+NetBSD-SA2010-002 (OpenSSL TLS renegotiation man in the middle vulnerability):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2010-002.txt.asc
+.It
+NetBSD-SA2010-003 (azalia(4)/hdaudio(4) negative mixer index panic):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2010-003.txt.asc
+.It
+NetBSD-SA2010-004 (amd64 per-page No-execute (NX) bit disabled):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2010-004.txt.asc
+.It
+NetBSD-SA2010-005 (NTP server Denial of Service vulnerability):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2010-005.txt.asc
+.It
+NetBSD-SA2010-006 (Buffer length checking errors in CODA):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2010-006.txt.asc
+.It
+NetBSD-SA2010-007 (Integer overflow in libbz2 decompression code):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2010-007.txt.asc
+.It
+NetBSD-SA2010-008 (sftp(1)/ftp(1)/glob(3) related resource exhaustion):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2010-008.txt.asc
+.It
+NetBSD-SA2010-010 (Buffer Length Handling Errors in netsmb):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2010-010.txt.asc
+.It
+NetBSD-SA2010-011 (OpenSSL Double Free Arbitrary Code Execution):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2010-011.txt.asc
.bullet)
.
.Pp
@@ -1523,8 +1568,6 @@
Workaround: generate a core file from the program using
.Xr gcore 1
and pass the core to gdb, instead of debugging the running program.
-.Pp
-Statically linked binaries using pthreads are currently broken.
.
.Pp
The sparc port does not have functional SMP support in this release.
CVS commit: src/sys/kern
Module Name:src Committed By: pooka Date: Thu Nov 4 17:02:35 UTC 2010 Modified Files: src/sys/kern: makesyscalls.sh Log Message: apply shut up, lint for syscallargs.h To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/sys/kern/makesyscalls.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/makesyscalls.sh diff -u src/sys/kern/makesyscalls.sh:1.100 src/sys/kern/makesyscalls.sh:1.101 --- src/sys/kern/makesyscalls.sh:1.100 Mon Nov 1 16:21:29 2010 +++ src/sys/kern/makesyscalls.sh Thu Nov 4 17:02:34 2010 @@ -1,5 +1,5 @@ #! /bin/sh - -# $NetBSD: makesyscalls.sh,v 1.100 2010/11/01 16:21:29 pooka Exp $ +# $NetBSD: makesyscalls.sh,v 1.101 2010/11/04 17:02:34 pooka Exp $ # # Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou # All rights reserved. @@ -280,7 +280,7 @@ printf \t\t} be;\t\t\t\t\t\t\t\\\n sysarghdr printf \t}\n sysarghdr printf(\n#undef check_syscall_args\n) sysarghdr - printf(#define check_syscall_args(call) \\\n \ + printf(#define check_syscall_args(call) /*LINTED*/ \\\n \ \ttypedef char call##_check_args \ [sizeof (struct call##_args) \\\n \ \t\t= %sMAXSYSARGS * sizeof (%s) ? 1 : -1];\n, \
CVS commit: src/sys/sys
Module Name:src Committed By: pooka Date: Thu Nov 4 17:03:20 UTC 2010 Modified Files: src/sys/sys: syscallargs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.216 -r1.217 src/sys/sys/syscallargs.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/sys/syscallargs.h diff -u src/sys/sys/syscallargs.h:1.216 src/sys/sys/syscallargs.h:1.217 --- src/sys/sys/syscallargs.h:1.216 Mon Aug 30 10:34:51 2010 +++ src/sys/sys/syscallargs.h Thu Nov 4 17:03:20 2010 @@ -1,10 +1,10 @@ -/* $NetBSD: syscallargs.h,v 1.216 2010/08/30 10:34:51 pooka Exp $ */ +/* $NetBSD: syscallargs.h,v 1.217 2010/11/04 17:03:20 pooka Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.236 2010/08/30 10:32:54 pooka Exp + * created from NetBSD: syscalls.master,v 1.238 2010/09/07 17:10:08 pooka Exp */ #ifndef _SYS_SYSCALLARGS_H_ @@ -29,7 +29,7 @@ } #undef check_syscall_args -#define check_syscall_args(call) \ +#define check_syscall_args(call) /*LINTED*/ \ typedef char call##_check_args[sizeof (struct call##_args) \ = SYS_MAXSYSARGS * sizeof (register_t) ? 1 : -1];
CVS commit: [netbsd-5] src/distrib/notes/common
Module Name:src Committed By: sborrill Date: Thu Nov 4 20:02:45 UTC 2010 Modified Files: src/distrib/notes/common [netbsd-5]: main Log Message: Extend discussion of libpixman and libXfont compat issue and compatibility packages (URL is not yet 100% decided, but is currently correct). Rename discussion of pthread and SA support to fix duplicate subsection names (previously two sections about upgrading from 4.x). Change some text from 5.0 to 5.x. To generate a diff of this commit: cvs rdiff -u -r1.425.2.9 -r1.425.2.10 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.425.2.9 src/distrib/notes/common/main:1.425.2.10 --- src/distrib/notes/common/main:1.425.2.9 Thu Nov 4 16:48:29 2010 +++ src/distrib/notes/common/main Thu Nov 4 20:02:45 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.425.2.9 2010/11/04 16:48:29 pooka Exp $ +.\ $NetBSD: main,v 1.425.2.10 2010/11/04 20:02:45 sborrill Exp $ .\ .\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1835,8 +1835,17 @@ In the version of X.Org shipped with 5.0, this was a directory, but in more recent X.Org versions it is a file. .Pp -On ports using X.Org, libpixman and libXfont had their major versions bumped. -This can be a source of trouble if using binary packages built on 5.0.x. +On ports using X.Org (amd64, i386, macppc, sgimips, shark and sparc64), +libpixman and libXfont had their major versions bumped. +This can be a source of trouble if using binary packages built on 5.0.x with +a clean install of \*V (upgrades from 5.0.x will include both old and new +versions of libpixman and libXfont). +Compatibility packages have been prepared and are available from: +.Lk ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/\*M/5.0/emulators/netbsd-compat50-5.1.tgz +(or a convenient mirror). +This URL can be passed directly to the +.Xr pkg_add 1 +command. .Pp pkg_install now depends on the pkgdb cache for automatic conflict detection. It is recommended to rebuild the cache with @@ -1859,7 +1868,7 @@ has moved into .Xr pkg_admin 1 . However, wrapper scripts that handle the common use cases are provided. -.Ss2 Issues affecting an upgrade from NetBSD 4.x releases +.Ss2 Issues when running older binaries on NetBSD \*V .Pp The pthread libraries from previous versions of .Nx @@ -1871,19 +1880,19 @@ .Dv 0 . This affects the following environments: .(bullet -Running a 5.0 kernel with an older userland. +Running a 5.x kernel with an older userland. .It -Running an older userland inside a chroot'ed environment on a 5.0 system. +Running an older userland inside a chroot'ed environment on a 5.x system. .It Running older statically linked pthread applications. .bullet) .Pp -The 5.0 kernel defaults to +The 5.x kernel defaults to .Dv 0 for .Dv kern.no_sa_support , which covers the first case. -However, please note that a full installation of 5.0 +However, please note that a full installation of 5.x .Pq either from scratch or through an upgrade will set .Dv kern.no_sa_support
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Thu Nov 4 20:08:12 UTC 2010 Modified Files: src/sys/dev/acpi: acpi_display.c Log Message: Initialize pointers to NULL to avoid accidentally free(9)'ing garbage. Should address the panic reported by Alan Bueno in PR # 44042. The root cause (an empty _DOD) is yet to be determined. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/acpi_display.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/acpi/acpi_display.c diff -u src/sys/dev/acpi/acpi_display.c:1.5 src/sys/dev/acpi/acpi_display.c:1.6 --- src/sys/dev/acpi/acpi_display.c:1.5 Fri Oct 29 09:04:38 2010 +++ src/sys/dev/acpi/acpi_display.c Thu Nov 4 20:08:12 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_display.c,v 1.5 2010/10/29 09:04:38 gsutre Exp $ */ +/* $NetBSD: acpi_display.c,v 1.6 2010/11/04 20:08:12 jruoho Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_display.c,v 1.5 2010/10/29 09:04:38 gsutre Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_display.c,v 1.6 2010/11/04 20:08:12 jruoho Exp $); #include sys/param.h #include sys/device.h @@ -1416,6 +1416,7 @@ return NULL; oi = NULL; + pkg = NULL; rv = acpidisp_eval_package(hdl, _DOD, pkg, 1); if (ACPI_FAILURE(rv)) @@ -1600,6 +1601,7 @@ return NULL; bc = NULL; + pkg = NULL; rv = acpidisp_eval_package(hdl, _BCL, pkg, 2); if (ACPI_FAILURE(rv))
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Thu Nov 4 20:50:30 UTC 2010
Modified Files:
src/sys/kern: makesyscalls.sh
Log Message:
Create rump_syscalls.c in two flavours: one which can be compiled
standalone as the clientside and one which expects to be compiled
into the rump kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/kern/makesyscalls.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.101 src/sys/kern/makesyscalls.sh:1.102
--- src/sys/kern/makesyscalls.sh:1.101 Thu Nov 4 17:02:34 2010
+++ src/sys/kern/makesyscalls.sh Thu Nov 4 20:50:29 2010
@@ -1,5 +1,5 @@
#! /bin/sh -
-# $NetBSD: makesyscalls.sh,v 1.101 2010/11/04 17:02:34 pooka Exp $
+# $NetBSD: makesyscalls.sh,v 1.102 2010/11/04 20:50:29 pooka Exp $
#
# Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
# All rights reserved.
@@ -212,22 +212,41 @@
printf * created from%s\n */\n\n, $0 rumpcalls
printf #include sys/cdefs.h\n__KERNEL_RCSID(0, \%s\);\n\n, tag rumpcalls
- printf #include sys/types.h\n rumpcalls
+
printf #include sys/param.h\n rumpcalls
+ printf #include sys/fstypes.h\n rumpcalls
printf #include sys/proc.h\n rumpcalls
printf #include sys/syscall.h\n rumpcalls
- printf #include sys/syscallargs.h\n rumpcalls
+ printf #include sys/syscallargs.h\n\n rumpcalls
+ printf #ifdef RUMP_CLIENT\n rumpcalls
+ printf #include errno.h\n rumpcalls
+ printf #include rump/rumpclient.h\n\n rumpcalls
+ printf #define rsys_syscall(num, data, dlen, retval)\t\\\n rumpcalls
+ printf rumpclient_syscall(num, data, dlen, retval)\n rumpcalls
+ printf #define rsys_seterrno(error) errno = error\n rumpcalls
+ printf #define rsys_alias(a,b)\n#else\n rumpcalls
printf #include rump/rumpuser.h\n rumpcalls
printf #include \rump_private.h\\n\n rumpcalls
+ printf static int\nrsys_syscall rumpcalls
+ printf (int num, void *data, size_t dlen, register_t *retval) rumpcalls
+ printf \n{\n\tint rv;\n\n\trump_schedule();\n rumpcalls
+ printf \trv = rump_syscall(num, data, retval);\n rumpcalls
+ printf \trump_unschedule();\n\n\treturn rv;\n}\n\n rumpcalls
+ printf #define rsys_seterrno(error) rumpuser_seterrno(error)\n rumpcalls
+ printf #define rsys_alias(a,b) __weak_alias(a,b);\n#endif\n\n rumpcalls
+
printf #if\tBYTE_ORDER == BIG_ENDIAN\n rumpcalls
printf #define SPARG(p,k)\t((p)-k.be.datum)\n rumpcalls
printf #else /* LITTLE_ENDIAN, I hope dearly */\n rumpcalls
printf #define SPARG(p,k)\t((p)-k.le.datum)\n rumpcalls
printf #endif\n\n rumpcalls
+ printf #ifndef RUMP_CLIENT\n rumpcalls
printf int rump_enosys(void);\n rumpcalls
printf int\nrump_enosys()\n{\n\n\treturn ENOSYS;\n}\n rumpcalls
+ printf #endif\n rumpcalls
- printf \n#define\ts(type)\tsizeof(type)\n rumpsysent
+ printf \n#ifndef RUMP_CLIENT\n rumpsysent
+ printf #define\ts(type)\tsizeof(type)\n rumpsysent
printf #define\tn(type)\t(sizeof(type)/sizeof (%s))\n, registertype rumpsysent
printf #define\tns(type)\tn(type), s(type)\n\n, registertype rumpsysent
printf struct sysent rump_sysent[] = {\n rumpsysent
@@ -706,18 +725,18 @@
} else {
printf(\n) rumpcalls
}
- printf(\terror = rump_sysproxy(%s%s, rump_sysproxy_arg,\n\t \
- (uint8_t *)%s, %s, rval);\n, constprefix, funcalias, \
+ printf(\terror = rsys_syscall(%s%s, \
+ %s, %s, rval);\n, constprefix, funcalias, \
argarg, argsize) rumpcalls
printf(\tif (error) {\n\t\trval[0] = -1;\n) rumpcalls
if (returntype != void) {
- printf(\t\trumpuser_seterrno(error);\n\t}\n) rumpcalls
+ printf(\t\trsys_seterrno(error);\n\t}\n) rumpcalls
printf(\treturn rval[0];\n) rumpcalls
} else {
printf(\t}\n) rumpcalls
}
printf(}\n) rumpcalls
- printf(__weak_alias(%s,rump_enosys);\n, funcname) rumpcalls
+ printf(rsys_alias(%s,rump_enosys)\n, funcname) rumpcalls
}
$2 == STD || $2 == NODEF || $2 == NOARGS || $2 == INDIR {
@@ -774,10 +793,10 @@
printf(int\nrump_sys_pipe(int *fd)\n{\n) rumpcalls
printf(\tregister_t rval[2] = {0, 0};\n) rumpcalls
printf(\tint error = 0;\n) rumpcalls
- printf(\n\terror = rump_sysproxy(SYS_pipe, ) rumpcalls
- printf(rump_sysproxy_arg, NULL, 0, rval);\n) rumpcalls
+ printf(\n\terror = rsys_syscall(SYS_pipe, ) rumpcalls
+ printf(NULL, 0, rval);\n) rumpcalls
printf(\tif (error) {\n) rumpcalls
- printf(\t\trumpuser_seterrno(error);\n) rumpcalls
+ printf(\t\trsys_seterrno(error);\n) rumpcalls
printf(\t} else {\n\t\tfd[0] = rval[0];\n) rumpcalls
printf(\t\tfd[1] = rval[1];\n\t}\n) rumpcalls
printf(\treturn error ? -1 : 0;\n}\n) rumpcalls
@@ -800,6 +819,7 @@
printf(};\n) sysent
printf(};\n) rumpsysent
printf(CTASSERT(__arraycount(rump_sysent) == SYS_NSYSENT);\n) rumpsysent
+ printf(#endif /* RUMP_CLIENT */\n) rumpsysent
printf(};\n) sysnamesbottom
CVS commit: src
Module Name:src
Committed By: pooka
Date: Thu Nov 4 20:54:08 UTC 2010
Modified Files:
src/lib/librumpuser: rumpuser_sp.c
src/sys/rump/include/rump: rump_syscalls.h rumpuser.h
src/sys/rump/librump/rumpkern: rump.c rump_private.h
Added Files:
src/lib/librumpuser: sp_common.c
Log Message:
Refactor the sysproxy code so that rumpuser contains only the server side.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/librumpuser/rumpuser_sp.c
cvs rdiff -u -r0 -r1.1 src/lib/librumpuser/sp_common.c
cvs rdiff -u -r1.31 -r1.32 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.48 -r1.49 src/sys/rump/include/rump/rumpuser.h
cvs rdiff -u -r1.195 -r1.196 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.60 -r1.61 src/sys/rump/librump/rumpkern/rump_private.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser_sp.c
diff -u src/lib/librumpuser/rumpuser_sp.c:1.4 src/lib/librumpuser/rumpuser_sp.c:1.5
--- src/lib/librumpuser/rumpuser_sp.c:1.4 Mon Nov 1 13:55:19 2010
+++ src/lib/librumpuser/rumpuser_sp.c Thu Nov 4 20:54:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_sp.c,v 1.4 2010/11/01 13:55:19 pooka Exp $ */
+/* $NetBSD: rumpuser_sp.c,v 1.5 2010/11/04 20:54:07 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: rumpuser_sp.c,v 1.4 2010/11/01 13:55:19 pooka Exp $);
+__RCSID($NetBSD: rumpuser_sp.c,v 1.5 2010/11/04 20:54:07 pooka Exp $);
#include sys/types.h
#include sys/mman.h
@@ -61,84 +61,7 @@
#include rump/rumpuser.h
-//#define DEBUG
-#ifdef DEBUG
-#include rump/rump.h
-#include rump/rump_syscalls.h
-#define DPRINTF(x) mydprintf x
-static void
-mydprintf(const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- vfprintf(stderr, fmt, ap);
- va_end(ap);
-}
-#else
-#define DPRINTF(x)
-#endif
-
-/*
- * Bah, I hate writing on-off-wire conversions in C
- */
-
-enum {
- RUMPSP_SYSCALL_REQ, RUMPSP_SYSCALL_RESP,
- RUMPSP_COPYIN_REQ, RUMPSP_COPYIN_RESP,
- RUMPSP_COPYOUT_REQ, /* no copyout resp */
- RUMPSP_ANONMMAP_REQ, RUMPSP_ANONMMAP_RESP
-};
-
-struct rsp_hdr {
- uint64_t rsp_len;
- uint64_t rsp_reqno;
- uint32_t rsp_type;
- /*
- * We want this structure 64bit-aligned for typecast fun,
- * so might as well use the following for something.
- */
- uint32_t rsp_sysnum;
-};
-#define HDRSZ sizeof(struct rsp_hdr)
-
-/*
- * Data follows the header. We have two types of structured data.
- */
-
-/* copyin/copyout */
-struct rsp_copydata {
- size_t rcp_len;
- void *rcp_addr;
- uint8_t rcp_data[0];
-};
-
-/* syscall response */
-struct rsp_sysresp {
- int rsys_error;
- register_t rsys_retval[2];
-};
-
-
-struct spclient {
- int spc_fd;
- struct lwp *spc_lwp;
-
- /* incoming */
- struct rsp_hdr spc_hdr;
- uint8_t *spc_buf;
- size_t spc_off;
-
-#if 0
- /* outgoing */
- int spc_obusy;
- pthread_mutex_t spc_omtx;
- pthread_cond_t spc_cv;
-#endif
-};
-
-typedef int (*addrparse_fn)(const char *, int, struct sockaddr **);
-typedef int (*connecthook_fn)(int);
+#include sp_common.c
#define MAXCLI 4
@@ -148,8 +71,6 @@
static uint64_t nextreq;
static pthread_key_t spclient_tls;
-static struct spclient clispc;
-
static struct rumpuser_sp_ops spops;
/*
@@ -212,57 +133,6 @@
}
static int
-dosend(struct spclient *spc, const void *data, size_t dlen)
-{
- struct pollfd pfd;
- const uint8_t *sdata = data;
- ssize_t n;
- size_t sent;
- int fd = spc-spc_fd;
-
- pfd.fd = fd;
- pfd.events = POLLOUT;
-
- for (sent = 0, n = 0; sent dlen; ) {
- if (n) {
- if (poll(pfd, 1, INFTIM) == -1) {
-if (errno == EINTR)
- continue;
-return errno;
- }
- }
-
- n = write(fd, sdata + sent, dlen - sent);
- if (n == 0) {
- return EFAULT;
- }
- if (n == -1 errno != EAGAIN) {
- return EFAULT;
- }
- sent += n;
- }
-
- return 0;
-}
-
-static int
-send_syscall_req(struct spclient *spc, int sysnum,
- const void *data, size_t dlen)
-{
- struct rsp_hdr rhdr;
-
- rhdr.rsp_len = sizeof(rhdr) + dlen;
- rhdr.rsp_reqno = nextreq++;
- rhdr.rsp_type = RUMPSP_SYSCALL_REQ;
- rhdr.rsp_sysnum = sysnum;
-
- dosend(spc, rhdr, sizeof(rhdr));
- dosend(spc, data, dlen);
-
- return 0;
-}
-
-static int
send_syscall_resp(struct spclient *spc, uint64_t reqno, int error,
register_t retval[2])
{
@@ -304,22 +174,6 @@
}
static int
-send_copyin_resp(struct spclient *spc, uint64_t reqno, void *data, size_t dlen)
-{
- struct rsp_hdr rhdr;
-
- rhdr.rsp_len = sizeof(rhdr) + dlen;
- rhdr.rsp_reqno = reqno;
- rhdr.rsp_type = RUMPSP_COPYIN_RESP;
- rhdr.rsp_sysnum = 0;
-
- dosend(spc, rhdr, sizeof(rhdr));
- dosend(spc, data, dlen);
-
- return 0;
-}
-
-static int
send_copyout_req(struct spclient *spc, const void *remaddr,
const void *data, size_t dlen)
{
@@ -357,22 +211,6 @@
return 0;
}
-static int
-send_anonmmap_resp(struct spclient *spc, uint64_t
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Nov 4 20:57:01 UTC 2010 Modified Files: src/sys/rump/include/rump: rumpuser.h Log Message: bump rumpuser version To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/rump/include/rump/rumpuser.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/rump/include/rump/rumpuser.h diff -u src/sys/rump/include/rump/rumpuser.h:1.49 src/sys/rump/include/rump/rumpuser.h:1.50 --- src/sys/rump/include/rump/rumpuser.h:1.49 Thu Nov 4 20:54:08 2010 +++ src/sys/rump/include/rump/rumpuser.h Thu Nov 4 20:57:00 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser.h,v 1.49 2010/11/04 20:54:08 pooka Exp $ */ +/* $NetBSD: rumpuser.h,v 1.50 2010/11/04 20:57:00 pooka Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -36,7 +36,7 @@ #include stdint.h #endif -#define RUMPUSER_VERSION 2 +#define RUMPUSER_VERSION 3 int rumpuser_getversion(void); struct msghdr;
CVS commit: src/lib
Module Name:src
Committed By: pooka
Date: Thu Nov 4 21:01:29 UTC 2010
Modified Files:
src/lib: Makefile
Added Files:
src/lib/librumpclient: Makefile rumpclient.c rumpclient.h shlib_version
Log Message:
Add library for rump syscall client stubs.
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/librumpclient/Makefile \
src/lib/librumpclient/rumpclient.c src/lib/librumpclient/rumpclient.h \
src/lib/librumpclient/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/lib/Makefile
diff -u src/lib/Makefile:1.152 src/lib/Makefile:1.153
--- src/lib/Makefile:1.152 Sun Oct 31 11:52:50 2010
+++ src/lib/Makefile Thu Nov 4 21:01:28 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.152 2010/10/31 11:52:50 mbalmer Exp $
+# $NetBSD: Makefile,v 1.153 2010/11/04 21:01:28 pooka Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include bsd.own.mk
@@ -9,7 +9,7 @@
libintl libkvm libm \
libossaudio libpcap libpci libpmc libposix libprop libpthread \
libpthread_dbg libpuffs libresolv librmt librpcsvc librt \
- libterminfo libusbhid libutil libwrap liby libz
+ librumpclient libterminfo libusbhid libutil libwrap liby libz
SUBDIR+=../external/bsd/flex/lib
SUBDIR+=../external/mit/lua/lib
Added files:
Index: src/lib/librumpclient/Makefile
diff -u /dev/null src/lib/librumpclient/Makefile:1.1
--- /dev/null Thu Nov 4 21:01:29 2010
+++ src/lib/librumpclient/Makefile Thu Nov 4 21:01:29 2010
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2010/11/04 21:01:29 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../sys/rump/librump/rumpkern
+
+LIB= rumpclient
+
+INCS= rumpclient.h
+INCSDIR= /usr/include/rump
+
+CPPFLAGS+= -DRUMP_CLIENT -I${.CURDIR} -I${.CURDIR}/../librumpuser
+SRCS= rumpclient.c
+SRCS+= rump_syscalls.c
+
+.include bsd.lib.mk
Index: src/lib/librumpclient/rumpclient.c
diff -u /dev/null src/lib/librumpclient/rumpclient.c:1.1
--- /dev/null Thu Nov 4 21:01:29 2010
+++ src/lib/librumpclient/rumpclient.c Thu Nov 4 21:01:29 2010
@@ -0,0 +1,211 @@
+/* $NetBSD: rumpclient.c,v 1.1 2010/11/04 21:01:29 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Client side routines for rump syscall proxy.
+ */
+
+#include sys/cdefs.h
+__RCSID($NetBSD);
+
+#include sys/types.h
+#include sys/mman.h
+#include sys/socket.h
+
+#include arpa/inet.h
+#include netinet/in.h
+#include netinet/tcp.h
+
+#include assert.h
+#include errno.h
+#include fcntl.h
+#include poll.h
+#include pthread.h
+#include stdarg.h
+#include stdio.h
+#include stdlib.h
+#include string.h
+#include unistd.h
+
+#include rump/rumpclient.h
+
+#include sp_common.c
+
+static struct spclient clispc;
+
+static int
+send_syscall_req(struct spclient *spc, int sysnum,
+ const void *data, size_t dlen)
+{
+ struct rsp_hdr rhdr;
+
+ rhdr.rsp_len = sizeof(rhdr) + dlen;
+ rhdr.rsp_reqno = nextreq++;
+ rhdr.rsp_type = RUMPSP_SYSCALL_REQ;
+ rhdr.rsp_sysnum = sysnum;
+
+ dosend(spc, rhdr, sizeof(rhdr));
+ dosend(spc, data, dlen);
+
+ return 0;
+}
+
+static int
+send_copyin_resp(struct spclient *spc, uint64_t reqno, void *data, size_t dlen)
+{
+ struct rsp_hdr rhdr;
+
+ rhdr.rsp_len = sizeof(rhdr) + dlen;
+ rhdr.rsp_reqno = reqno;
+ rhdr.rsp_type = RUMPSP_COPYIN_RESP;
+ rhdr.rsp_sysnum = 0;
+
+ dosend(spc, rhdr, sizeof(rhdr));
+ dosend(spc, data, dlen);
+
+ return 0;
+}
+
+static int
+send_anonmmap_resp(struct spclient *spc, uint64_t reqno, void *addr)
+{
+ struct rsp_hdr rhdr;
+
+ rhdr.rsp_len = sizeof(rhdr) + sizeof(addr);
+ rhdr.rsp_reqno = reqno;
+ rhdr.rsp_type =
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: pooka Date: Thu Nov 4 21:15:55 UTC 2010 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi Log Message: Add rumpclient to setlists. You know, I used to think setlists were ridiculous back when ~20 entries per lib were required. It seems we're up to 47 and I've long since run out of superlatives to describe the situation. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.553 -r1.554 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/comp/ad.mips64eb \ src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.77 -r1.78 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1521 -r1.1522 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.136 -r1.137 src/distrib/sets/lists/comp/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.24 src/distrib/sets/lists/base/ad.mips64eb:1.25 --- src/distrib/sets/lists/base/ad.mips64eb:1.24 Thu Nov 4 08:54:44 2010 +++ src/distrib/sets/lists/base/ad.mips64eb Thu Nov 4 21:15:54 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.24 2010/11/04 08:54:44 plunky Exp $ +# $NetBSD: ad.mips64eb,v 1.25 2010/11/04 21:15:54 pooka Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -173,6 +173,8 @@ ./usr/lib/64/librt.so.1.0 base-compat-shlib compat,pic ./usr/lib/64/librump.so.0 base-compat-shlib compat,pic ./usr/lib/64/librump.so.0.0 base-compat-shlib compat,pic +./usr/lib/64/librumpclient.so.0 base-compat-shlib compat,pic +./usr/lib/64/librumpclient.so.0.0 base-compat-shlib compat,pic ./usr/lib/64/librumpnet.so.0 base-compat-shlib compat,pic ./usr/lib/64/librumpnet.so.0.0 base-compat-shlib compat,pic ./usr/lib/64/librumpuser.so.0 base-compat-shlib compat,pic @@ -410,6 +412,8 @@ ./usr/lib/o32/librt.so.1.0 base-compat-shlib compat,pic ./usr/lib/o32/librump.so.0 base-compat-shlib compat,pic ./usr/lib/o32/librump.so.0.0 base-compat-shlib compat,pic +./usr/lib/o32/librumpclient.so.0 base-compat-shlib compat,pic +./usr/lib/o32/librumpclient.so.0.0 base-compat-shlib compat,pic ./usr/lib/o32/librumpnet.so.0 base-compat-shlib compat,pic ./usr/lib/o32/librumpnet.so.0.0 base-compat-shlib compat,pic ./usr/lib/o32/librumpuser.so.0 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.22 src/distrib/sets/lists/base/ad.mips64el:1.23 --- src/distrib/sets/lists/base/ad.mips64el:1.22 Tue Nov 2 16:34:33 2010 +++ src/distrib/sets/lists/base/ad.mips64el Thu Nov 4 21:15:54 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.22 2010/11/02 16:34:33 joerg Exp $ +# $NetBSD: ad.mips64el,v 1.23 2010/11/04 21:15:54 pooka Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -173,6 +173,8 @@ ./usr/lib/64/librt.so.1.0 base-compat-shlib compat,pic ./usr/lib/64/librump.so.0 base-compat-shlib compat,pic ./usr/lib/64/librump.so.0.0 base-compat-shlib compat,pic +./usr/lib/64/librumpclient.so.0 base-compat-shlib compat,pic +./usr/lib/64/librumpclient.so.0.0 base-compat-shlib compat,pic ./usr/lib/64/librumpnet.so.0 base-compat-shlib compat,pic ./usr/lib/64/librumpnet.so.0.0 base-compat-shlib compat,pic ./usr/lib/64/librumpuser.so.0 base-compat-shlib compat,pic @@ -410,6 +412,8 @@ ./usr/lib/o32/librt.so.1.0 base-compat-shlib compat,pic ./usr/lib/o32/librump.so.0 base-compat-shlib compat,pic ./usr/lib/o32/librump.so.0.0 base-compat-shlib compat,pic +./usr/lib/o32/librumpclient.so.0 base-compat-shlib compat,pic +./usr/lib/o32/librumpclient.so.0.0 base-compat-shlib compat,pic ./usr/lib/o32/librumpnet.so.0 base-compat-shlib compat,pic ./usr/lib/o32/librumpnet.so.0.0 base-compat-shlib compat,pic ./usr/lib/o32/librumpuser.so.0 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.97 src/distrib/sets/lists/base/md.amd64:1.98 --- src/distrib/sets/lists/base/md.amd64:1.97 Tue Nov 2 16:34:33 2010 +++ src/distrib/sets/lists/base/md.amd64 Thu Nov 4 21:15:54 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.97 2010/11/02 16:34:33 joerg Exp $ +# $NetBSD: md.amd64,v
CVS commit: src/lib/libc/stdlib
Module Name:src
Committed By: christos
Date: Thu Nov 4 21:49:46 UTC 2010
Modified Files:
src/lib/libc/stdlib: getenv.c
Log Message:
scrub the whole array, not just the first n malloced entries.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/stdlib/getenv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdlib/getenv.c
diff -u src/lib/libc/stdlib/getenv.c:1.29 src/lib/libc/stdlib/getenv.c:1.30
--- src/lib/libc/stdlib/getenv.c:1.29 Wed Nov 3 11:01:07 2010
+++ src/lib/libc/stdlib/getenv.c Thu Nov 4 17:49:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: getenv.c,v 1.29 2010/11/03 15:01:07 christos Exp $ */
+/* $NetBSD: getenv.c,v 1.30 2010/11/04 21:49:45 christos Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)getenv.c 8.1 (Berkeley) 6/4/93;
#else
-__RCSID($NetBSD: getenv.c,v 1.29 2010/11/03 15:01:07 christos Exp $);
+__RCSID($NetBSD: getenv.c,v 1.30 2010/11/04 21:49:45 christos Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -165,12 +165,11 @@
if (environ[++offset] == NULL)
return;
- while (environ[offset]
- environ[offset] == __environ_malloced[offset]) {
- free(__environ_malloced[offset]);
- environ[offset] = __environ_malloced[offset] = NULL;
- offset++;
- }
+ for (; environ[offset]; offset++)
+ if (environ[offset] == __environ_malloced[offset]) {
+ free(__environ_malloced[offset]);
+ environ[offset] = __environ_malloced[offset] = NULL;
+ }
environ[offset] = __environ_malloced[offset] = NULL;
}
CVS commit: src/sys/netinet
Module Name:src Committed By: matt Date: Thu Nov 4 22:00:51 UTC 2010 Modified Files: src/sys/netinet: ip_id.c Log Message: Replace the copyright with a new TNF copyright since nothing of the old ip_id.c remains. Remove old comments which have no relevance anymore. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/netinet/ip_id.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/netinet/ip_id.c diff -u src/sys/netinet/ip_id.c:1.12 src/sys/netinet/ip_id.c:1.13 --- src/sys/netinet/ip_id.c:1.12 Wed Feb 6 03:20:51 2008 +++ src/sys/netinet/ip_id.c Thu Nov 4 22:00:51 2010 @@ -1,14 +1,12 @@ -/* $NetBSD: ip_id.c,v 1.12 2008/02/06 03:20:51 matt Exp $ */ +/* $NetBSD: ip_id.c,v 1.13 2010/11/04 22:00:51 matt Exp $ */ /* $OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert Exp $ */ -/* - * Copyright 1998 Niels Provos pro...@citi.umich.edu +/*- + * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. * - * Theo de Raadt dera...@openbsd.org came up with the idea of using - * such a mathematical system to generate more random (yet non-repeating) - * ids to solve the resolver/named problem. But Niels designed the - * actual system based on the constraints. + * This code is derived from software contributed to The NetBSD Foundation + * by the 3am Software Foundry (3am). It was developed by Matt Thomas. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -19,40 +17,21 @@ *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. - */ - -/* - * seed = random 15bit - * n = prime, g0 = generator to n, - * j = random so that gcd(j,n-1) == 1 - * g = g0^j mod n will be a generator again. - * - * X[0] = random seed. - * X[n] = a*X[n-1]+b mod m is a Linear Congruential Generator - * with a = 7^(even random) mod m, - * b = random with gcd(b,m) == 1 - * m = 31104 and a maximal period of m-1. - * - * The transaction id is determined by: - * id[n] = seed xor (g^X[n] mod n) - * - * Effectively the id is restricted to the lower 15 bits, thus - * yielding two different cycles by toggling the msb on and off. - * This avoids reuse issues caused by reseeding. + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ip_id.c,v 1.12 2008/02/06 03:20:51 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: ip_id.c,v 1.13 2010/11/04 22:00:51 matt Exp $); #include opt_inet.h
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: pooka Date: Thu Nov 4 22:05:43 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: make that 48 To generate a diff of this commit: cvs rdiff -u -r1.1522 -r1.1523 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1522 src/distrib/sets/lists/comp/mi:1.1523 --- src/distrib/sets/lists/comp/mi:1.1522 Thu Nov 4 21:15:55 2010 +++ src/distrib/sets/lists/comp/mi Thu Nov 4 22:05:43 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1522 2010/11/04 21:15:55 pooka Exp $ +# $NetBSD: mi,v 1.1523 2010/11/04 22:05:43 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3877,6 +3877,7 @@ ./usr/libdata/lint/llib-lrpcsvc.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lrt.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lrumpuser.ln comp-c-lintlib lint +./usr/libdata/lint/llib-lrumpclient.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lsdp.ln comp-obsolete obsolete ./usr/libdata/lint/llib-lskey.ln comp-c-lintlib lint,skey ./usr/libdata/lint/llib-lsm.ln comp-obsolete obsolete
CVS commit: src/sbin/ifconfig
Module Name:src Committed By: pooka Date: Thu Nov 4 23:31:13 UTC 2010 Modified Files: src/sbin/ifconfig: Makefile env.h ifconfig.c Log Message: Update RUMP_ACTION to use the newstyle rump client. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sbin/ifconfig/Makefile cvs rdiff -u -r1.2 -r1.3 src/sbin/ifconfig/env.h cvs rdiff -u -r1.220 -r1.221 src/sbin/ifconfig/ifconfig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/ifconfig/Makefile diff -u src/sbin/ifconfig/Makefile:1.47 src/sbin/ifconfig/Makefile:1.48 --- src/sbin/ifconfig/Makefile:1.47 Thu Jul 1 16:28:21 2010 +++ src/sbin/ifconfig/Makefile Thu Nov 4 23:31:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2010/07/01 16:28:21 dyoung Exp $ +# $NetBSD: Makefile,v 1.48 2010/11/04 23:31:12 pooka Exp $ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # when making a change to this file, please check if the change is @@ -28,14 +28,12 @@ # # Compile-time debug flag. If compiled with make RUMP_ACTION=1, -# make rump system calls. This allows to single-step ioctl commands -# to figure out where ioctl's go in the kernel. +# make rump system calls to a server in another process. # .ifdef RUMP_ACTION CPPFLAGS+= -DRUMP_SYS_NETWORKING -DRUMP_SYS_IOCTL -DRUMP_SYS_CLOSE CPPFLAGS+= -DRUMP_ACTION -LDADD+= -lrumpnet_virtif -lrumpnet_netinet -lrumpnet_net -lrumpnet -LDADD+= -lrump -lrumpuser -lpthread +LDADD+= -lrumpclient DBG= -g .endif Index: src/sbin/ifconfig/env.h diff -u src/sbin/ifconfig/env.h:1.2 src/sbin/ifconfig/env.h:1.3 --- src/sbin/ifconfig/env.h:1.2 Tue May 26 16:03:24 2009 +++ src/sbin/ifconfig/env.h Thu Nov 4 23:31:12 2010 @@ -19,6 +19,7 @@ #ifdef RUMP_ACTION #include rump/rump.h #include rump/rump_syscalls.h +#include rump/rumpclient.h #endif /* RUMP_ACTION */ #endif /* _IFCONFIG_ENV_H */ Index: src/sbin/ifconfig/ifconfig.c diff -u src/sbin/ifconfig/ifconfig.c:1.220 src/sbin/ifconfig/ifconfig.c:1.221 --- src/sbin/ifconfig/ifconfig.c:1.220 Fri Aug 7 18:53:37 2009 +++ src/sbin/ifconfig/ifconfig.c Thu Nov 4 23:31:12 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ifconfig.c,v 1.220 2009/08/07 18:53:37 dyoung Exp $ */ +/* $NetBSD: ifconfig.c,v 1.221 2010/11/04 23:31:12 pooka Exp $ */ /*- * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ #ifndef lint __COPYRIGHT(@(#) Copyright (c) 1983, 1993\ The Regents of the University of California. All rights reserved.); -__RCSID($NetBSD: ifconfig.c,v 1.220 2009/08/07 18:53:37 dyoung Exp $); +__RCSID($NetBSD: ifconfig.c,v 1.221 2010/11/04 23:31:12 pooka Exp $); #endif /* not lint */ #include sys/param.h @@ -541,7 +541,10 @@ const char *ifname; #ifdef RUMP_ACTION - rump_init(); + int error; + + if ((error = rumpclient_init()) != 0) + errx(1, rump client init: %s, strerror(error)); #endif memset(match, 0, sizeof(match));
CVS commit: src/sbin/route
Module Name:src
Committed By: pooka
Date: Thu Nov 4 23:36:10 UTC 2010
Modified Files:
src/sbin/route: Makefile route.c
Log Message:
Support RUMP_ACTION to compile a rump kernel client.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sbin/route/Makefile
cvs rdiff -u -r1.121 -r1.122 src/sbin/route/route.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/route/Makefile
diff -u src/sbin/route/Makefile:1.23 src/sbin/route/Makefile:1.24
--- src/sbin/route/Makefile:1.23 Sat Aug 26 15:26:02 2006
+++ src/sbin/route/Makefile Thu Nov 4 23:36:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/08/26 15:26:02 matt Exp $
+# $NetBSD: Makefile,v 1.24 2010/11/04 23:36:10 pooka Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include bsd.own.mk
@@ -20,4 +20,15 @@
# keywords.c keywords.h : keywords.sh
# ${HOST_SH} keywords.sh
+#
+# Compile-time debug flag. If compiled with make RUMP_ACTION=1,
+# make rump system calls.
+#
+.ifdef RUMP_ACTION
+CPPFLAGS+= -DRUMP_SYS_NETWORKING -DRUMP_SYS_READWRITE -DRUMP_SYS_CLOSE
+CPPFLAGS+= -DRUMP_ACTION -DSMALL -Dsysctl=rump_sys___sysctl
+LDADD+= -lrumpclient
+DBG=-g
+.endif
+
.include bsd.prog.mk
Index: src/sbin/route/route.c
diff -u src/sbin/route/route.c:1.121 src/sbin/route/route.c:1.122
--- src/sbin/route/route.c:1.121 Sat Jun 26 14:29:36 2010
+++ src/sbin/route/route.c Thu Nov 4 23:36:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.121 2010/06/26 14:29:36 kefren Exp $ */
+/* $NetBSD: route.c,v 1.122 2010/11/04 23:36:10 pooka Exp $ */
/*
* Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)route.c 8.6 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: route.c,v 1.121 2010/06/26 14:29:36 kefren Exp $);
+__RCSID($NetBSD: route.c,v 1.122 2010/11/04 23:36:10 pooka Exp $);
#endif
#endif /* not lint */
@@ -71,6 +71,12 @@
#include paths.h
#include err.h
+#ifdef RUMP_ACTION
+#include rump/rump.h
+#include rump/rump_syscalls.h
+#include rump/rumpclient.h
+#endif
+
#include keywords.h
#include extern.h
@@ -154,7 +160,12 @@
int
main(int argc, char * const *argv)
{
- int ch;
+ int ch, error;
+
+#ifdef RUMP_ACTION
+ if ((error = rumpclient_init()) != 0)
+ errx(1, rump client init: %s, strerror(error));
+#endif
if (argc 2)
usage(NULL);
CVS commit: src/sbin/route
Module Name:src
Committed By: pooka
Date: Thu Nov 4 23:37:27 UTC 2010
Modified Files:
src/sbin/route: route.c
Log Message:
be consistent in what to leave outside of SMALL
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/sbin/route/route.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/route/route.c
diff -u src/sbin/route/route.c:1.122 src/sbin/route/route.c:1.123
--- src/sbin/route/route.c:1.122 Thu Nov 4 23:36:10 2010
+++ src/sbin/route/route.c Thu Nov 4 23:37:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.122 2010/11/04 23:36:10 pooka Exp $ */
+/* $NetBSD: route.c,v 1.123 2010/11/04 23:37:27 pooka Exp $ */
/*
* Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)route.c 8.6 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: route.c,v 1.122 2010/11/04 23:36:10 pooka Exp $);
+__RCSID($NetBSD: route.c,v 1.123 2010/11/04 23:37:27 pooka Exp $);
#endif
#endif /* not lint */
@@ -1173,10 +1173,12 @@
su = soup-so_ifa;
su-sa.sa_family = af;
break;
+#ifndef SMALL
case RTA_TAG:
su = soup-so_mpls;
afamily = AF_MPLS;
break;
+#endif
default:
su = NULL;
usage(Internal Error);
@@ -1516,7 +1518,9 @@
NEXTADDR(RTA_GENMASK, soup-so_genmask);
NEXTADDR(RTA_IFP, soup-so_ifp);
NEXTADDR(RTA_IFA, soup-so_ifa);
+#ifndef SMALL
NEXTADDR(RTA_TAG, soup-so_mpls);
+#endif
rtm.rtm_msglen = l = cp - (char *)m_rtmsg;
if (verbose ! shortoutput) {
if (rtm_addrs)
CVS commit: src/sbin/route
Module Name:src
Committed By: pooka
Date: Thu Nov 4 23:38:18 UTC 2010
Modified Files:
src/sbin/route: route.c
Log Message:
#ifdef variable correctly
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/sbin/route/route.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/route/route.c
diff -u src/sbin/route/route.c:1.123 src/sbin/route/route.c:1.124
--- src/sbin/route/route.c:1.123 Thu Nov 4 23:37:27 2010
+++ src/sbin/route/route.c Thu Nov 4 23:38:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.123 2010/11/04 23:37:27 pooka Exp $ */
+/* $NetBSD: route.c,v 1.124 2010/11/04 23:38:18 pooka Exp $ */
/*
* Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)route.c 8.6 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: route.c,v 1.123 2010/11/04 23:37:27 pooka Exp $);
+__RCSID($NetBSD: route.c,v 1.124 2010/11/04 23:38:18 pooka Exp $);
#endif
#endif /* not lint */
@@ -160,9 +160,10 @@
int
main(int argc, char * const *argv)
{
- int ch, error;
+ int ch;
#ifdef RUMP_ACTION
+ int error;
if ((error = rumpclient_init()) != 0)
errx(1, rump client init: %s, strerror(error));
#endif
CVS commit: src/sys/netinet
Module Name:src
Committed By: rmind
Date: Fri Nov 5 00:21:51 UTC 2010
Modified Files:
src/sys/netinet: ip_input.c ip_reass.c ip_var.h
Log Message:
ip_reass_packet: finish abstraction; some clean-up.
Discussed some time ago with m...@.
To generate a diff of this commit:
cvs rdiff -u -r1.289 -r1.290 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.6 -r1.7 src/sys/netinet/ip_reass.c
cvs rdiff -u -r1.95 -r1.96 src/sys/netinet/ip_var.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/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.289 src/sys/netinet/ip_input.c:1.290
--- src/sys/netinet/ip_input.c:1.289 Mon Jul 19 14:09:45 2010
+++ src/sys/netinet/ip_input.c Fri Nov 5 00:21:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.289 2010/07/19 14:09:45 rmind Exp $ */
+/* $NetBSD: ip_input.c,v 1.290 2010/11/05 00:21:51 rmind Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_input.c,v 1.289 2010/07/19 14:09:45 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_input.c,v 1.290 2010/11/05 00:21:51 rmind Exp $);
#include opt_inet.h
#include opt_compat_netbsd.h
@@ -806,58 +806,21 @@
* If offset or IP_MF are set, must reassemble.
*/
if (ip-ip_off ~htons(IP_DF|IP_RF)) {
- struct mbuf *m_final;
- u_int off, flen;
- bool mff;
-
- /*
- * Prevent TCP blind data attacks by not allowing non-initial
- * fragments to start at less than 68 bytes (minimal fragment
- * size) and making sure the first fragment is at least 68
- * bytes.
- */
- off = (ntohs(ip-ip_off) IP_OFFMASK) 3;
- if ((off 0 ? off + hlen : len) IP_MINFRAGSIZE - 1) {
- IP_STATINC(IP_STAT_BADFRAGS);
- goto bad;
- }
-
- /* Fragment length and MF flag. */
- flen = ntohs(ip-ip_len) - hlen;
- mff = (ip-ip_off htons(IP_MF)) != 0;
- if (mff) {
- /*
- * Make sure that fragments have a data length
- * which is non-zero and multiple of 8 bytes.
- */
- if (flen == 0 || (flen 0x7) != 0) {
-IP_STATINC(IP_STAT_BADFRAGS);
-goto bad;
- }
- }
-
- /*
- * Adjust total IP length to not reflect header and convert
- * offset of this to bytes. XXX: clobbers struct ip.
- */
- ip-ip_len = htons(flen);
- ip-ip_off = htons(off);
-
/*
* Pass to IP reassembly mechanism.
*/
- if (ip_reass_packet(m, ip, mff, m_final) != 0) {
+ if (ip_reass_packet(m, ip) != 0) {
/* Failed; invalid fragment(s) or packet. */
goto bad;
}
- if (m_final == NULL) {
+ if (m == NULL) {
/* More fragments should come; silently return. */
return;
}
- /* Reassembly is done, we have the final packet. */
- m = m_final;
-
- /* Updated local variable(s). */
+ /*
+ * Reassembly is done, we have the final packet.
+ * Updated cached data in local variable(s).
+ */
ip = mtod(m, struct ip *);
hlen = ip-ip_hl 2;
}
Index: src/sys/netinet/ip_reass.c
diff -u src/sys/netinet/ip_reass.c:1.6 src/sys/netinet/ip_reass.c:1.7
--- src/sys/netinet/ip_reass.c:1.6 Thu Oct 7 03:15:49 2010
+++ src/sys/netinet/ip_reass.c Fri Nov 5 00:21:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_reass.c,v 1.6 2010/10/07 03:15:49 yamt Exp $ */
+/* $NetBSD: ip_reass.c,v 1.7 2010/11/05 00:21:51 rmind Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1993
@@ -46,7 +46,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_reass.c,v 1.6 2010/10/07 03:15:49 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_reass.c,v 1.7 2010/11/05 00:21:51 rmind Exp $);
#include sys/param.h
#include sys/types.h
@@ -86,9 +86,11 @@
bool ipqe_mff;
} ipfr_qent_t;
+TAILQ_HEAD(ipfr_qent_head, ipfr_qent);
+
typedef struct ipfr_queue {
LIST_ENTRY(ipfr_queue) ipq_q; /* to other reass headers */
- TAILQ_HEAD(, ipfr_qent) ipq_fragq; /* queue of fragment entries */
+ struct ipfr_qent_head ipq_fragq; /* queue of fragment entries */
uint8_t ipq_ttl; /* time for reass q to live */
uint8_t ipq_p; /* protocol of this fragment */
uint16_t ipq_id; /* sequence id for reassembly */
@@ -221,10 +223,10 @@
struct mbuf *
ip_reass(ipfr_qent_t *ipqe, ipfr_queue_t *fp, const u_int hash)
{
- const int hlen = ipqe-ipqe_ip-ip_hl 2;
+ struct ip *ip = ipqe-ipqe_ip, *qip;
+ const int hlen = ip-ip_hl 2;
struct mbuf *m = ipqe-ipqe_m, *t;
ipfr_qent_t *nq, *p, *q;
- struct ip *ip;
int i, next;
KASSERT(mutex_owned(ipfr_lock));
@@ -270,15 +272,15 @@
if (fp == NULL) {
goto dropfrag;
}
- LIST_INSERT_HEAD(ip_frags[hash], fp, ipq_q);
+ TAILQ_INIT(fp-ipq_fragq);
fp-ipq_nfrags = 1;
fp-ipq_ttl = IPFRAGTTL;
- fp-ipq_p = ipqe-ipqe_ip-ip_p;
- fp-ipq_id = ipqe-ipqe_ip-ip_id;
- fp-ipq_tos = ipqe-ipqe_ip-ip_tos;
- TAILQ_INIT(fp-ipq_fragq);
- fp-ipq_src = ipqe-ipqe_ip-ip_src;
- fp-ipq_dst = ipqe-ipqe_ip-ip_dst;
+ fp-ipq_p = ip-ip_p;
+ fp-ipq_id = ip-ip_id;
+ fp-ipq_tos = ip-ip_tos;
+ fp-ipq_src = ip-ip_src;
+
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: rmind Date: Fri Nov 5 01:34:52 UTC 2010 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add pfsync to ALL kernel. To generate a diff of this commit: cvs rdiff -u -r1.272 -r1.273 src/sys/arch/i386/conf/ALL 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/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.272 src/sys/arch/i386/conf/ALL:1.273 --- src/sys/arch/i386/conf/ALL:1.272 Wed Nov 3 23:24:14 2010 +++ src/sys/arch/i386/conf/ALL Fri Nov 5 01:34:51 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.272 2010/11/03 23:24:14 dyoung Exp $ +# $NetBSD: ALL,v 1.273 2010/11/05 01:34:51 rmind Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.272 $ +#ident ALL-$Revision: 1.273 $ maxusers 64 # estimated number of users @@ -1640,6 +1640,7 @@ pseudo-device agr # IEEE 802.3ad link aggregation pseudo-device pf # PF packet filter pseudo-device pflog # PF log if +pseudo-device pfsync pseudo-device kttcp pseudo-device etherip # EtherIP # srt is EXPERIMENTAL
CVS commit: src/sys
Module Name:src
Committed By: rmind
Date: Fri Nov 5 01:35:58 UTC 2010
Modified Files:
src/sys/dist/pf/net: if_pfsync.c pf_norm.c
src/sys/netinet: in_var.h ip_id.c ip_input.c
Log Message:
ip_randomid: make mechanism MP-safe and more modular.
OK matt@
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dist/pf/net/if_pfsync.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dist/pf/net/pf_norm.c
cvs rdiff -u -r1.64 -r1.65 src/sys/netinet/in_var.h
cvs rdiff -u -r1.13 -r1.14 src/sys/netinet/ip_id.c
cvs rdiff -u -r1.290 -r1.291 src/sys/netinet/ip_input.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/dist/pf/net/if_pfsync.c
diff -u src/sys/dist/pf/net/if_pfsync.c:1.6 src/sys/dist/pf/net/if_pfsync.c:1.7
--- src/sys/dist/pf/net/if_pfsync.c:1.6 Mon Apr 5 07:22:22 2010
+++ src/sys/dist/pf/net/if_pfsync.c Fri Nov 5 01:35:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pfsync.c,v 1.6 2010/04/05 07:22:22 joerg Exp $ */
+/* $NetBSD: if_pfsync.c,v 1.7 2010/11/05 01:35:58 rmind Exp $ */
/* $OpenBSD: if_pfsync.c,v 1.83 2007/06/26 14:44:12 mcbride Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_pfsync.c,v 1.6 2010/04/05 07:22:22 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_pfsync.c,v 1.7 2010/11/05 01:35:58 rmind Exp $);
#ifdef _KERNEL_OPT
#include opt_inet.h
@@ -1599,7 +1599,7 @@
ip-ip_hl = sizeof(*ip) 2;
ip-ip_tos = IPTOS_LOWDELAY;
ip-ip_len = htons(m-m_pkthdr.len);
- ip-ip_id = htons(ip_randomid(0));
+ ip-ip_id = htons(ip_randomid(ip_ids, 0));
ip-ip_off = htons(IP_DF);
ip-ip_ttl = PFSYNC_DFLTTL;
ip-ip_p = IPPROTO_PFSYNC;
Index: src/sys/dist/pf/net/pf_norm.c
diff -u src/sys/dist/pf/net/pf_norm.c:1.22 src/sys/dist/pf/net/pf_norm.c:1.23
--- src/sys/dist/pf/net/pf_norm.c:1.22 Mon Apr 12 13:57:38 2010
+++ src/sys/dist/pf/net/pf_norm.c Fri Nov 5 01:35:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_norm.c,v 1.22 2010/04/12 13:57:38 ahoka Exp $ */
+/* $NetBSD: pf_norm.c,v 1.23 2010/11/05 01:35:58 rmind Exp $ */
/* $OpenBSD: pf_norm.c,v 1.109 2007/05/28 17:16:39 henning Exp $ */
/*
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pf_norm.c,v 1.22 2010/04/12 13:57:38 ahoka Exp $);
+__KERNEL_RCSID(0, $NetBSD: pf_norm.c,v 1.23 2010/11/05 01:35:58 rmind Exp $);
#ifdef _KERNEL_OPT
#include opt_inet.h
@@ -1046,7 +1046,7 @@
if (r-rule_flag PFRULE_RANDOMID) {
u_int16_t ip_id = h-ip_id;
- h-ip_id = ip_randomid(0);
+ h-ip_id = ip_randomid(ip_ids, 0);
h-ip_sum = pf_cksum_fixup(h-ip_sum, ip_id, h-ip_id, 0);
}
if ((r-rule_flag (PFRULE_FRAGCROP|PFRULE_FRAGDROP)) == 0)
Index: src/sys/netinet/in_var.h
diff -u src/sys/netinet/in_var.h:1.64 src/sys/netinet/in_var.h:1.65
--- src/sys/netinet/in_var.h:1.64 Mon Jul 19 14:09:44 2010
+++ src/sys/netinet/in_var.h Fri Nov 5 01:35:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: in_var.h,v 1.64 2010/07/19 14:09:44 rmind Exp $ */
+/* $NetBSD: in_var.h,v 1.65 2010/11/05 01:35:57 rmind Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -302,44 +302,47 @@
void in_purgeif(struct ifnet *);
void ip_input(struct mbuf *);
int ipflow_fastforward(struct mbuf *);
-void ip_initid(void);
-extern uint16_t ip_id;
-static __inline uint16_t ip_newid(const struct in_ifaddr *);
-uint16_t ip_randomid(uint16_t);
-extern int ip_do_randomid;
+struct ipid_state;
+typedef struct ipid_state ipid_state_t;
+
+ipid_state_t * ip_id_init(void);
+void ip_id_fini(ipid_state_t *);
+uint16_t ip_randomid(ipid_state_t *, uint16_t);
+
+extern ipid_state_t * ip_ids;
+extern uint16_t ip_id;
+extern int ip_do_randomid;
/*
- * ip_newid_range: allocate num contiguous ip_ids.
+ * ip_newid_range: allocate num contiguous IP IDs.
*
- * = return the first id.
+ * = Return the first ID.
*/
-
static __inline uint16_t
-ip_newid_range(const struct in_ifaddr *ia, unsigned int num)
+ip_newid_range(const struct in_ifaddr *ia, u_int num)
{
uint16_t id;
if (ip_do_randomid) {
/* XXX ignore num */
- return ip_randomid(ia ? ia-ia_idsalt : 0);
+ return ip_randomid(ip_ids, ia ? ia-ia_idsalt : 0);
}
- /*
- * never allow an ip_id of 0. (detect wrap)
- */
- if ((uint16_t)(ip_id + num) ip_id)
+ /* Never allow an IP ID of 0 (detect wrap). */
+ if ((uint16_t)(ip_id + num) ip_id) {
ip_id = 1;
+ }
id = htons(ip_id);
ip_id += num;
-
return id;
}
static __inline uint16_t
ip_newid(const struct in_ifaddr *ia)
{
+
return ip_newid_range(ia, 1);
}
@@ -347,7 +350,7 @@
int sysctl_inpcblist(SYSCTLFN_PROTO);
#endif
-#endif
+#endif /* !_KERNEL */
/* INET6 stuff */
#include netinet6/in6_var.h
Index: src/sys/netinet/ip_id.c
diff -u src/sys/netinet/ip_id.c:1.13 src/sys/netinet/ip_id.c:1.14
--- src/sys/netinet/ip_id.c:1.13 Thu Nov 4 22:00:51 2010
+++ src/sys/netinet/ip_id.c Fri Nov 5 01:35:57 2010
@@ -1,5 +1,4 @@
-/* $NetBSD: ip_id.c,v 1.13 2010/11/04 22:00:51 matt
CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src Committed By: agc Date: Fri Nov 5 02:36:01 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist: configure.ac Log Message: generate the Makefile in src/libmj too To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/netpgp/dist/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/configure.ac diff -u src/crypto/external/bsd/netpgp/dist/configure.ac:1.36 src/crypto/external/bsd/netpgp/dist/configure.ac:1.37 --- src/crypto/external/bsd/netpgp/dist/configure.ac:1.36 Thu Nov 4 07:01:52 2010 +++ src/crypto/external/bsd/netpgp/dist/configure.ac Fri Nov 5 02:36:01 2010 @@ -1,10 +1,10 @@ -# $NetBSD: configure.ac,v 1.36 2010/11/04 07:01:52 agc Exp $ +# $NetBSD: configure.ac,v 1.37 2010/11/05 02:36:01 agc Exp $ # # Process this file with autoconf to produce a configure script. AC_INIT([netpgp],[20101103],[Alistair Crooks a...@netbsd.org c0596823]) AC_PREREQ(2.63) -AC_REVISION([$Revision: 1.36 $]) +AC_REVISION([$Revision: 1.37 $]) AS_SHELL_SANITIZE @@ -106,6 +106,7 @@ Makefile include/Makefile src/Makefile +src/libmj/Makefile src/lib/Makefile src/netpgp/Makefile src/netpgpkeys/Makefile
CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src Committed By: agc Date: Fri Nov 5 02:50:43 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist: configure Log Message: run autoconf so we can generate a Makefile in src/libmj To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/netpgp/dist/configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/configure diff -u src/crypto/external/bsd/netpgp/dist/configure:1.34 src/crypto/external/bsd/netpgp/dist/configure:1.35 --- src/crypto/external/bsd/netpgp/dist/configure:1.34 Thu Nov 4 07:01:52 2010 +++ src/crypto/external/bsd/netpgp/dist/configure Fri Nov 5 02:50:43 2010 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.1 . +# From configure.ac Revision: 1.37 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.63 for netpgp 20101103. # @@ -22197,7 +22197,7 @@ # Generate the Makefiles # -ac_config_files=$ac_config_files Makefile include/Makefile src/Makefile src/lib/Makefile src/netpgp/Makefile src/netpgpkeys/Makefile src/netpgpverify/Makefile tests/Makefile tests/atlocal +ac_config_files=$ac_config_files Makefile include/Makefile src/Makefile src/libmj/Makefile src/lib/Makefile src/netpgp/Makefile src/netpgpkeys/Makefile src/netpgpverify/Makefile tests/Makefile tests/atlocal cat confcache \_ACEOF # This file is a shell script that caches the results of configure @@ -22838,6 +22838,7 @@ Makefile) CONFIG_FILES=$CONFIG_FILES Makefile ;; include/Makefile) CONFIG_FILES=$CONFIG_FILES include/Makefile ;; src/Makefile) CONFIG_FILES=$CONFIG_FILES src/Makefile ;; +src/libmj/Makefile) CONFIG_FILES=$CONFIG_FILES src/libmj/Makefile ;; src/lib/Makefile) CONFIG_FILES=$CONFIG_FILES src/lib/Makefile ;; src/netpgp/Makefile) CONFIG_FILES=$CONFIG_FILES src/netpgp/Makefile ;; src/netpgpkeys/Makefile) CONFIG_FILES=$CONFIG_FILES src/netpgpkeys/Makefile ;;
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Fri Nov 5 03:01:57 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: Makefile.am Makefile.in config.h.in Log Message: Find the libmj header file in the correct directory To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am diff -u src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.6 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.7 --- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.6 Sat Aug 7 04:25:19 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am Fri Nov 5 03:01:57 2010 @@ -1,10 +1,10 @@ -## $NetBSD: Makefile.am,v 1.6 2010/08/07 04:25:19 agc Exp $ +## $NetBSD: Makefile.am,v 1.7 2010/11/05 03:01:57 agc Exp $ AM_CFLAGS = $(WARNCFLAGS) lib_LTLIBRARIES = libnetpgp.la -libnetpgp_la_CPPFLAGS = -I$(top_srcdir)/include +libnetpgp_la_CPPFLAGS = -I$(top_srcdir)/include -I../libmj libnetpgp_la_SOURCES = \ bufgap.c \ @@ -26,6 +26,8 @@ validate.c \ writer.c +LDADD = ../libmj/libmj.a + man3_MANS = libnetpgp.3 dist_man_MANS = libnetpgp.3 Index: src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in diff -u src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.10 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.11 --- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.10 Thu Nov 4 15:38:45 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in Fri Nov 5 03:01:57 2010 @@ -98,43 +98,40 @@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ +ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -FGREP = @FGREP@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -155,7 +152,8 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -186,7 +184,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -204,7 +201,7 @@ top_srcdir = @top_srcdir@ AM_CFLAGS = $(WARNCFLAGS) lib_LTLIBRARIES = libnetpgp.la -libnetpgp_la_CPPFLAGS = -I$(top_srcdir)/include +libnetpgp_la_CPPFLAGS = -I$(top_srcdir)/include -I../libmj libnetpgp_la_SOURCES = \ bufgap.c \ compress.c \ @@ -225,6 +222,7 @@ validate.c \ writer.c +LDADD = ../libmj/libmj.a man3_MANS = libnetpgp.3 dist_man_MANS = libnetpgp.3 all: config.h Index: src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in diff -u src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in:1.12 src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in:1.13 --- src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in:1.12 Thu Nov 4 15:38:45 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in Fri Nov 5 03:01:57 2010 @@ -117,10 +117,6 @@ /* Define to 1 if you have the zlib.h header file. */ #undef HAVE_ZLIB_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - /* Name of package */ #undef PACKAGE
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys
Module Name:src
Committed By: agc
Date: Fri Nov 5 03:30:52 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.c
Log Message:
avoid calling a debug function that's not exported in libnetpgp
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 \
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.22 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.23
--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.22 Thu Nov 4 13:45:30 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c Fri Nov 5 03:30:52 2010
@@ -178,9 +178,6 @@
return 0;
}
}
- if (__ops_get_debug_level(__FILE__)) {
- (void) fprintf(stderr, match_keys: json is '%s'\n, json);
- }
idc = netpgp_format_json(fp, json, psigs);
/* clean up */
free(json);
CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src Committed By: agc Date: Fri Nov 5 03:37:19 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist: Makefile.in aclocal.m4 configure configure.ac src/crypto/external/bsd/netpgp/dist/src: Makefile.in src/crypto/external/bsd/netpgp/dist/src/lib: Makefile.in config.h.in symmetric.c src/crypto/external/bsd/netpgp/dist/src/libmj: Makefile.am Makefile.in src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: Makefile.am Makefile.in src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.in src/crypto/external/bsd/netpgp/dist/tests: Makefile.in Log Message: Miscellaneous changes to bring the GNU autoconf framework into a state where a package can be build and install properly. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/Makefile.in cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/aclocal.m4 cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/netpgp/dist/configure cvs rdiff -u -r1.37 -r1.38 src/crypto/external/bsd/netpgp/dist/configure.ac cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/netpgp/dist/src/Makefile.in cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in cvs rdiff -u -r1.13 -r1.14 \ src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in cvs rdiff -u -r1.16 -r1.17 \ src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.in cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.in cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/netpgp/dist/tests/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
