CVS commit: src/lib/libquota
Module Name:src
Committed By: bouyer
Date: Sat Jan 30 16:31:28 UTC 2016
Modified Files:
src/lib/libquota: quota_nfs.c
Log Message:
Some NFS servers return RPC_PROGNOTREGISTERED instead of RPC_PROGVERSMISMATCH
when they don't support EXT_RQUOTAVERS but support RQUOTAVERS, so
retry with RQUOTAVERS for both RPC_PROGNOTREGISTERED and RPC_PROGVERSMISMATCH
return code.
Fix issue against a NetApp server reported by 6bone on current-users
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libquota/quota_nfs.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/libquota/quota_nfs.c
diff -u src/lib/libquota/quota_nfs.c:1.4 src/lib/libquota/quota_nfs.c:1.5
--- src/lib/libquota/quota_nfs.c:1.4 Wed Jun 11 08:43:01 2014
+++ src/lib/libquota/quota_nfs.c Sat Jan 30 16:31:28 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: quota_nfs.c,v 1.4 2014/06/11 08:43:01 martin Exp $ */
+/* $NetBSD: quota_nfs.c,v 1.5 2016/01/30 16:31:28 bouyer Exp $ */
/*-
* Copyright (c) 2011 Manuel Bouyer
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include
-__RCSID("$NetBSD: quota_nfs.c,v 1.4 2014/06/11 08:43:01 martin Exp $");
+__RCSID("$NetBSD: quota_nfs.c,v 1.5 2016/01/30 16:31:28 bouyer Exp $");
#include
#include /* XXX for DEV_BSIZE */
@@ -179,7 +179,8 @@ __quota_nfs_get(struct quotahandle *qh,
ret = callaurpc(host, RQUOTAPROG, EXT_RQUOTAVERS,
RQUOTAPROC_GETQUOTA, (xdrproc_t)xdr_ext_getquota_args,
_gq_args, (xdrproc_t)xdr_getquota_rslt, _rslt);
- if (ret == RPC_PROGVERSMISMATCH && rpcqtype == RQUOTA_USRQUOTA) {
+ if ((ret == RPC_PROGVERSMISMATCH || ret == RPC_PROGNOTREGISTERED)
+ && rpcqtype == RQUOTA_USRQUOTA) {
/* try RQUOTAVERS */
gq_args.gqa_pathp = path;
gq_args.gqa_uid = qk->qk_id;
CVS commit: src/external/gpl2/xcvs
Module Name:src
Committed By: christos
Date: Sat Jan 30 16:47:00 UTC 2016
Modified Files:
src/external/gpl2/xcvs: Makefile.inc
Log Message:
Use .PARSEDIR to set the TOP. It makes things more portable since they
can work outside the tree.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/xcvs/Makefile.inc
diff -u src/external/gpl2/xcvs/Makefile.inc:1.3 src/external/gpl2/xcvs/Makefile.inc:1.4
--- src/external/gpl2/xcvs/Makefile.inc:1.3 Sun Sep 23 13:22:25 2012
+++ src/external/gpl2/xcvs/Makefile.inc Sat Jan 30 11:47:00 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2012/09/23 17:22:25 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.4 2016/01/30 16:47:00 christos Exp $
.include
@@ -11,7 +11,7 @@ CWARNFLAGS.clang+= -Wno-tautological-com
-Wno-tautological-constant-out-of-range-compare
BINDIR?= /usr/bin
-IDIST= ${NETBSDSRCDIR}/external/gpl2/xcvs/dist
+IDIST:= ${.PARSEDIR}/dist
.if !defined(SUBDIR)
CPPFLAGS+= -DSETXID_SUPPORT -DHAVE_CONFIG_H \
CVS import: src/crypto/external/bsd/openssl/dist
Module Name:src Committed By: christos Date: Sat Jan 30 16:56:19 UTC 2016 Update of /cvsroot/src/crypto/external/bsd/openssl/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16684 Log Message: OpenSSL CHANGES ___ Changes between 1.0.1q and 1.0.1r [28 Jan 2016] *) Protection for DH small subgroup attacks As a precautionary measure the SSL_OP_SINGLE_DH_USE option has been switched on by default and cannot be disabled. This could have some performance impact. [Matt Caswell] *) SSLv2 doesn't block disabled ciphers A malicious client can negotiate SSLv2 ciphers that have been disabled on the server and complete SSLv2 handshakes even if all SSLv2 ciphers have been disabled, provided that the SSLv2 protocol was not also disabled via SSL_OP_NO_SSLv2. This issue was reported to OpenSSL on 26th December 2015 by Nimrod Aviram and Sebastian Schinzel. (CVE-2015-3197) [Viktor Dukhovni] *) Reject DH handshakes with parameters shorter than 1024 bits. [Kurt Roeckx] Status: Vendor Tag: OPENSSL Release Tags: openssl-1-0-1r U src/crypto/external/bsd/openssl/dist/ACKNOWLEDGMENTS U src/crypto/external/bsd/openssl/dist/appveyor.yml U src/crypto/external/bsd/openssl/dist/CHANGES.SSLeay C src/crypto/external/bsd/openssl/dist/CHANGES C src/crypto/external/bsd/openssl/dist/Configure U src/crypto/external/bsd/openssl/dist/config U src/crypto/external/bsd/openssl/dist/FAQ U src/crypto/external/bsd/openssl/dist/CONTRIBUTING U src/crypto/external/bsd/openssl/dist/e_os2.h U src/crypto/external/bsd/openssl/dist/e_os.h U src/crypto/external/bsd/openssl/dist/install.com U src/crypto/external/bsd/openssl/dist/INSTALL U src/crypto/external/bsd/openssl/dist/INSTALL.VMS U src/crypto/external/bsd/openssl/dist/INSTALL.DJGPP U src/crypto/external/bsd/openssl/dist/INSTALL.MacOS U src/crypto/external/bsd/openssl/dist/INSTALL.NW U src/crypto/external/bsd/openssl/dist/INSTALL.OS2 U src/crypto/external/bsd/openssl/dist/INSTALL.W32 U src/crypto/external/bsd/openssl/dist/INSTALL.W64 U src/crypto/external/bsd/openssl/dist/INSTALL.WCE U src/crypto/external/bsd/openssl/dist/LICENSE C src/crypto/external/bsd/openssl/dist/Makefile U src/crypto/external/bsd/openssl/dist/Makefile.shared U src/crypto/external/bsd/openssl/dist/Makefile.org U src/crypto/external/bsd/openssl/dist/makevms.com U src/crypto/external/bsd/openssl/dist/PROBLEMS C src/crypto/external/bsd/openssl/dist/NEWS U src/crypto/external/bsd/openssl/dist/README.ENGINE U src/crypto/external/bsd/openssl/dist/openssl.doxy C src/crypto/external/bsd/openssl/dist/openssl.spec C src/crypto/external/bsd/openssl/dist/README U src/crypto/external/bsd/openssl/dist/README.ASN1 U src/crypto/external/bsd/openssl/dist/apps/app_rand.c U src/crypto/external/bsd/openssl/dist/apps/apps.c U src/crypto/external/bsd/openssl/dist/apps/apps.h U src/crypto/external/bsd/openssl/dist/apps/asn1pars.c U src/crypto/external/bsd/openssl/dist/apps/ca.c U src/crypto/external/bsd/openssl/dist/apps/ca-cert.srl U src/crypto/external/bsd/openssl/dist/apps/CA.com U src/crypto/external/bsd/openssl/dist/apps/ca-key.pem U src/crypto/external/bsd/openssl/dist/apps/CA.pl U src/crypto/external/bsd/openssl/dist/apps/CA.pl.in U src/crypto/external/bsd/openssl/dist/apps/ca-req.pem U src/crypto/external/bsd/openssl/dist/apps/CA.sh U src/crypto/external/bsd/openssl/dist/apps/cert.pem U src/crypto/external/bsd/openssl/dist/apps/ciphers.c U src/crypto/external/bsd/openssl/dist/apps/client.pem U src/crypto/external/bsd/openssl/dist/apps/cms.c U src/crypto/external/bsd/openssl/dist/apps/crl2p7.c U src/crypto/external/bsd/openssl/dist/apps/crl.c U src/crypto/external/bsd/openssl/dist/apps/dh1024.pem U src/crypto/external/bsd/openssl/dist/apps/dgst.c U src/crypto/external/bsd/openssl/dist/apps/install-apps.com U src/crypto/external/bsd/openssl/dist/apps/dh2048.pem U src/crypto/external/bsd/openssl/dist/apps/dh4096.pem U src/crypto/external/bsd/openssl/dist/apps/dh512.pem U src/crypto/external/bsd/openssl/dist/apps/dh.c U src/crypto/external/bsd/openssl/dist/apps/dhparam.c U src/crypto/external/bsd/openssl/dist/apps/dsa1024.pem U src/crypto/external/bsd/openssl/dist/apps/dsa512.pem U src/crypto/external/bsd/openssl/dist/apps/dsa.c U src/crypto/external/bsd/openssl/dist/apps/dsa-ca.pem U src/crypto/external/bsd/openssl/dist/apps/dsaparam.c U src/crypto/external/bsd/openssl/dist/apps/dsa-pca.pem U src/crypto/external/bsd/openssl/dist/apps/dsap.pem U src/crypto/external/bsd/openssl/dist/apps/ec.c U src/crypto/external/bsd/openssl/dist/apps/ecparam.c U src/crypto/external/bsd/openssl/dist/apps/enc.c U src/crypto/external/bsd/openssl/dist/apps/engine.c U src/crypto/external/bsd/openssl/dist/apps/errstr.c U src/crypto/external/bsd/openssl/dist/apps/gendh.c U src/crypto/external/bsd/openssl/dist/apps/gendsa.c U src/crypto/external/bsd/openssl/dist/apps/genpkey.c U src/crypto/external/bsd/openssl/dist/apps/genrsa.c U
CVS commit: src/external/gpl2/xcvs/dist/src
Module Name:src
Committed By: christos
Date: Sat Jan 30 16:21:47 UTC 2016
Modified Files:
src/external/gpl2/xcvs/dist/src: import.c
Log Message:
Remove trailing whitespace from imported messages when adding now files.
This is done in RCS_checkin() but we have a "fast path" for new files here
that does not do it. Hooray for specialized code.
XXX: pullup 6, 7
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/src/import.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/gpl2/xcvs/dist/src/import.c
diff -u src/external/gpl2/xcvs/dist/src/import.c:1.3 src/external/gpl2/xcvs/dist/src/import.c:1.4
--- src/external/gpl2/xcvs/dist/src/import.c:1.3 Thu Mar 8 15:47:45 2012
+++ src/external/gpl2/xcvs/dist/src/import.c Sat Jan 30 11:21:47 2016
@@ -579,7 +579,7 @@ static int
process_import_file (char *message, char *vfile, char *vtag, int targc,
char **targv)
{
-char *rcs;
+char *rcs, *cleanmessage;
int inattic = 0;
rcs = Xasprintf ("%s/%s%s", repository, vfile, RCSEXT);
@@ -654,13 +654,14 @@ process_import_file (char *message, char
Entries_Close (entries);
}
#endif
-
- retval = add_rcs_file (message, rcs, vfile, vhead, our_opt,
+ cleanmessage = make_message_rcsvalid (message);
+ retval = add_rcs_file (cleanmessage, rcs, vfile, vhead, our_opt,
vbranch, vtag, targc, targv,
NULL, 0, logfp, killnew);
if (free_opt != NULL)
free (free_opt);
free (rcs);
+ free (cleanmessage);
return retval;
}
free (attic_name);
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Jan 30 17:01:47 UTC 2016 Modified Files: src/doc: CHANGES Log Message: new openssl To generate a diff of this commit: cvs rdiff -u -r1.2134 -r1.2135 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2134 src/doc/CHANGES:1.2135 --- src/doc/CHANGES:1.2134 Wed Jan 20 14:43:23 2016 +++ src/doc/CHANGES Sat Jan 30 12:01:47 2016 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2134 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2135 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -247,3 +247,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: gettext: Upgrade to 0.16.1 [christos 20160112] bind: Import version 9.10.3-P3. [christos 20160119] dhcpcd: Import dhcpcd 6.10.1. [roy 20160120] + openssl: Import openssl 1.0.1r [christos 20160130]
CVS commit: src/crypto/external/bsd/openssl/dist
Module Name:src Committed By: christos Date: Sat Jan 30 17:00:21 UTC 2016 Modified Files: src/crypto/external/bsd/openssl/dist: CHANGES Configure Makefile NEWS README openssl.spec src/crypto/external/bsd/openssl/dist/apps: ocsp.c speed.c src/crypto/external/bsd/openssl/dist/crypto: mem_clr.c opensslv.h src/crypto/external/bsd/openssl/dist/crypto/aes: aes.h aes_locl.h src/crypto/external/bsd/openssl/dist/crypto/bn: bn_exp.c exptest.c src/crypto/external/bsd/openssl/dist/crypto/dso: dso_dlfcn.c src/crypto/external/bsd/openssl/dist/crypto/ec: ectest.c src/crypto/external/bsd/openssl/dist/crypto/engine: eng_all.c src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_sign.c src/crypto/external/bsd/openssl/dist/crypto/sha: sha1test.c src/crypto/external/bsd/openssl/dist/crypto/ui: ui_openssl.c src/crypto/external/bsd/openssl/dist/crypto/x509: x509_vfy.c src/crypto/external/bsd/openssl/dist/doc/ssl: SSL_CTX_set_tmp_dh_callback.pod src/crypto/external/bsd/openssl/dist/ssl: d1_both.c s2_srvr.c s3_clnt.c s3_lib.c s3_srvr.c ssl.h t1_enc.c t1_lib.c Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssl/dist/CHANGES \ src/crypto/external/bsd/openssl/dist/NEWS \ src/crypto/external/bsd/openssl/dist/README \ src/crypto/external/bsd/openssl/dist/openssl.spec cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssl/dist/Configure cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssl/dist/Makefile cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssl/dist/apps/ocsp.c cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssl/dist/apps/speed.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/mem_clr.c cvs rdiff -u -r1.17 -r1.18 \ src/crypto/external/bsd/openssl/dist/crypto/opensslv.h cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/aes/aes.h cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/dist/crypto/aes/aes_locl.h cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/dist/crypto/bn/exptest.c cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/dist/crypto/ec/ectest.c cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/dist/crypto/engine/eng_all.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_sign.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/sha/sha1test.c cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/ui/ui_openssl.c cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/ssl/d1_both.c cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/ssl/s2_srvr.c cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssl/dist/ssl/s3_clnt.c cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c \ src/crypto/external/bsd/openssl/dist/ssl/t1_enc.c cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssl/dist/ssl/s3_srvr.c cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssl/dist/ssl/ssl.h cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/dist/CHANGES diff -u src/crypto/external/bsd/openssl/dist/CHANGES:1.8 src/crypto/external/bsd/openssl/dist/CHANGES:1.9 --- src/crypto/external/bsd/openssl/dist/CHANGES:1.8 Sun Dec 6 16:52:35 2015 +++ src/crypto/external/bsd/openssl/dist/CHANGES Sat Jan 30 12:00:19 2016 @@ -2,6 +2,30 @@ OpenSSL CHANGES ___ + Changes between 1.0.1q and 1.0.1r [28 Jan 2016] + + *) Protection for DH small subgroup attacks + + As a precautionary measure the SSL_OP_SINGLE_DH_USE option has been + switched on by default and cannot be disabled. This could have some + performance impact. + [Matt Caswell] + + *) SSLv2 doesn't block disabled ciphers + + A malicious client can negotiate SSLv2 ciphers that have been disabled on + the server and complete SSLv2 handshakes even if all SSLv2 ciphers have + been disabled, provided that the SSLv2 protocol was not also disabled via + SSL_OP_NO_SSLv2. + + This issue was reported to OpenSSL on 26th December 2015 by Nimrod Aviram + and Sebastian Schinzel. + (CVE-2015-3197) + [Viktor Dukhovni] + + *) Reject DH handshakes with parameters shorter than 1024 bits. +
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Jan 30 17:00:53 UTC 2016 Modified Files: src/doc: 3RDPARTY Log Message: new openssl To generate a diff of this commit: cvs rdiff -u -r1.1303 -r1.1304 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1303 src/doc/3RDPARTY:1.1304 --- src/doc/3RDPARTY:1.1303 Thu Jan 28 04:12:17 2016 +++ src/doc/3RDPARTY Sat Jan 30 12:00:53 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1303 2016/01/28 09:12:17 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1304 2016/01/30 17:00:53 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1038,8 +1038,8 @@ markus is very cooperative about it): - make compile with gcc-4.5; const fixes, fileno() checks, shadow fixes. Package: OpenSSL -Version: 1.0.1q -Current Vers: 1.0.2e +Version: 1.0.1r +Current Vers: 1.0.2f Maintainer: The OpenSSL Project Archive Site: ftp://ftp.openssl.org/source/ Home Page: http://www.openssl.org/
CVS commit: src
Module Name:src
Committed By: mlelstv
Date: Sat Jan 30 09:59:27 UTC 2016
Modified Files:
src/sbin/mount_msdos: mount_msdos.8 mount_msdos.c
src/sys/fs/msdosfs: direntry.h msdosfs_conv.c msdosfs_lookup.c
msdosfs_vnops.c msdosfsmount.h
src/usr.sbin/makefs: msdos.c
src/usr.sbin/makefs/msdos: msdosfs_vfsops.c msdosfs_vnops.c
Log Message:
Add support to msdosfs and makefs to generate correct Unicode (UCS-2) directory
entries from UTF8 encoded file names.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sbin/mount_msdos/mount_msdos.8
cvs rdiff -u -r1.47 -r1.48 src/sbin/mount_msdos/mount_msdos.c
cvs rdiff -u -r1.9 -r1.10 src/sys/fs/msdosfs/direntry.h
cvs rdiff -u -r1.10 -r1.11 src/sys/fs/msdosfs/msdosfs_conv.c
cvs rdiff -u -r1.34 -r1.35 src/sys/fs/msdosfs/msdosfs_lookup.c
cvs rdiff -u -r1.93 -r1.94 src/sys/fs/msdosfs/msdosfs_vnops.c
cvs rdiff -u -r1.20 -r1.21 src/sys/fs/msdosfs/msdosfsmount.h
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/makefs/msdos.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/makefs/msdos/msdosfs_vfsops.c
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/makefs/msdos/msdosfs_vnops.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/mount_msdos/mount_msdos.8
diff -u src/sbin/mount_msdos/mount_msdos.8:1.36 src/sbin/mount_msdos/mount_msdos.8:1.37
--- src/sbin/mount_msdos/mount_msdos.8:1.36 Fri Nov 16 15:00:18 2012
+++ src/sbin/mount_msdos/mount_msdos.8 Sat Jan 30 09:59:27 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: mount_msdos.8,v 1.36 2012/11/16 15:00:18 tsutsui Exp $
+.\" $NetBSD: mount_msdos.8,v 1.37 2016/01/30 09:59:27 mlelstv Exp $
.\"
.\" Copyright (c) 1993, 1994 Christopher G. Demetriou
.\" All rights reserved.
@@ -40,7 +40,7 @@
.Nd mount an MS-DOS file system
.Sh SYNOPSIS
.Nm
-.Op Fl 9Gls
+.Op Fl 9GlsU
.Op Fl g Ar gid
.Op Fl M Ar mask
.Op Fl m Ar mask
@@ -111,6 +111,19 @@ is the default.
Otherwise
.Fl l
is assumed.
+.It Fl U
+The MS-DOS file system stores filenames in a short
+version using 8-bit characters according to some
+character set and a long version with 16-bit unicode
+characters.
+The default method to store encoding-agnostic UNIX filenames
+is to copy them byte-wise into both fields. This is
+transparent but generates wrong unicode characters
+for anything that is not ASCII. Setting the
+.Fl U
+flag interprets UNIX filenames as UTF-8 and generates
+correctly encoded long filenames. This forces
+.Fl l .
.It Fl M Ar mask
Specify the maximum file permissions for directories
in the file system.
Index: src/sbin/mount_msdos/mount_msdos.c
diff -u src/sbin/mount_msdos/mount_msdos.c:1.47 src/sbin/mount_msdos/mount_msdos.c:1.48
--- src/sbin/mount_msdos/mount_msdos.c:1.47 Wed Oct 7 20:34:02 2009
+++ src/sbin/mount_msdos/mount_msdos.c Sat Jan 30 09:59:27 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_msdos.c,v 1.47 2009/10/07 20:34:02 pooka Exp $ */
+/* $NetBSD: mount_msdos.c,v 1.48 2016/01/30 09:59:27 mlelstv Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -36,7 +36,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: mount_msdos.c,v 1.47 2009/10/07 20:34:02 pooka Exp $");
+__RCSID("$NetBSD: mount_msdos.c,v 1.48 2016/01/30 09:59:27 mlelstv Exp $");
#endif /* not lint */
#include
@@ -94,7 +94,7 @@ mount_msdos_parseargs(int argc, char **a
*mntflags = set_gid = set_uid = set_mask = set_dirmask = set_gmtoff = 0;
(void)memset(args, '\0', sizeof(*args));
- while ((c = getopt(argc, argv, "Gsl9u:g:m:M:o:t:")) != -1) {
+ while ((c = getopt(argc, argv, "Gsl9Uu:g:m:M:o:t:")) != -1) {
switch (c) {
case 'G':
args->flags |= MSDOSFSMNT_GEMDOSFS;
@@ -108,6 +108,9 @@ mount_msdos_parseargs(int argc, char **a
case '9':
args->flags |= MSDOSFSMNT_NOWIN95;
break;
+ case 'U':
+ args->flags |= MSDOSFSMNT_UTF8;
+ break;
case 'u':
args->uid = a_uid(optarg);
set_uid = 1;
Index: src/sys/fs/msdosfs/direntry.h
diff -u src/sys/fs/msdosfs/direntry.h:1.9 src/sys/fs/msdosfs/direntry.h:1.10
--- src/sys/fs/msdosfs/direntry.h:1.9 Sat Jan 23 01:26:14 2016
+++ src/sys/fs/msdosfs/direntry.h Sat Jan 30 09:59:27 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: direntry.h,v 1.9 2016/01/23 01:26:14 dholland Exp $ */
+/* $NetBSD: direntry.h,v 1.10 2016/01/30 09:59:27 mlelstv Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -136,11 +136,12 @@ int dos2unixfn(unsigned char dn[11], uns
int unix2dosfn(const unsigned char *un, unsigned char dn[12], int unlen,
unsigned int gen);
int unix2winfn(const unsigned char *un, int unlen, struct winentry *wep,
- int cnt, int chksum);
+ int cnt, int chksum, int utf8);
int winChkName(const unsigned char *un, int unlen, struct winentry *wep,
- int chksum);
-int win2unixfn(struct winentry *wep, struct dirent *dp, int chksum);
+ int chksum, int utf8);
+int win2unixfn(struct winentry *wep, struct dirent *dp, int chksum,
+ int utf8);
uint8_t
CVS commit: src/sbin/mount_msdos
Module Name:src Committed By: wiz Date: Sat Jan 30 10:13:02 UTC 2016 Modified Files: src/sbin/mount_msdos: mount_msdos.8 Log Message: New sentence, new line. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sbin/mount_msdos/mount_msdos.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount_msdos/mount_msdos.8 diff -u src/sbin/mount_msdos/mount_msdos.8:1.37 src/sbin/mount_msdos/mount_msdos.8:1.38 --- src/sbin/mount_msdos/mount_msdos.8:1.37 Sat Jan 30 09:59:27 2016 +++ src/sbin/mount_msdos/mount_msdos.8 Sat Jan 30 10:13:02 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount_msdos.8,v 1.37 2016/01/30 09:59:27 mlelstv Exp $ +.\" $NetBSD: mount_msdos.8,v 1.38 2016/01/30 10:13:02 wiz Exp $ .\" .\" Copyright (c) 1993, 1994 Christopher G. Demetriou .\" All rights reserved. @@ -32,7 +32,7 @@ .\" .\" <> .\" -.Dd November 16, 2012 +.Dd January 30, 2016 .Dt MOUNT_MSDOS 8 .Os .Sh NAME @@ -117,12 +117,15 @@ version using 8-bit characters according character set and a long version with 16-bit unicode characters. The default method to store encoding-agnostic UNIX filenames -is to copy them byte-wise into both fields. This is +is to copy them byte-wise into both fields. +This is transparent but generates wrong unicode characters -for anything that is not ASCII. Setting the +for anything that is not ASCII. +Setting the .Fl U flag interprets UNIX filenames as UTF-8 and generates -correctly encoded long filenames. This forces +correctly encoded long filenames. +This forces .Fl l . .It Fl M Ar mask Specify the maximum file permissions for directories
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Sat Jan 30 15:05:27 UTC 2016
Modified Files:
src/lib/libedit: hist.h
Log Message:
Whitespace fix (Ingo Schwarze)
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libedit/hist.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/libedit/hist.h
diff -u src/lib/libedit/hist.h:1.14 src/lib/libedit/hist.h:1.15
--- src/lib/libedit/hist.h:1.14 Sat May 10 21:05:17 2014
+++ src/lib/libedit/hist.h Sat Jan 30 10:05:27 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hist.h,v 1.14 2014/05/11 01:05:17 christos Exp $ */
+/* $NetBSD: hist.h,v 1.15 2016/01/30 15:05:27 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -46,10 +46,10 @@ typedef int (*hist_fun_t)(void *, TYPE(H
typedef struct el_history_t {
Char *buf; /* The history buffer */
- size_t sz; /* Size of history buffer */
+ size_t sz; /* Size of history buffer */
Char *last; /* The last character */
int eventno; /* Event we are looking for */
- void * ref; /* Argument for history fcns */
+ void *ref; /* Argument for history fcns */
hist_fun_t fun; /* Event access */
TYPE(HistEvent) ev; /* Event cookie */
} el_history_t;
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Sat Jan 30 22:47:06 UTC 2016 Modified Files: src/sys/arch/sparc64/sparc64: ipifuncs.c Log Message: Fixed typo in sparc64_send_ipi_sun4u(): sun4v -> sun4u To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/sparc64/sparc64/ipifuncs.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/sparc64/sparc64/ipifuncs.c diff -u src/sys/arch/sparc64/sparc64/ipifuncs.c:1.55 src/sys/arch/sparc64/sparc64/ipifuncs.c:1.56 --- src/sys/arch/sparc64/sparc64/ipifuncs.c:1.55 Sun Jan 4 15:24:18 2015 +++ src/sys/arch/sparc64/sparc64/ipifuncs.c Sat Jan 30 22:47:06 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ipifuncs.c,v 1.55 2015/01/04 15:24:18 palle Exp $ */ +/* $NetBSD: ipifuncs.c,v 1.56 2016/01/30 22:47:06 palle Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.55 2015/01/04 15:24:18 palle Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.56 2016/01/30 22:47:06 palle Exp $"); #include "opt_ddb.h" @@ -237,7 +237,7 @@ sparc64_broadcast_ipi(ipifunc_t func, ui } /* - * Send an interprocessor interrupt - sun4v. + * Send an interprocessor interrupt - sun4u. */ void sparc64_send_ipi_sun4u(int upaid, ipifunc_t func, uint64_t arg1, uint64_t arg2)
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Sat Jan 30 23:45:37 UTC 2016 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Add ip6addrctl To generate a diff of this commit: cvs rdiff -u -r1.201 -r1.202 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.201 src/usr.sbin/postinstall/postinstall:1.202 --- src/usr.sbin/postinstall/postinstall:1.201 Mon Aug 24 03:21:14 2015 +++ src/usr.sbin/postinstall/postinstall Sat Jan 30 18:45:37 2016 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.201 2015/08/24 07:21:14 christos Exp $ +# $NetBSD: postinstall,v 1.202 2016/01/30 23:45:37 christos Exp $ # # Copyright (c) 2002-2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -1361,6 +1361,7 @@ httpd identd ifwatchd inetd +ip6addrctl ipfilter ipfs ipmon
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Sun Jan 31 05:31:28 UTC 2016 Modified Files: src/external/cddl/osnet/sys/sys: types.h Log Message: we don't keed page count in userland. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/external/cddl/osnet/sys/sys/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/sys/sys/types.h diff -u src/external/cddl/osnet/sys/sys/types.h:1.14 src/external/cddl/osnet/sys/sys/types.h:1.15 --- src/external/cddl/osnet/sys/sys/types.h:1.14 Sun Jan 31 00:21:53 2016 +++ src/external/cddl/osnet/sys/sys/types.h Sun Jan 31 00:31:28 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.14 2016/01/31 05:21:53 christos Exp $ */ +/* $NetBSD: types.h,v 1.15 2016/01/31 05:31:28 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -115,7 +115,7 @@ typedef int boolean_t; typedef longlong_t hrtime_t; typedef int32_t t_scalar_t; typedef uint32_t t_uscalar_t; -#ifdef _KERNTYPES +#ifdef _KERNEL typedef vsize_t pgcnt_t; #endif typedef u_longlong_t len_t;
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src Committed By: christos Date: Sun Jan 31 02:16:28 UTC 2016 Modified Files: src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot Log Message: Disable PIE and CTF for standalone code XXX: Must be done centrally, and there must be a better way. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot 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/stand/gzboot/Makefile.gzboot diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.31 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.32 --- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.31 Wed Jul 15 07:21:49 2015 +++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Sat Jan 30 21:16:28 2016 @@ -1,8 +1,10 @@ -# $NetBSD: Makefile.gzboot,v 1.31 2015/07/15 11:21:49 martin Exp $ +# $NetBSD: Makefile.gzboot,v 1.32 2016/01/31 02:16:28 christos Exp $ NOMAN= # defined .include # Pull in OBJDIR name rules. +MKPIE:=no +MKCTF:=no .include .include
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Sun Jan 31 04:40:01 UTC 2016
Modified Files:
src/sys/kern: kern_event.c
src/sys/sys: event.h
Log Message:
PR/50730: Benny Siegert: Go kqueue test panics kernel.
- use a marker knote from the stack instead of allocating and freeing on
each scan.
- add more KASSERTS
- introduce a KN_BUSY bit that indicates that the knote is currently being
scanned, so that knote_detach does not end up deleting it when the file
descriptor gets closed and we don't end up using/trashing free memory from
the scan.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/kern/kern_event.c
cvs rdiff -u -r1.25 -r1.26 src/sys/sys/event.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/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.84 src/sys/kern/kern_event.c:1.85
--- src/sys/kern/kern_event.c:1.84 Tue Dec 8 09:52:06 2015
+++ src/sys/kern/kern_event.c Sat Jan 30 23:40:01 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.84 2015/12/08 14:52:06 christos Exp $ */
+/* $NetBSD: kern_event.c,v 1.85 2016/01/31 04:40:01 christos Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.84 2015/12/08 14:52:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.85 2016/01/31 04:40:01 christos Exp $");
#include
#include
@@ -986,6 +986,7 @@ kqueue_register(struct kqueue *kq, struc
kev->data = 0;
kn->kn_kevent = *kev;
+ KASSERT(kn->kn_fop != NULL);
/*
* apply reference count to knote structure, and
* do not release it at the end of this routine.
@@ -1043,6 +1044,7 @@ kqueue_register(struct kqueue *kq, struc
* support events, and the attach routine is
* broken and does not return an error.
*/
+ KASSERT(kn->kn_fop != NULL);
KASSERT(kn->kn_fop->f_event != NULL);
KERNEL_LOCK(1, NULL); /* XXXSMP */
rv = (*kn->kn_fop->f_event)(kn, 0);
@@ -1150,7 +1152,7 @@ kqueue_scan(file_t *fp, size_t maxevents
struct kqueue *kq;
struct kevent *kevp;
struct timespec ats, sleepts;
- struct knote *kn, *marker;
+ struct knote *kn, *marker, morker;
size_t count, nkev, nevents;
int timeout, error, rv;
filedesc_t *fdp;
@@ -1178,7 +1180,8 @@ kqueue_scan(file_t *fp, size_t maxevents
timeout = 0;
}
- marker = kmem_zalloc(sizeof(*marker), KM_SLEEP);
+ memset(, 0, sizeof(morker));
+ marker =
marker->kn_status = KN_MARKER;
mutex_spin_enter(>kq_lock);
retry:
@@ -1219,30 +1222,35 @@ kqueue_scan(file_t *fp, size_t maxevents
kn = TAILQ_NEXT(kn, kn_tqe);
}
kq_check(kq);
- TAILQ_REMOVE(>kq_head, kn, kn_tqe);
kq->kq_count--;
+ TAILQ_REMOVE(>kq_head, kn, kn_tqe);
kn->kn_status &= ~KN_QUEUED;
+ kn->kn_status |= KN_BUSY;
kq_check(kq);
if (kn->kn_status & KN_DISABLED) {
+kn->kn_status &= ~KN_BUSY;
/* don't want disabled events */
continue;
}
if ((kn->kn_flags & EV_ONESHOT) == 0) {
mutex_spin_exit(>kq_lock);
+KASSERT(kn->kn_fop != NULL);
KASSERT(kn->kn_fop->f_event != NULL);
KERNEL_LOCK(1, NULL); /* XXXSMP */
rv = (*kn->kn_fop->f_event)(kn, 0);
KERNEL_UNLOCK_ONE(NULL); /* XXXSMP */
mutex_spin_enter(>kq_lock);
/* Re-poll if note was re-enqueued. */
-if ((kn->kn_status & KN_QUEUED) != 0)
+if ((kn->kn_status & KN_QUEUED) != 0) {
+ kn->kn_status &= ~KN_BUSY;
continue;
+}
if (rv == 0) {
/*
* non-ONESHOT event that hasn't
* triggered again, so de-queue.
*/
- kn->kn_status &= ~KN_ACTIVE;
+ kn->kn_status &= ~(KN_ACTIVE|KN_BUSY);
continue;
}
}
@@ -1253,22 +1261,24 @@ kqueue_scan(file_t *fp, size_t maxevents
/* delete ONESHOT events after retrieval */
mutex_spin_exit(>kq_lock);
mutex_enter(>fd_lock);
+kn->kn_status &= ~KN_BUSY;
knote_detach(kn, fdp, true);
mutex_spin_enter(>kq_lock);
} else if (kn->kn_flags & EV_CLEAR) {
/* clear state after retrieval */
kn->kn_data = 0;
kn->kn_fflags = 0;
-kn->kn_status &= ~(KN_QUEUED|KN_ACTIVE);
+kn->kn_status &= ~(KN_QUEUED|KN_ACTIVE|KN_BUSY);
} else if (kn->kn_flags & EV_DISPATCH) {
kn->kn_status |= KN_DISABLED;
-kn->kn_status &= ~(KN_QUEUED|KN_ACTIVE);
+kn->kn_status &= ~(KN_QUEUED|KN_ACTIVE|KN_BUSY);
} else {
/* add event back on list */
kq_check(kq);
+kn->kn_status |= KN_QUEUED;
+kn->kn_status &= ~KN_BUSY;
TAILQ_INSERT_TAIL(>kq_head, kn, kn_tqe);
kq->kq_count++;
-kn->kn_status |= KN_QUEUED;
kq_check(kq);
}
if (nkev == kevcnt) {
@@ -1292,8 +1302,6 @@ kqueue_scan(file_t *fp, size_t maxevents
}
done:
mutex_spin_exit(>kq_lock);
- if (marker != NULL)
- kmem_free(marker, sizeof(*marker));
if (nkev != 0) {
/* copyout remaining events */
error =
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Sun Jan 31 05:21:53 UTC 2016 Modified Files: src/external/cddl/osnet/sys/sys: types.h Log Message: only need pgcnt_t in kernel. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/cddl/osnet/sys/sys/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/sys/sys/types.h diff -u src/external/cddl/osnet/sys/sys/types.h:1.13 src/external/cddl/osnet/sys/sys/types.h:1.14 --- src/external/cddl/osnet/sys/sys/types.h:1.13 Thu Dec 12 13:20:49 2013 +++ src/external/cddl/osnet/sys/sys/types.h Sun Jan 31 00:21:53 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.13 2013/12/12 18:20:49 matt Exp $ */ +/* $NetBSD: types.h,v 1.14 2016/01/31 05:21:53 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -115,7 +115,9 @@ typedef int boolean_t; typedef longlong_t hrtime_t; typedef int32_t t_scalar_t; typedef uint32_t t_uscalar_t; +#ifdef _KERNTYPES typedef vsize_t pgcnt_t; +#endif typedef u_longlong_t len_t; typedef int major_t; typedef int minor_t;
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc
Committed By: lukem
Date: Sun Jan 31 06:10:20 UTC 2016
Modified Files:
othersrc/usr.bin/tnftp: ChangeLog THANKS configure configure.ac tnftp.h
tnftp_config.h.in
othersrc/usr.bin/tnftp/libnetbsd: Makefile.in
Added Files:
othersrc/usr.bin/tnftp/libnetbsd: vasprintf.c
Log Message:
Provide missing vasprintf().
vasprintf() is used by the https logic, and some platforms lack it.
Provide replacement based on Joerg's implementation in libnbcompat.
Fix provided by J Raynor on pkgsrc-users on 2016-01-08, with
some tweaks to the autoconf rules by me.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 othersrc/usr.bin/tnftp/ChangeLog
cvs rdiff -u -r1.7 -r1.8 othersrc/usr.bin/tnftp/THANKS
cvs rdiff -u -r1.46 -r1.47 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.31 -r1.32 othersrc/usr.bin/tnftp/configure.ac
cvs rdiff -u -r1.36 -r1.37 othersrc/usr.bin/tnftp/tnftp.h
cvs rdiff -u -r1.4 -r1.5 othersrc/usr.bin/tnftp/tnftp_config.h.in
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/libnetbsd/Makefile.in
cvs rdiff -u -r0 -r1.1 othersrc/usr.bin/tnftp/libnetbsd/vasprintf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/ChangeLog
diff -u othersrc/usr.bin/tnftp/ChangeLog:1.67 othersrc/usr.bin/tnftp/ChangeLog:1.68
--- othersrc/usr.bin/tnftp/ChangeLog:1.67 Sun Oct 4 06:20:58 2015
+++ othersrc/usr.bin/tnftp/ChangeLog Sun Jan 31 06:10:20 2016
@@ -1,4 +1,10 @@
-$NetBSD: ChangeLog,v 1.67 2015/10/04 06:20:58 lukem Exp $
+$NetBSD: ChangeLog,v 1.68 2016/01/31 06:10:20 lukem Exp $
+
+
+Sun Jan 31 06:01:43 UTC 2016 lukem
+
+ * Provide missing vasprintf().
+ Fix from J Raynor via pkgsrc-users.
Sun Oct 4 06:19:25 UTC 2015 lukem
@@ -519,6 +525,7 @@ Sat May 14 04:44:35 UTC 2005 lukem
* Fail if we can't find a library with tgetent (needed for libedit).
NetBSD PR pkg/28925.
+
* Improve quoting when using various autoconf macros.
* Merge NetBSD-ftp 20050513:
Index: othersrc/usr.bin/tnftp/THANKS
diff -u othersrc/usr.bin/tnftp/THANKS:1.7 othersrc/usr.bin/tnftp/THANKS:1.8
--- othersrc/usr.bin/tnftp/THANKS:1.7 Fri Oct 31 04:24:30 2014
+++ othersrc/usr.bin/tnftp/THANKS Sun Jan 31 06:10:20 2016
@@ -23,6 +23,7 @@ Hauke Fath
Havard Eidnes
Hubert Feyrer
ITOH Yasufumi
+J Raynor
Jared McNeill
Jason R. Thorpe
John Hawkinson
Index: othersrc/usr.bin/tnftp/configure
diff -u othersrc/usr.bin/tnftp/configure:1.46 othersrc/usr.bin/tnftp/configure:1.47
--- othersrc/usr.bin/tnftp/configure:1.46 Sun Oct 4 06:17:41 2015
+++ othersrc/usr.bin/tnftp/configure Sun Jan 31 06:10:20 2016
@@ -13,7 +13,7 @@
# gives unlimited permission to copy, distribute and modify it.
#
#
-# Copyright (c) 1999-2015 The NetBSD Foundation, Inc.
+# Copyright (c) 1999-2016 The NetBSD Foundation, Inc.
# All rights reserved.
#
## ##
@@ -1526,7 +1526,7 @@ This configure script is free software;
gives unlimited permission to copy, distribute and modify it.
-Copyright (c) 1999-2015 The NetBSD Foundation, Inc.
+Copyright (c) 1999-2016 The NetBSD Foundation, Inc.
All rights reserved.
_ACEOF
@@ -3174,6 +3174,8 @@ fi
+
+
#
# Checks for programs.
#
@@ -14390,6 +14392,19 @@ esac
fi
+ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
+if test "x$ac_cv_func_vasprintf" = xyes; then :
+ $as_echo "#define HAVE_VASPRINTF 1" >>confdefs.h
+
+else
+ case " $LIBOBJS " in
+ *" vasprintf.$ac_objext "* ) ;;
+ *) LIBOBJS="$LIBOBJS vasprintf.$ac_objext"
+ ;;
+esac
+
+fi
+
for ac_func in getcwd gethostbyaddr gethostbyname gethostbyname2 gethostname \
getpass getpassphrase getpgrp gettimeofday isascii \
@@ -14603,6 +14618,84 @@ fi
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
+$as_echo_n "checking for va_copy... " >&6; }
+if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+$accheck_includes
+
+int
+main ()
+{
+
+va_list ap, ap2;
+va_copy(ap2, ap);
+return 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ $as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_va_copy" >&5
+$as_echo_n "checking for __builtin_va_copy... " >&6; }
+if test "$cross_compiling" = yes; then :
+ { {
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Sun Jan 31 06:15:39 UTC 2016 Modified Files: src/external/cddl/osnet/sys/sys: types.h Log Message: define it when we have vaddr_t exposed. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/cddl/osnet/sys/sys/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/sys/sys/types.h diff -u src/external/cddl/osnet/sys/sys/types.h:1.15 src/external/cddl/osnet/sys/sys/types.h:1.16 --- src/external/cddl/osnet/sys/sys/types.h:1.15 Sun Jan 31 00:31:28 2016 +++ src/external/cddl/osnet/sys/sys/types.h Sun Jan 31 01:15:39 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.15 2016/01/31 05:31:28 christos Exp $ */ +/* $NetBSD: types.h,v 1.16 2016/01/31 06:15:39 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -115,7 +115,7 @@ typedef int boolean_t; typedef longlong_t hrtime_t; typedef int32_t t_scalar_t; typedef uint32_t t_uscalar_t; -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_KERNTYPES) typedef vsize_t pgcnt_t; #endif typedef u_longlong_t len_t;
