CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: msaitoh Date: Wed Mar 2 07:06:10 UTC 2016 Modified Files: src/doc [netbsd-7]: CHANGES-7.1 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.1.2.59 -r1.1.2.60 src/doc/CHANGES-7.1 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-7.1 diff -u src/doc/CHANGES-7.1:1.1.2.59 src/doc/CHANGES-7.1:1.1.2.60 --- src/doc/CHANGES-7.1:1.1.2.59 Sat Feb 27 21:37:10 2016 +++ src/doc/CHANGES-7.1 Wed Mar 2 07:06:10 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1,v 1.1.2.59 2016/02/27 21:37:10 martin Exp $ +# $NetBSD: CHANGES-7.1,v 1.1.2.60 2016/03/02 07:06:10 msaitoh Exp $ A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1 release: @@ -2092,7 +2092,7 @@ sys/dev/pci/if_wmvar.h1.22-1.23, 1.2 bug). This workaround is required if the NVM image version < 3.25. - Fix a bug that wm_detach() didn't unmap the FHASH's area. Now - "drvct -d wm0" -> "drvctl -r pci0" works on ICH* and PCH*. + "drvctl -d wm0" -> "drvctl -r pci0" works on ICH* and PCH*. - Add workaround for 82574 Errata 25 and 82583 Errata 12 "Dropped RX packets" and for 82573 (unknown). Set GCR_L1_ACT_WITHOUT_L0S_RX bit. The NVM Image version 2.1.4 and @@ -2102,7 +2102,7 @@ sys/dev/pci/if_wmvar.h1.22-1.23, 1.2 - Disable LPLU (Low Power Link Up) on D0 state on 82574, 82583 and ICH* too. - Call wm_get_hw_control() correctly. This change fixes a bug - that some AMT based systems doesn't linkup at 1000BaseT. The + that some AMT based systems don't linkup at 1000BaseT. The problem was observed on HP Compaq dc7700. A lot of fixes have been done for wm(4) and igphy(4), so now PR#44893 should be fixed.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Mar 2 01:54:19 UTC 2016 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openssl To generate a diff of this commit: cvs rdiff -u -r1.1308 -r1.1309 src/doc/3RDPARTY cvs rdiff -u -r1.2138 -r1.2139 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1308 src/doc/3RDPARTY:1.1309 --- src/doc/3RDPARTY:1.1308 Wed Feb 24 11:06:20 2016 +++ src/doc/3RDPARTY Tue Mar 1 20:54:19 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1308 2016/02/24 16:06:20 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1309 2016/03/02 01:54:19 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.1r -Current Vers: 1.0.2f +Version: 1.0.1s +Current Vers: 1.0.2g Maintainer: The OpenSSL Project Archive Site: ftp://ftp.openssl.org/source/ Home Page: http://www.openssl.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2138 src/doc/CHANGES:1.2139 --- src/doc/CHANGES:1.2138 Sun Feb 28 06:00:14 2016 +++ src/doc/CHANGES Tue Mar 1 20:54:19 2016 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2138 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2139 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -251,3 +251,5 @@ Changes from NetBSD 7.0 to NetBSD 8.0: elftoolchain: Import FreeBSD-2016-02-19. [christos 20160219] openresolv: Import openresolv-3.7.3. [roy 20160222] mv(1): Add SIGINFO support. [mrg 20160228] + openssl: Import openssl 1.0.1s - disable weak (export) ciphers and SSLv2 + [christos 20160301]
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Wed Mar 2 01:53:22 UTC 2016 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump OpenSSL for 1.0.1s (remove SSLv2 and weak "export" ciphers) To generate a diff of this commit: cvs rdiff -u -r1.763 -r1.764 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.125 -r1.126 src/distrib/sets/lists/debug/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/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.763 src/distrib/sets/lists/base/shl.mi:1.764 --- src/distrib/sets/lists/base/shl.mi:1.763 Sat Feb 20 23:16:16 2016 +++ src/distrib/sets/lists/base/shl.mi Tue Mar 1 20:53:21 2016 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.763 2016/02/21 04:16:16 christos Exp $ +# $NetBSD: shl.mi,v 1.764 2016/03/02 01:53:21 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -23,8 +23,8 @@ ./lib/libcrypt.so.1base-sys-shlib dynamicroot ./lib/libcrypt.so.1.0base-sys-shlib dynamicroot ./lib/libcrypto.sobase-crypto-shlib dynamicroot -./lib/libcrypto.so.8base-crypto-shlib dynamicroot -./lib/libcrypto.so.8.4base-crypto-shlib dynamicroot +./lib/libcrypto.so.11base-crypto-shlib dynamicroot +./lib/libcrypto.so.11.0base-crypto-shlib dynamicroot ./lib/libdevmapper.sobase-lvm-shlib dynamicroot ./lib/libdevmapper.so.1base-lvm-shlib dynamicroot ./lib/libdevmapper.so.1.0 base-lvm-shlib dynamicroot @@ -220,15 +220,15 @@ ./usr/lib/libcrypt.so.1base-sys-shlib compatfile ./usr/lib/libcrypt.so.1.0 base-sys-shlib compatfile ./usr/lib/libcrypto.sobase-crypto-shlib compatfile,crypto -./usr/lib/libcrypto.so.8 base-crypto-shlib compatfile,crypto -./usr/lib/libcrypto.so.8.4 base-crypto-shlib compatfile,crypto +./usr/lib/libcrypto.so.11 base-crypto-shlib compatfile,crypto +./usr/lib/libcrypto.so.11.0 base-crypto-shlib compatfile,crypto ./usr/lib/libcrypto_idea.so.7 base-obsolete compatfile,obsolete ./usr/lib/libcrypto_idea.so.7.0 base-obsolete compatfile,obsolete ./usr/lib/libcrypto_mdc2.so.7 base-obsolete compatfile,obsolete ./usr/lib/libcrypto_mdc2.so.7.0 base-obsolete compatfile,obsolete ./usr/lib/libcrypto_rc5.so base-crypto-shlib compatfile,crypto,crypto_rc5 -./usr/lib/libcrypto_rc5.so.7 base-crypto-shlib compatfile,crypto,crypto_rc5 -./usr/lib/libcrypto_rc5.so.7.0 base-crypto-shlib compatfile,crypto,crypto_rc5 +./usr/lib/libcrypto_rc5.so.11 base-crypto-shlib compatfile,crypto,crypto_rc5 +./usr/lib/libcrypto_rc5.so.11.0 base-crypto-shlib compatfile,crypto,crypto_rc5 ./usr/lib/libctf.sobase-sys-shlib compatfile,ctf ./usr/lib/libctf.so.3base-sys-shlib compatfile,ctf ./usr/lib/libctf.so.3.0base-sys-shlib compatfile,ctf @@ -236,8 +236,8 @@ ./usr/lib/libcurses.so.7 base-sys-shlib compatfile ./usr/lib/libcurses.so.7.0 base-sys-shlib compatfile ./usr/lib/libdes.sobase-crypto-shlib compatfile,crypto -./usr/lib/libdes.so.8base-crypto-shlib compatfile,crypto -./usr/lib/libdes.so.8.2base-crypto-shlib compatfile,crypto +./usr/lib/libdes.so.11base-crypto-shlib compatfile,crypto +./usr/lib/libdes.so.11.0base-crypto-shlib compatfile,crypto ./usr/lib/libdevmapper.so base-lvm-shlib compatfile,lvm ./usr/lib/libdevmapper.so.1 base-lvm-shlib compatfile,lvm ./usr/lib/libdevmapper.so.1.0 base-lvm-shlib compatfile,lvm @@ -763,8 +763,8 @@ ./usr/lib/libssh.so.27base-secsh-shlib compatfile,crypto ./usr/lib/libssh.so.27.0 base-secsh-shlib compatfile,crypto ./usr/lib/libssl.sobase-crypto-shlib compatfile,crypto -./usr/lib/libssl.so.10base-crypto-shlib compatfile,crypto -./usr/lib/libssl.so.10.5 base-crypto-shlib compatfile,crypto +./usr/lib/libssl.so.11base-crypto-shlib compatfile,crypto +./usr/lib/libssl.so.11.0 base-crypto-shlib compatfile,crypto ./usr/lib/libstdc++.sobase-sys-shlib compatfile,gcc,cxx,libstdcxx ./usr/lib/libstdc++.so.7 base-sys-shlib compatfile,gcc,cxx,libstdcxx ./usr/lib/libstdc++.so.7.3 base-sys-shlib compatfile,gcc,cxx,libstdcxx Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.125 src/distrib/sets/lists/debug/shl.mi:1.126 --- src/distrib/sets/lists/debug/shl.mi:1.125 Sat Feb 20 23:16:16 2016 +++ src/distrib/sets/lists/debug/shl.mi Tue Mar 1 20:53:22 2016 @@ -1,9 +1,9 @@ -# $NetBSD: shl.mi,v 1.125 2016/02/21 04:16:16 christos Exp $ +# $NetBSD: shl.mi,v 1.126 2016/03/02 01:53:22 christos Exp $ ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libc.so.12.200.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug,dynami
CVS commit: src/crypto/external/bsd/openssl
Module Name:src Committed By: christos Date: Wed Mar 2 01:52:36 UTC 2016 Modified Files: src/crypto/external/bsd/openssl/dist: CHANGES Configure Makefile NEWS README openssl.spec src/crypto/external/bsd/openssl/dist/apps: s_server.c src/crypto/external/bsd/openssl/dist/crypto: opensslconf.h opensslv.h src/crypto/external/bsd/openssl/dist/crypto/bn: bn.h bn_exp.c src/crypto/external/bsd/openssl/dist/crypto/dsa: dsa_ameth.c src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_sign.c src/crypto/external/bsd/openssl/dist/crypto/threads: mttest.c src/crypto/external/bsd/openssl/dist/ssl: Makefile s2_lib.c s3_lib.c ssl_lib.c src/crypto/external/bsd/openssl/dist/util: mk1mf.pl src/crypto/external/bsd/openssl/lib/libcrypto: shlib_version src/crypto/external/bsd/openssl/lib/libcrypto_rc5: shlib_version src/crypto/external/bsd/openssl/lib/libdes: shlib_version src/crypto/external/bsd/openssl/lib/libssl: shlib_version Log Message: merge conflicts, bump libraries to 11 for consistency. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 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.14 -r1.15 src/crypto/external/bsd/openssl/dist/Configure cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssl/dist/Makefile cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssl/dist/apps/s_server.c cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h cvs rdiff -u -r1.18 -r1.19 \ src/crypto/external/bsd/openssl/dist/crypto/opensslv.h cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/crypto/bn/bn.h cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/dsa/dsa_ameth.c cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_sign.c cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/ssl/Makefile \ src/crypto/external/bsd/openssl/dist/ssl/s2_lib.c cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/ssl/ssl_lib.c cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/util/mk1mf.pl cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto_rc5/shlib_version cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libdes/shlib_version cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/openssl/lib/libssl/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/dist/CHANGES diff -u src/crypto/external/bsd/openssl/dist/CHANGES:1.9 src/crypto/external/bsd/openssl/dist/CHANGES:1.10 --- src/crypto/external/bsd/openssl/dist/CHANGES:1.9 Sat Jan 30 12:00:19 2016 +++ src/crypto/external/bsd/openssl/dist/CHANGES Tue Mar 1 20:52:35 2016 @@ -2,6 +2,138 @@ OpenSSL CHANGES ___ + Changes between 1.0.1r and 1.0.1s [1 Mar 2016] + + * Disable weak ciphers in SSLv3 and up in default builds of OpenSSL. +Builds that are not configured with "enable-weak-ssl-ciphers" will not +provide any "EXPORT" or "LOW" strength ciphers. +[Viktor Dukhovni] + + * Disable SSLv2 default build, default negotiation and weak ciphers. SSLv2 +is by default disabled at build-time. Builds that are not configured with +"enable-ssl2" will not support SSLv2. Even if "enable-ssl2" is used, +users who want to negotiate SSLv2 via the version-flexible SSLv23_method() +will need to explicitly call either of: + +SSL_CTX_clear_options(ctx, SSL_OP_NO_SSLv2); +or +SSL_clear_options(ssl, SSL_OP_NO_SSLv2); + +as appropriate. Even if either of those is used, or the application +explicitly uses the version-specific SSLv2_method() or its client and +server variants, SSLv2 ciphers vulnerable to exhaustive search key +recovery have been removed. Specifically, the SSLv2 40-bit EXPORT +ciphers, and SSLv2 56-bit DES are no longer available. +(CVE-2016-0800) +[Viktor Dukhovni] + + *) Fix a double-free in DSA code + + A double free bug was discovered when OpenSSL parses malformed DSA private + keys and could lead to a DoS attack or memory corruption for applications + that receive DSA private keys from untrusted sources. This scenario is + considered rare. + + This issue was reported to OpenSSL by Adam Langley(Google/BoringSSL)
CVS commit: src/external/cddl/osnet/lib/drti
Module Name:src
Committed By: christos
Date: Tue Mar 1 21:45:10 UTC 2016
Modified Files:
src/external/cddl/osnet/lib/drti: Makefile
Log Message:
remove comment I used to test.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/lib/drti/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/drti/Makefile
diff -u src/external/cddl/osnet/lib/drti/Makefile:1.3 src/external/cddl/osnet/lib/drti/Makefile:1.4
--- src/external/cddl/osnet/lib/drti/Makefile:1.3 Tue Mar 1 16:30:40 2016
+++ src/external/cddl/osnet/lib/drti/Makefile Tue Mar 1 16:45:10 2016
@@ -3,7 +3,7 @@
.include "../../Makefile.inc"
#.if ${MKPIC} == "yes"
-#CFLAGS+=-fPIC
+CFLAGS+=-fPIC
#.endif
.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common
CVS commit: src/external/cddl/osnet/lib/drti
Module Name:src
Committed By: christos
Date: Tue Mar 1 21:30:40 UTC 2016
Modified Files:
src/external/cddl/osnet/lib/drti: Makefile
Log Message:
Build as PIC if requested
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/lib/drti/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/drti/Makefile
diff -u src/external/cddl/osnet/lib/drti/Makefile:1.2 src/external/cddl/osnet/lib/drti/Makefile:1.3
--- src/external/cddl/osnet/lib/drti/Makefile:1.2 Sun Feb 28 14:10:10 2016
+++ src/external/cddl/osnet/lib/drti/Makefile Tue Mar 1 16:30:40 2016
@@ -2,6 +2,10 @@
.include
.include "../../Makefile.inc"
+#.if ${MKPIC} == "yes"
+#CFLAGS+=-fPIC
+#.endif
+
.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common
SRCS= drti.c
CVS commit: src/bin/sh
Module Name:src
Committed By: martin
Date: Tue Mar 1 21:10:40 UTC 2016
Modified Files:
src/bin/sh: main.c
Log Message:
Fix wrong condition in previous causing bogus 'Use "exit" to leave
shell.' messages (from kre)
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/bin/sh/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/main.c
diff -u src/bin/sh/main.c:1.61 src/bin/sh/main.c:1.62
--- src/bin/sh/main.c:1.61 Mon Feb 29 23:51:36 2016
+++ src/bin/sh/main.c Tue Mar 1 21:10:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.61 2016/02/29 23:51:36 christos Exp $ */
+/* $NetBSD: main.c,v 1.62 2016/03/01 21:10:40 martin Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)main.c 8.7 (Berkeley) 7/19/95";
#else
-__RCSID("$NetBSD: main.c,v 1.61 2016/02/29 23:51:36 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.62 2016/03/01 21:10:40 martin Exp $");
#endif
#endif /* not lint */
@@ -279,7 +279,7 @@ cmdloop(int top)
if (nflag)
break;
if (!stoppedjobs()) {
-if (iflag && !Iflag)
+if (!iflag || !Iflag)
break;
out2str("\nUse \"exit\" to leave shell.\n");
}
CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src Committed By: joerg Date: Tue Mar 1 21:09:17 UTC 2016 Modified Files: src/external/cddl/osnet/dist/lib/libdtrace/common: drti.c Log Message: Don't crash when relocbase was 0. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/cddl/osnet/dist/lib/libdtrace/common/drti.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/cddl/osnet/dist/lib/libdtrace/common/drti.c diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/drti.c:1.6 src/external/cddl/osnet/dist/lib/libdtrace/common/drti.c:1.7 --- src/external/cddl/osnet/dist/lib/libdtrace/common/drti.c:1.6 Mon Feb 29 02:19:37 2016 +++ src/external/cddl/osnet/dist/lib/libdtrace/common/drti.c Tue Mar 1 21:09:17 2016 @@ -149,7 +149,7 @@ dtrace_dof_init(void) elf = (void *)lmp->l_addr; dh.dofhp_dof = (uintptr_t)dof; - dh.dofhp_addr = elf->e_type == ET_DYN ? (uintptr_t) lmp->l_addr : 0; + dh.dofhp_addr = elf && elf->e_type == ET_DYN ? (uintptr_t) lmp->l_addr : 0; #if defined(__FreeBSD__) || defined(__NetBSD__) dh.dofhp_pid = getpid(); #endif
CVS import: src/crypto/external/bsd/openssl/dist
= Severity: High This issue only affected versions of OpenSSL prior to March 19th 2015 at which time the code was refactored to address vulnerability CVE-2015-0293. s2_srvr.c did not enforce that clear-key-length is 0 for non-export ciphers. If clear-key bytes are present for these ciphers, they *displace* encrypted-key bytes. This leads to an efficient divide-and-conquer key recovery attack: if an eavesdropper has intercepted an SSLv2 handshake, they can use the server as an oracle to determine the SSLv2 master-key, using only 16 connections to the server and negligible computation. More importantly, this leads to a more efficient version of DROWN that is effective against non-export ciphersuites, and requires no significant computation. This issue affected OpenSSL versions 1.0.2, 1.0.1l, 1.0.0q, 0.9.8ze and all earlier versions. It was fixed in OpenSSL 1.0.2a, 1.0.1m, 1.0.0r and 0.9.8zf (released March 19th 2015). This issue was reported to OpenSSL on February 10th 2016 by David Adrian and J. Alex Halderman of the University of Michigan. The underlying defect had by then already been fixed by Emilia K�sper of OpenSSL on March 4th 2015. The fix for this issue can be identified by commits ae50d827 (1.0.2a), cd56a08d (1.0.1m), 1a08063 (1.0.0r) and 65c588c (0.9.8zf). Bleichenbacher oracle in SSLv2 (CVE-2016-0704) == Severity: Moderate This issue only affected versions of OpenSSL prior to March 19th 2015 at which time the code was refactored to address the vulnerability CVE-2015-0293. s2_srvr.c overwrite the wrong bytes in the master-key when applying Bleichenbacher protection for export cipher suites. This provides a Bleichenbacher oracle, and could potentially allow more efficient variants of the DROWN attack. This issue affected OpenSSL versions 1.0.2, 1.0.1l, 1.0.0q, 0.9.8ze and all earlier versions. It was fixed in OpenSSL 1.0.2a, 1.0.1m, 1.0.0r and 0.9.8zf (released March 19th 2015). This issue was reported to OpenSSL on February 10th 2016 by David Adrian and J. Alex Halderman of the University of Michigan. The underlying defect had by then already been fixed by Emilia K�sper of OpenSSL on March 4th 2015. The fix for this issue can be identified by commits ae50d827 (1.0.2a), cd56a08d (1.0.1m), 1a08063 (1.0.0r) and 65c588c (0.9.8zf). Note As per our previous announcements and our Release Strategy (https://www.openssl.org/policies/releasestrat.html), support for OpenSSL version 1.0.1 will cease on 31st December 2016. No security updates for that version will be provided after that date. Users of 1.0.1 are advised to upgrade. Support for versions 0.9.8 and 1.0.0 ended on 31st December 2015. Those versions are no longer receiving security updates. References == URL for this Security Advisory: https://www.openssl.org/news/secadv/20160301.txt Note: the online version of the advisory may be updated with additional details over time. For details of OpenSSL severity classifications please see: https://www.openssl.org/policies/secpolicy.html Status: Vendor Tag: OPENSSL Release Tags: openssl-1-0-1s 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/c
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src
Committed By: joerg
Date: Tue Mar 1 16:08:23 UTC 2016
Modified Files:
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot
Log Message:
Don't reuse LDFLAGS for arguments passed directly to ${LD}, share/mk
expects it to be passed to ${CC} or ${CXX}, so they will generally
prefix flags with -Wl.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 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.33 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.34
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.33 Sun Jan 31 15:29:04 2016
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Tue Mar 1 16:08:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gzboot,v 1.33 2016/01/31 15:29:04 christos Exp $
+# $NetBSD: Makefile.gzboot,v 1.34 2016/03/01 16:08:22 joerg Exp $
NOMAN= # defined
@@ -87,7 +87,7 @@ cleandir distclean: .WAIT cleanlibdir
cleanlibdir:
-rm -rf lib
-LDFLAGS= -M -T ${LDSCRIPT} --fix-v4bx
+DIRECT_LDFLAGS= -M -T ${LDSCRIPT} --fix-v4bx
LIBLIST=${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN} ${LIBSA}
@@ -114,5 +114,5 @@ FILES= ${PROGSYM}
${PROGSYM}: ${STARTFILE} ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${_MKTARGET_LINK}
- ${LD} -o ${.TARGET} ${LDFLAGS} ${STARTFILE} \
+ ${LD} -o ${.TARGET} ${DIRECT_LDFLAGS} ${STARTFILE} \
${OBJS} ${LIBLIST} > ${BASE}.list
CVS commit: [nick-nhusb] src/sys/external/bsd/dwc2
Module Name:src
Committed By: skrll
Date: Tue Mar 1 15:19:37 UTC 2016
Modified Files:
src/sys/external/bsd/dwc2 [nick-nhusb]: dwc2var.h
Log Message:
Remove unused struct member.
To generate a diff of this commit:
cvs rdiff -u -r1.3.12.8 -r1.3.12.9 src/sys/external/bsd/dwc2/dwc2var.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/external/bsd/dwc2/dwc2var.h
diff -u src/sys/external/bsd/dwc2/dwc2var.h:1.3.12.8 src/sys/external/bsd/dwc2/dwc2var.h:1.3.12.9
--- src/sys/external/bsd/dwc2/dwc2var.h:1.3.12.8 Fri Feb 26 07:36:02 2016
+++ src/sys/external/bsd/dwc2/dwc2var.h Tue Mar 1 15:19:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2var.h,v 1.3.12.8 2016/02/26 07:36:02 skrll Exp $ */
+/* $NetBSD: dwc2var.h,v 1.3.12.9 2016/03/01 15:19:37 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -42,7 +42,6 @@ struct dwc2_xfer {
struct usb_task abort_task;
struct dwc2_hcd_urb *urb;
- int packet_count;
TAILQ_ENTRY(dwc2_xfer) xnext; /* list of complete xfers */
};
CVS commit: src/external/cddl/osnet/dist/tools/ctf/cvt
Module Name:src
Committed By: joerg
Date: Tue Mar 1 14:52:14 UTC 2016
Modified Files:
src/external/cddl/osnet/dist/tools/ctf/cvt: dwarf.c
Log Message:
Merge r274564 from FreeBSD:
Fix a couple of bugs around the handling of structs and unions of size zero.
These would cause ctfconvert(1) to return an error when attempting to
resolve valid C types.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.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/cddl/osnet/dist/tools/ctf/cvt/dwarf.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.18 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.19
--- src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.18 Sun Feb 21 13:33:47 2016
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c Tue Mar 1 14:52:14 2016
@@ -782,7 +782,8 @@ die_array_resolve(tdesc_t *tdp, tdesc_t
debug(3, "trying to resolve array %d (cont %d)\n", tdp->t_id,
tdp->t_ardef->ad_contents->t_id);
- if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0) {
+ if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0 &&
+ (tdp->t_ardef->ad_contents->t_flags & TDESC_F_RESOLVED) == 0) {
debug(3, "unable to resolve array %s (%d) contents %d\n",
tdesc_name(tdp), tdp->t_id,
tdp->t_ardef->ad_contents->t_id);
@@ -1164,12 +1165,17 @@ die_sou_resolve(tdesc_t *tdp, tdesc_t **
/*
* For empty members, or GCC/C99 flexible array
- * members, a size of 0 is correct.
+ * members, a size of 0 is correct. Structs and unions
+ * consisting of flexible array members will also have
+ * size 0.
*/
if (mt->t_members == NULL)
continue;
if (mt->t_type == ARRAY && mt->t_ardef->ad_nelems == 0)
continue;
+ if ((mt->t_flags & TDESC_F_RESOLVED) != 0 &&
+ (mt->t_type == STRUCT || mt->t_type == UNION))
+continue;
if (mt->t_type == STRUCT &&
mt->t_members != NULL &&
CVS commit: [nick-nhusb] src/sys/external/bsd/dwc2
Module Name:src Committed By: skrll Date: Tue Mar 1 14:45:10 UTC 2016 Modified Files: src/sys/external/bsd/dwc2 [nick-nhusb]: dwc2.c Log Message: Re-initialise dwc2_urb->packet_count after the memset(dwc2_urb, 0, ...) To generate a diff of this commit: cvs rdiff -u -r1.32.2.19 -r1.32.2.20 src/sys/external/bsd/dwc2/dwc2.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/external/bsd/dwc2/dwc2.c diff -u src/sys/external/bsd/dwc2/dwc2.c:1.32.2.19 src/sys/external/bsd/dwc2/dwc2.c:1.32.2.20 --- src/sys/external/bsd/dwc2/dwc2.c:1.32.2.19 Tue Mar 1 14:38:47 2016 +++ src/sys/external/bsd/dwc2/dwc2.c Tue Mar 1 14:45:10 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc2.c,v 1.32.2.19 2016/03/01 14:38:47 skrll Exp $ */ +/* $NetBSD: dwc2.c,v 1.32.2.20 2016/03/01 14:45:10 skrll Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.19 2016/03/01 14:38:47 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.20 2016/03/01 14:45:10 skrll Exp $"); #include "opt_usb.h" @@ -1053,10 +1053,12 @@ dwc2_device_start(struct usbd_xfer *xfer if (!dwc2_urb) return USBD_NOMEM; + KASSERT(dwc2_urb->packet_count == xfer->ux_nframes); memset(dwc2_urb, 0, sizeof(*dwc2_urb) + sizeof(dwc2_urb->iso_descs[0]) * dwc2_urb->packet_count); dwc2_urb->priv = xfer; + dwc2_urb->packet_count = xfer->ux_nframes; dwc2_hcd_urb_set_pipeinfo(hsotg, dwc2_urb, addr, epnum, xfertype, dir, mps);
CVS commit: [nick-nhusb] src/sys/external/bsd/dwc2
Module Name:src Committed By: skrll Date: Tue Mar 1 14:38:47 UTC 2016 Modified Files: src/sys/external/bsd/dwc2 [nick-nhusb]: dwc2.c Log Message: Whitespace To generate a diff of this commit: cvs rdiff -u -r1.32.2.18 -r1.32.2.19 src/sys/external/bsd/dwc2/dwc2.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/external/bsd/dwc2/dwc2.c diff -u src/sys/external/bsd/dwc2/dwc2.c:1.32.2.18 src/sys/external/bsd/dwc2/dwc2.c:1.32.2.19 --- src/sys/external/bsd/dwc2/dwc2.c:1.32.2.18 Sun Feb 28 09:16:20 2016 +++ src/sys/external/bsd/dwc2/dwc2.c Tue Mar 1 14:38:47 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc2.c,v 1.32.2.18 2016/02/28 09:16:20 skrll Exp $ */ +/* $NetBSD: dwc2.c,v 1.32.2.19 2016/03/01 14:38:47 skrll Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.18 2016/02/28 09:16:20 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.19 2016/03/01 14:38:47 skrll Exp $"); #include "opt_usb.h" @@ -89,7 +89,7 @@ Static struct usbd_xfer * Static void dwc2_freex(struct usbd_bus *, struct usbd_xfer *); Static void dwc2_get_lock(struct usbd_bus *, kmutex_t **); Static int dwc2_roothub_ctrl(struct usbd_bus *, usb_device_request_t *, -void *, int); + void *, int); Static usbd_status dwc2_root_intr_transfer(struct usbd_xfer *); Static usbd_status dwc2_root_intr_start(struct usbd_xfer *); @@ -136,7 +136,6 @@ Static void dwc2_timeout(void *); Static void dwc2_timeout_task(void *); - static inline void dwc2_allocate_bus_bandwidth(struct dwc2_hsotg *hsotg, u16 bw, struct usbd_xfer *xfer) @@ -446,7 +445,8 @@ dwc2_open(struct usbd_pipe *pipe) return USBD_INVAL; } - dpipe->priv = NULL; /* QH */ + /* QH */ + dpipe->priv = NULL; return USBD_NORMAL_COMPLETION; }
CVS commit: src/tests/bin/sh
Module Name:src
Committed By: christos
Date: Tue Mar 1 12:39:36 UTC 2016
Modified Files:
src/tests/bin/sh: t_exit.sh t_here.sh t_option.sh t_redir.sh
Log Message:
Improved handling of TEST_SH so that it is possible to define it
to the name of a shell, plus options that shell needs to run it
in the correct mode to be tested: eg: TEST_SH='bash -o posix'
Also finished the implementation of tests of "set -n" now that
the NetBSD shell supports that as it should. (from kre)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/bin/sh/t_exit.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/bin/sh/t_here.sh \
src/tests/bin/sh/t_redir.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/sh/t_option.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/bin/sh/t_exit.sh
diff -u src/tests/bin/sh/t_exit.sh:1.4 src/tests/bin/sh/t_exit.sh:1.5
--- src/tests/bin/sh/t_exit.sh:1.4 Wed Feb 24 09:42:06 2016
+++ src/tests/bin/sh/t_exit.sh Tue Mar 1 07:39:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_exit.sh,v 1.4 2016/02/24 14:42:06 christos Exp $
+# $NetBSD: t_exit.sh,v 1.5 2016/03/01 12:39:35 christos Exp $
#
# Copyright (c) 2007 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -34,9 +34,9 @@ background_head() {
"a command in the background (PR bin/46327)"
}
background_body() {
- atf_check -o match:0 -e empty "${TEST_SH}" -c 'true; true & echo $?'
+ atf_check -o match:0 -e empty ${TEST_SH} -c 'true; true & echo $?'
# atf_expect_fail "PR bin/46327" (now fixed?)
- atf_check -o match:0 -e empty "${TEST_SH}" -c 'false; true & echo $?'
+ atf_check -o match:0 -e empty ${TEST_SH} -c 'false; true & echo $?'
}
atf_test_case function
@@ -46,7 +46,7 @@ function_head() {
}
function_body() {
atf_check -s exit:0 -o match:STATUS=1-0 -e empty \
- "${TEST_SH}" -c '
+ ${TEST_SH} -c '
crud() {
test yes = no
@@ -66,7 +66,7 @@ readout_head() {
}
readout_body() {
atf_check -s exit:0 -o match:0 -e empty \
- "${TEST_SH}" -c 'true && ! true | false; echo $?'
+ ${TEST_SH} -c 'true && ! true | false; echo $?'
}
atf_test_case trap_subshell
@@ -87,7 +87,7 @@ trap_zero__implicit_exit_head() {
trap_zero__implicit_exit_body() {
# PR bin/6764: sh works but ksh does not
echo '( trap "echo exiting" 0 )' >helper.sh
- atf_check -s exit:0 -o match:exiting -e empty "${TEST_SH}" helper.sh
+ atf_check -s exit:0 -o match:exiting -e empty ${TEST_SH} helper.sh
# test ksh by setting TEST_SH to /bin/ksh and run the entire set...
# atf_check -s exit:0 -o match:exiting -e empty /bin/ksh helper.sh
}
@@ -100,7 +100,7 @@ trap_zero__explicit_exit_head() {
trap_zero__explicit_exit_body() {
echo '( trap "echo exiting" 0; exit; echo NO_NO_NO )' >helper.sh
atf_check -s exit:0 -o match:exiting -o not-match:NO_NO -e empty \
- "${TEST_SH}" helper.sh
+ ${TEST_SH} helper.sh
# test ksh by setting TEST_SH to /bin/ksh and run the entire set...
# atf_check -s exit:0 -o match:exiting -e empty /bin/ksh helper.sh
}
@@ -115,7 +115,7 @@ trap_zero__explicit_return_body() {
echo '( trap "echo exiting" 0; return; echo NO_NO_NO )' >helper.sh
atf_expect_fail "return from a sub-shell not defined and does not work"
atf_check -s exit:0 -o match:exiting -o not-match:NO_NO -e empty \
- "${TEST_SH}" helper.sh
+ ${TEST_SH} helper.sh
# test ksh by setting TEST_SH to /bin/ksh and run the entire set...
# atf_check -s exit:0 -o match:exiting -e empty /bin/ksh helper.sh
}
@@ -129,7 +129,7 @@ simple_exit_body() {
for N in 0 1 2 3 4 5 6 42 99 101 125 126 127 128 129 200 254 255
do
atf_check -s exit:$N -o empty -e empty \
- "${TEST_SH}" -c "exit $N; echo FOO; echo BAR >&2"
+ ${TEST_SH} -c "exit $N; echo FOO; echo BAR >&2"
done
}
@@ -142,7 +142,7 @@ subshell_exit_body() {
for N in 0 1 2 3 4 5 6 42 99 101 125 126 127 128 129 200 254 255
do
atf_check -s exit:0 -o empty -e empty \
- "${TEST_SH}" -c "(exit $N); test \$? -eq $N"
+ ${TEST_SH} -c "(exit $N); test \$? -eq $N"
done
}
@@ -153,10 +153,10 @@ subshell_background_head() {
}
subshell_background_body() {
atf_check -o match:0 -e empty \
- "${TEST_SH}" -c 'true; (false || true) & echo $?'
+ ${TEST_SH} -c 'true; (false || true) & echo $?'
# atf_expect_fail "PR bin/46327" (now fixed?)
atf_check -o match:0 -e empty \
- "${TEST_SH}" -c 'false; (false || true) & echo $?'
+ ${TEST_SH} -c 'false; (false || true) & echo $?'
}
atf_init_test_cases() {
Index: src/tests/bin/sh/t_here.sh
diff -u src/tests/bin/sh/t_here.sh:1.2 src/tests/bin/sh/t_here.sh:1.3
--- src/tests/bin/sh/t_here.sh:1.2 Mon Feb 29 18:52:53 2016
+++ src/tests/bin/sh/t_here.sh Tue Mar 1 07:39:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_here.sh,v 1.2 2016/02/29 23:52:53 christos Exp $
+# $NetBSD: t_here.sh,v 1.3 2016/03/01 12:39:35 christos Exp $
#
# Copyright (c) 2007 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -39,7 +39,6 @@ check()
# some of the tests expe
CVS commit: src/share/mk
Module Name:src
Committed By: uwe
Date: Tue Mar 1 10:29:40 UTC 2016
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch sh3 to the new binutils and gdb. Lightly tested on landisk.
sh3eb compile-tested only.
To generate a diff of this commit:
cvs rdiff -u -r1.904 -r1.905 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.904 src/share/mk/bsd.own.mk:1.905
--- src/share/mk/bsd.own.mk:1.904 Sun Feb 28 20:47:01 2016
+++ src/share/mk/bsd.own.mk Tue Mar 1 10:29:40 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.904 2016/02/28 20:47:01 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.905 2016/03/01 10:29:40 uwe Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -128,7 +128,8 @@ USE_SSP?= yes
.endif
.if ${MACHINE} == "amd64" || \
-${MACHINE} == "i386"
+${MACHINE} == "i386" || \
+${MACHINE_CPU} == "sh3"
HAVE_GDB?= 710
.else
HAVE_GDB?= 79
@@ -144,6 +145,7 @@ EXTERNAL_GDB_SUBDIR= gdb
${MACHINE} == "evbarm" || \
${MACHINE} == "i386" || \
${MACHINE} == "hppa" || \
+${MACHINE_CPU} == "sh3" || \
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
${MACHINE_ARCH} == "powerpc"
CVS commit: src/tools/compat
Module Name:src Committed By: martin Date: Tue Mar 1 10:11:07 UTC 2016 Removed Files: src/tools/compat: regex.h Log Message: Remove regexp.h here temporarily To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/tools/compat/regex.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/compat
Module Name:src
Committed By: martin
Date: Tue Mar 1 10:09:00 UTC 2016
Modified Files:
src/tools/compat: Makefile
Log Message:
Revert to rev 1.77 for now on Aymeric's request
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/tools/compat/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/compat/Makefile
diff -u src/tools/compat/Makefile:1.79 src/tools/compat/Makefile:1.80
--- src/tools/compat/Makefile:1.79 Tue Mar 1 06:48:55 2016
+++ src/tools/compat/Makefile Tue Mar 1 10:09:00 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2016/03/01 06:48:55 aymeric Exp $
+# $NetBSD: Makefile,v 1.80 2016/03/01 10:09:00 martin Exp $
HOSTLIB= nbcompat
@@ -14,7 +14,6 @@ SRCS= atoll.c basename.c cdbr.c cdbw.c
mkstemp.c pread.c putc_unlocked.c pwcache.c pwrite.c \
pw_scan.c \
raise_default_signal.c reallocarr.c rmd160.c rmd160hl.c \
- regcomp.c regerror.c regexec.c regfree.c \
setenv.c setgroupent.c \
setpassent.c setprogname.c sha1.c sha1hl.c sha2.c \
sha256hl.c sha384hl.c sha512hl.c snprintb.c snprintf.c \
@@ -48,7 +47,6 @@ CPPFLAGS+= -I. -I./include -I${.CURDIR}
${.CURDIR}/../../lib/libc/hash/sha1 \
${.CURDIR}/../../lib/libc/hash/sha2 \
${.CURDIR}/../../lib/libc/md \
- ${.CURDIR}/../../lib/libc/regex \
${.CURDIR}/../../lib/libc/stdio \
${.CURDIR}/../../lib/libc/stdlib \
${.CURDIR}/../../lib/libc/string \
