CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src Committed By: christos Date: Tue May 9 02:31:02 UTC 2023 Modified Files: src/crypto/dist/ipsec-tools/src/racoon: crypto_openssl.c Log Message: Deal with OpenSSL-3.x To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 \ src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src Committed By: christos Date: Tue May 9 02:31:02 UTC 2023 Modified Files: src/crypto/dist/ipsec-tools/src/racoon: crypto_openssl.c Log Message: Deal with OpenSSL-3.x To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 \ src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.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/dist/ipsec-tools/src/racoon/crypto_openssl.c diff -u src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c:1.28 src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c:1.29 --- src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c:1.28 Sun Apr 1 18:59:57 2018 +++ src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c Mon May 8 22:31:02 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: crypto_openssl.c,v 1.28 2018/04/01 22:59:57 christos Exp $ */ +/* $NetBSD: crypto_openssl.c,v 1.29 2023/05/09 02:31:02 christos Exp $ */ /* Id: crypto_openssl.c,v 1.47 2006/05/06 20:42:09 manubsd Exp */ @@ -876,7 +876,7 @@ eay_check_x509sign(source, sig, cert) return -1; } - res = eay_rsa_verify(source, sig, EVP_PKEY_get0_RSA(evp)); + res = eay_rsa_verify(source, sig, __UNCONST(EVP_PKEY_get0_RSA(evp))); EVP_PKEY_free(evp); X509_free(x509); @@ -1018,7 +1018,7 @@ eay_get_x509sign(src, privkey) if (evp == NULL) return NULL; - sig = eay_rsa_sign(src, EVP_PKEY_get0_RSA(evp)); + sig = eay_rsa_sign(src, __UNCONST(EVP_PKEY_get0_RSA(evp))); EVP_PKEY_free(evp);
CVS commit: src/usr.sbin/racoon
Module Name:src
Committed By: christos
Date: Tue May 9 02:30:22 UTC 2023
Modified Files:
src/usr.sbin/racoon: Makefile
Log Message:
deal with OpenSSL-3.x
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/racoon/Makefile
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/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.40 src/usr.sbin/racoon/Makefile:1.41
--- src/usr.sbin/racoon/Makefile:1.40 Sat Aug 14 13:08:21 2021
+++ src/usr.sbin/racoon/Makefile Mon May 8 22:30:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2021/08/14 17:08:21 christos Exp $
+# $NetBSD: Makefile,v 1.41 2023/05/09 02:30:21 christos Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -84,5 +84,9 @@ prsa_par.c: ${DIST}/src/racoon/prsa_par.
CWARNFLAGS.gcc+=${GCC_NO_ADDR_OF_PACKED_MEMBER}
COPTS+= -fcommon
+COPTS.crypto_openssl.c+=-Wno-error=deprecated-declarations
+COPTS.rsalist.c+=-Wno-error=deprecated-declarations
+COPTS.prsa_par.c+=-Wno-error=deprecated-declarations
+
.include
CVS commit: src/usr.sbin/racoon
Module Name:src Committed By: christos Date: Tue May 9 02:30:22 UTC 2023 Modified Files: src/usr.sbin/racoon: Makefile Log Message: deal with OpenSSL-3.x To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/racoon/Makefile 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/libsaslc/lib
Module Name:src Committed By: christos Date: Tue May 9 02:19:32 UTC 2023 Modified Files: src/crypto/external/bsd/libsaslc/lib: Makefile Log Message: deal with OpenSSL-3.x To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/libsaslc/lib/Makefile 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/libsaslc/lib
Module Name:src
Committed By: christos
Date: Tue May 9 02:19:32 UTC 2023
Modified Files:
src/crypto/external/bsd/libsaslc/lib: Makefile
Log Message:
deal with OpenSSL-3.x
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/libsaslc/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/libsaslc/lib/Makefile
diff -u src/crypto/external/bsd/libsaslc/lib/Makefile:1.9 src/crypto/external/bsd/libsaslc/lib/Makefile:1.10
--- src/crypto/external/bsd/libsaslc/lib/Makefile:1.9 Sat Feb 3 22:19:52 2018
+++ src/crypto/external/bsd/libsaslc/lib/Makefile Mon May 8 22:19:32 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/02/04 03:19:52 christos Exp $
+# $NetBSD: Makefile,v 1.10 2023/05/09 02:19:32 christos Exp $
.include
@@ -58,6 +58,8 @@ LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypt
LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libssl
.if (${MKKERBEROS} != "no")
LIBDPLIBS+= gssapi ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libgssapi
+
+COPTS.crypto.c+=-Wno-error=deprecated-declarations
.endif
.include
CVS commit: src/crypto/external/bsd/openssh/lib
Module Name:src
Committed By: christos
Date: Tue May 9 02:08:31 UTC 2023
Modified Files:
src/crypto/external/bsd/openssh/lib: Makefile
Log Message:
Accomodate OpenSLL-3.x
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/lib/Makefile
diff -u src/crypto/external/bsd/openssh/lib/Makefile:1.34 src/crypto/external/bsd/openssh/lib/Makefile:1.35
--- src/crypto/external/bsd/openssh/lib/Makefile:1.34 Fri Mar 5 12:47:16 2021
+++ src/crypto/external/bsd/openssh/lib/Makefile Mon May 8 22:08:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2021/03/05 17:47:16 christos Exp $
+# $NetBSD: Makefile,v 1.35 2023/05/09 02:08:31 christos Exp $
.include
@@ -129,5 +129,20 @@ COPTS.umac.c+= -O0
COPTS.hostfile.c+= ${GCC_NO_FORMAT_TRUNCATION}
COPTS.sshkey.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.cipher.c+= -Wno-error=deprecated-declarations
+COPTS.dh.c+= -Wno-error=deprecated-declarations
+COPTS.kex.c+= -Wno-error=deprecated-declarations
+COPTS.kexdh.c+= -Wno-error=deprecated-declarations
+COPTS.kexecdh.c+= -Wno-error=deprecated-declarations
+COPTS.kexgexc.c+= -Wno-error=deprecated-declarations
+COPTS.ssh-dss.c+= -Wno-error=deprecated-declarations
+COPTS.ssh-ecdsa-sk.c+= -Wno-error=deprecated-declarations
+COPTS.ssh-ecdsa.c+= -Wno-error=deprecated-declarations
+COPTS.ssh-pkcs11.c+= -Wno-error=deprecated-declarations
+COPTS.ssh-rsa.c+= -Wno-error=deprecated-declarations
+COPTS.sshbuf-getput-crypto.c+= -Wno-error=deprecated-declarations
+COPTS.sshkey.c+= -Wno-error=deprecated-declarations
+COPTS.umac.c+= -Wno-error=deprecated-declarations
+COPTS.umac128.c+= -Wno-error=deprecated-declarations
.include
CVS commit: src/crypto/external/bsd/openssh/lib
Module Name:src Committed By: christos Date: Tue May 9 02:08:31 UTC 2023 Modified Files: src/crypto/external/bsd/openssh/lib: Makefile Log Message: Accomodate OpenSLL-3.x To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/httpd
Module Name:src
Committed By: christos
Date: Tue May 9 01:47:21 UTC 2023
Modified Files:
src/libexec/httpd: Makefile
Log Message:
accommodate OpenSSL-3.x
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/libexec/httpd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/Makefile
diff -u src/libexec/httpd/Makefile:1.31 src/libexec/httpd/Makefile:1.32
--- src/libexec/httpd/Makefile:1.31 Sat Feb 27 23:18:46 2021
+++ src/libexec/httpd/Makefile Mon May 8 21:47:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2021/02/28 04:18:46 mrg Exp $
+# $NetBSD: Makefile,v 1.32 2023/05/09 01:47:21 christos Exp $
#
# $eterna: Makefile,v 1.30 2010/07/11 00:34:27 mrg Exp $
#
@@ -33,6 +33,8 @@ SRCS= bozohttpd.c ssl-bozo.c auth-bozo.c
tilde-luzah-bozo.c dir-index-bozo.c content-bozo.c lua-bozo.c
SRCS+= main.c
+COPTS.ssl-bozo.c+=-Wno-error=deprecated-declarations
+
LDADD= -lblocklist -lcrypt -llua -lm
DPADD= ${LIBBLOCKLIST} ${LIBCRYPT} ${LIBLUA} ${LIBM}
CVS commit: src/libexec/httpd
Module Name:src Committed By: christos Date: Tue May 9 01:47:21 UTC 2023 Modified Files: src/libexec/httpd: Makefile Log Message: accommodate OpenSSL-3.x To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/libexec/httpd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/openldap/lib/libldap
Module Name:src
Committed By: christos
Date: Tue May 9 01:21:09 UTC 2023
Modified Files:
src/external/bsd/openldap/lib/libldap: Makefile.libldap
Log Message:
accommodate OpenSSL-3.x
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openldap/lib/libldap/Makefile.libldap
diff -u src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.13 src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.14
--- src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.13 Sun Sep 12 21:12:36 2021
+++ src/external/bsd/openldap/lib/libldap/Makefile.libldap Mon May 8 21:21:09 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libldap,v 1.13 2021/09/13 01:12:36 dholland Exp $
+# $NetBSD: Makefile.libldap,v 1.14 2023/05/09 01:21:09 christos Exp $
.include "../../openldap.mk"
@@ -22,6 +22,8 @@ SRCS+= tls2.c tls_o.c tls_g.c
CPPFLAGS+= -DLDAP_LIBRARY
+COPTS.tls_o.c+=-Wno-error=deprecated-declarations
+
LIBDPLIBS+= lber ${.CURDIR}/../liblber
.if ${USE_KERBEROS} != "no"
CVS commit: src/external/bsd/openldap/lib/libldap
Module Name:src Committed By: christos Date: Tue May 9 01:21:09 UTC 2023 Modified Files: src/external/bsd/openldap/lib/libldap: Makefile.libldap Log Message: accommodate OpenSSL-3.x To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/external/bsd/openldap/lib/libldap/Makefile.libldap 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/lib/netpgp
Module Name:src Committed By: christos Date: Tue May 9 00:14:44 UTC 2023 Modified Files: src/crypto/external/bsd/netpgp/lib/netpgp: Makefile Log Message: handle OpenSSL-3.x To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/lib/netpgp/Makefile 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/lib/netpgp
Module Name:src
Committed By: christos
Date: Tue May 9 00:14:44 UTC 2023
Modified Files:
src/crypto/external/bsd/netpgp/lib/netpgp: Makefile
Log Message:
handle OpenSSL-3.x
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/lib/netpgp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/lib/netpgp/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/netpgp/Makefile:1.4 src/crypto/external/bsd/netpgp/lib/netpgp/Makefile:1.5
--- src/crypto/external/bsd/netpgp/lib/netpgp/Makefile:1.4 Sun Oct 13 03:28:05 2019
+++ src/crypto/external/bsd/netpgp/lib/netpgp/Makefile Mon May 8 20:14:44 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/10/13 07:28:05 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/05/09 00:14:44 christos Exp $
.include
@@ -27,5 +27,7 @@ LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
COPTS.crypto.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.openssl_crypto.c+=-Wno-error=deprecated-declarations
+COPTS.symmetric.c+=-Wno-error=deprecated-declarations
.include
CVS commit: src/external/bsd/libfido2
Module Name:src
Committed By: christos
Date: Mon May 8 23:45:52 UTC 2023
Modified Files:
src/external/bsd/libfido2/bin/fido2-assert: Makefile
src/external/bsd/libfido2/bin/fido2-cred: Makefile
src/external/bsd/libfido2/bin/fido2-token: Makefile
src/external/bsd/libfido2/dist/src: assert.c cred.c
src/external/bsd/libfido2/lib: Makefile
Log Message:
Handle OpenSSL-3.x
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/bin/fido2-assert/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/bin/fido2-cred/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/bin/fido2-token/Makefile
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/libfido2/dist/src/assert.c \
src/external/bsd/libfido2/dist/src/cred.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/libfido2/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libfido2/bin/fido2-assert/Makefile
diff -u src/external/bsd/libfido2/bin/fido2-assert/Makefile:1.2 src/external/bsd/libfido2/bin/fido2-assert/Makefile:1.3
--- src/external/bsd/libfido2/bin/fido2-assert/Makefile:1.2 Wed Jun 16 21:15:44 2021
+++ src/external/bsd/libfido2/bin/fido2-assert/Makefile Mon May 8 19:45:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/06/17 01:15:44 christos Exp $
+# $NetBSD: Makefile,v 1.3 2023/05/08 23:45:52 christos Exp $
.include
@@ -24,4 +24,7 @@ freezero.c \
readpassphrase.c \
recallocarray.c
+COPTS.assert_verify.c+=-Wno-error=deprecated-declarations
+COPTS.util.c+=-Wno-error=deprecated-declarations
+
.include
Index: src/external/bsd/libfido2/bin/fido2-cred/Makefile
diff -u src/external/bsd/libfido2/bin/fido2-cred/Makefile:1.2 src/external/bsd/libfido2/bin/fido2-cred/Makefile:1.3
--- src/external/bsd/libfido2/bin/fido2-cred/Makefile:1.2 Wed Jun 16 21:15:44 2021
+++ src/external/bsd/libfido2/bin/fido2-cred/Makefile Mon May 8 19:45:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/06/17 01:15:44 christos Exp $
+# $NetBSD: Makefile,v 1.3 2023/05/08 23:45:52 christos Exp $
.include
@@ -24,4 +24,6 @@ freezero.c \
readpassphrase.c \
recallocarray.c
+COPTS.util.c+=-Wno-error=deprecated-declarations
+
.include
Index: src/external/bsd/libfido2/bin/fido2-token/Makefile
diff -u src/external/bsd/libfido2/bin/fido2-token/Makefile:1.2 src/external/bsd/libfido2/bin/fido2-token/Makefile:1.3
--- src/external/bsd/libfido2/bin/fido2-token/Makefile:1.2 Wed Jun 16 21:15:44 2021
+++ src/external/bsd/libfido2/bin/fido2-token/Makefile Mon May 8 19:45:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/06/17 01:15:44 christos Exp $
+# $NetBSD: Makefile,v 1.3 2023/05/08 23:45:52 christos Exp $
.include
@@ -22,4 +22,6 @@ freezero.c \
readpassphrase.c \
recallocarray.c
+COPTS.util.c+=-Wno-error=deprecated-declarations
+
.include
Index: src/external/bsd/libfido2/dist/src/assert.c
diff -u src/external/bsd/libfido2/dist/src/assert.c:1.1.1.4 src/external/bsd/libfido2/dist/src/assert.c:1.2
--- src/external/bsd/libfido2/dist/src/assert.c:1.1.1.4 Fri Sep 24 08:43:29 2021
+++ src/external/bsd/libfido2/dist/src/assert.c Mon May 8 19:45:52 2023
@@ -430,7 +430,7 @@ fido_verify_sig_es256(const fido_blob_t
}
if ((pkey = es256_pk_to_EVP_PKEY(pk)) == NULL ||
- (ec = EVP_PKEY_get0_EC_KEY(pkey)) == NULL) {
+ (ec = __UNCONST(EVP_PKEY_get0_EC_KEY(pkey))) == NULL) {
fido_log_debug("%s: pk -> ec", __func__);
goto fail;
}
@@ -465,7 +465,7 @@ fido_verify_sig_rs256(const fido_blob_t
}
if ((pkey = rs256_pk_to_EVP_PKEY(pk)) == NULL ||
- (rsa = EVP_PKEY_get0_RSA(pkey)) == NULL) {
+ (rsa = __UNCONST(EVP_PKEY_get0_RSA(pkey))) == NULL) {
fido_log_debug("%s: pk -> ec", __func__);
goto fail;
}
Index: src/external/bsd/libfido2/dist/src/cred.c
diff -u src/external/bsd/libfido2/dist/src/cred.c:1.1.1.4 src/external/bsd/libfido2/dist/src/cred.c:1.2
--- src/external/bsd/libfido2/dist/src/cred.c:1.1.1.4 Fri Sep 24 08:43:29 2021
+++ src/external/bsd/libfido2/dist/src/cred.c Mon May 8 19:45:52 2023
@@ -266,7 +266,7 @@ verify_sig(const fido_blob_t *dgst, cons
if ((rawcert = BIO_new_mem_buf(x5c->ptr, (int)x5c->len)) == NULL ||
(cert = d2i_X509_bio(rawcert, NULL)) == NULL ||
(pkey = X509_get_pubkey(cert)) == NULL ||
- (ec = EVP_PKEY_get0_EC_KEY(pkey)) == NULL) {
+ (ec = __UNCONST(EVP_PKEY_get0_EC_KEY(pkey))) == NULL) {
fido_log_debug("%s: x509 key", __func__);
goto fail;
}
Index: src/external/bsd/libfido2/lib/Makefile
diff -u src/external/bsd/libfido2/lib/Makefile:1.8 src/external/bsd/libfido2/lib/Makefile:1.9
--- src/external/bsd/libfido2/lib/Makefile:1.8 Fri Sep 24 09:07:34 2021
+++ src/external/bsd/libfido2/lib/Makefile Mon May 8 19:45:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/09/24 13:07:34 christos Exp $
+# $NetBSD: Makefile,v 1.9 2023/05/08 23:45:52 christos Exp $
NOLINT=
CVS commit: src/external/bsd/libfido2
Module Name:src Committed By: christos Date: Mon May 8 23:45:52 UTC 2023 Modified Files: src/external/bsd/libfido2/bin/fido2-assert: Makefile src/external/bsd/libfido2/bin/fido2-cred: Makefile src/external/bsd/libfido2/bin/fido2-token: Makefile src/external/bsd/libfido2/dist/src: assert.c cred.c src/external/bsd/libfido2/lib: Makefile Log Message: Handle OpenSSL-3.x To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/bin/fido2-assert/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/bin/fido2-cred/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/bin/fido2-token/Makefile cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/libfido2/dist/src/assert.c \ src/external/bsd/libfido2/dist/src/cred.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/libfido2/lib/Makefile 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/heimdal/lib
Module Name:src
Committed By: christos
Date: Mon May 8 22:17:37 UTC 2023
Modified Files:
src/crypto/external/bsd/heimdal/lib/libgssapi: Makefile
src/crypto/external/bsd/heimdal/lib/libheimntlm: Makefile
src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
src/crypto/external/bsd/heimdal/lib/libkafs: Makefile
src/crypto/external/bsd/heimdal/lib/libkdc: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
Log Message:
handle OpenSSL-3 deprecations
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libkafs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.5 src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.6
--- src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.5 Tue Jul 10 09:17:36 2018
+++ src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile Mon May 8 18:17:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/07/10 13:17:36 martin Exp $
+# $NetBSD: Makefile,v 1.6 2023/05/08 22:17:36 christos Exp $
USE_FORT?= yes# network protocol library
@@ -276,5 +276,13 @@ CPPFLAGS+= \
-I${HEIMDIST}/lib/krb5 \
-I${HEIMDIST}/lib/asn1 \
+COPTS.krb5__get_mic.c+= -Wno-error=deprecated-declarations
+COPTS.krb5__wrap.c+= -Wno-error=deprecated-declarations
+COPTS.krb5__unwrap.c+= -Wno-error=deprecated-declarations
+COPTS.krb5__verify_mic.c+= -Wno-error=deprecated-declarations
+COPTS.ntlm__accept_sec_context.c+= -Wno-error=deprecated-declarations
+COPTS.ntlm__crypto.c+= -Wno-error=deprecated-declarations
+COPTS.ntlm__init_sec_context.c+= -Wno-error=deprecated-declarations
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include
Index: src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.3 Fri Jul 6 04:31:43 2018
+++ src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile Mon May 8 18:17:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/07/06 08:31:43 martin Exp $
+# $NetBSD: Makefile,v 1.4 2023/05/08 22:17:36 christos Exp $
USE_FORT?= yes # cryptographic software
@@ -24,5 +24,7 @@ INCS= heimntlm.h heimntlm-protos.h ${CO
INCSDIR= /usr/include/krb5
+COPTS.ntlm.c+= -Wno-error=deprecated-declarations
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include
Index: src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.7 src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.8
--- src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.7 Sun Jun 20 06:38:54 2021
+++ src/crypto/external/bsd/heimdal/lib/libhx509/Makefile Mon May 8 18:17:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/06/20 10:38:54 christos Exp $
+# $NetBSD: Makefile,v 1.8 2023/05/08 22:17:36 christos Exp $
NOLINT= # defined
@@ -85,5 +85,10 @@ ASN1_FILES.ocsp.asn1 = \
asn1_id_pkix_ocsp_basic.x \
asn1_id_pkix_ocsp_nonce.x
+COPTS.cert.c += -Wno-error=deprecated-declarations
+COPTS.crypto-ec.c += -Wno-error=deprecated-declarations
+COPTS.crypto.c += -Wno-error=deprecated-declarations
+COPTS.ks_p11.c += -Wno-error=deprecated-declarations
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include
Index: src/crypto/external/bsd/heimdal/lib/libkafs/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkafs/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libkafs/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libkafs/Makefile:1.3 Sat Jan 28 16:31:52 2017
+++ src/crypto/external/bsd/heimdal/lib/libkafs/Makefile Mon May 8 18:17:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/05/08 22:17:37 christos Exp $
USE_FORT?= yes # network protocol library
@@ -21,5 +21,7 @@ INCS= kafs.h
INCSDIR= /usr/include/krb5
MAN= kafs.3
+COPTS.rxkad_kdf.c+= -Wno-error=deprecated-declarations
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include
Index: src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.5
--- src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.4 Fri Jul 6 04:54:30 2018
+++
CVS commit: src/crypto/external/bsd/heimdal/lib
Module Name:src Committed By: christos Date: Mon May 8 22:17:37 UTC 2023 Modified Files: src/crypto/external/bsd/heimdal/lib/libgssapi: Makefile src/crypto/external/bsd/heimdal/lib/libheimntlm: Makefile src/crypto/external/bsd/heimdal/lib/libhx509: Makefile src/crypto/external/bsd/heimdal/lib/libkafs: Makefile src/crypto/external/bsd/heimdal/lib/libkdc: Makefile src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile Log Message: handle OpenSSL-3 deprecations To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/heimdal/lib/libhx509/Makefile cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libkafs/Makefile cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/libarchive/lib/libarchive
Module Name:src
Committed By: christos
Date: Mon May 8 21:20:29 UTC 2023
Modified Files:
src/external/bsd/libarchive/lib/libarchive: Makefile
Log Message:
Elide OpenSSL-3 deprecation warning
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/bsd/libarchive/lib/libarchive/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/lib/libarchive/Makefile
diff -u src/external/bsd/libarchive/lib/libarchive/Makefile:1.14 src/external/bsd/libarchive/lib/libarchive/Makefile:1.15
--- src/external/bsd/libarchive/lib/libarchive/Makefile:1.14 Fri Jul 22 11:43:37 2022
+++ src/external/bsd/libarchive/lib/libarchive/Makefile Mon May 8 17:20:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2022/07/22 15:43:37 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2023/05/08 21:20:29 christos Exp $
.include
@@ -456,6 +456,7 @@ COPTS.archive_read_support_format_mtree.
COPTS.archive_read_support_format_rar5.c+= ${GCC_NO_MAYBE_UNINITIALIZED}
COPTS.target.c+=${GCC_NO_STRINGOP_TRUNCATION}
COPTS.archive_write_set_format_iso9660.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.archive_hmac.c+= -Wno-error=deprecated-declarations
FILES+=libarchive.pc
FILESOWN_libarchive.pc= ${BINOWN}
CVS commit: src/external/bsd/libarchive/lib/libarchive
Module Name:src Committed By: christos Date: Mon May 8 21:20:29 UTC 2023 Modified Files: src/external/bsd/libarchive/lib/libarchive: Makefile Log Message: Elide OpenSSL-3 deprecation warning To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 \ src/external/bsd/libarchive/lib/libarchive/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: skrll Date: Mon May 8 20:58:17 UTC 2023 Modified Files: src/share/mk: bsd.own.mk Log Message: RISC-V: enabled GDB To generate a diff of this commit: cvs rdiff -u -r1.1312 -r1.1313 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.
CVS commit: src/share/mk
Module Name:src Committed By: skrll Date: Mon May 8 20:58:17 UTC 2023 Modified Files: src/share/mk: bsd.own.mk Log Message: RISC-V: enabled GDB To generate a diff of this commit: cvs rdiff -u -r1.1312 -r1.1313 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.1312 src/share/mk/bsd.own.mk:1.1313 --- src/share/mk/bsd.own.mk:1.1312 Sun May 7 12:41:48 2023 +++ src/share/mk/bsd.own.mk Mon May 8 20:58:17 2023 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1312 2023/05/07 12:41:48 skrll Exp $ +# $NetBSD: bsd.own.mk,v 1.1313 2023/05/08 20:58:17 skrll Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -844,8 +844,6 @@ MKGCC:= no .endif MKGDB.or1k= no -MKGDB.riscv32= no -MKGDB.riscv64= no # No kernel modules for or1k or riscv (yet) MKKMOD.or1k= no
CVS commit: src/external/gpl3/gdb.old/lib
Module Name:src Committed By: skrll Date: Mon May 8 20:57:38 UTC 2023 Modified Files: src/external/gpl3/gdb.old/lib/libbfd: Makefile Added Files: src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb.old/lib/libctf/arch/riscv32: config.h defs.mk src/external/gpl3/gdb.old/lib/libctf/arch/riscv64: config.h defs.mk src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv32: config.h defs.mk gstdint.h src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv64: config.h defs.mk gstdint.h src/external/gpl3/gdb.old/lib/libgdb/arch/riscv32: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb.old/lib/libgdb/arch/riscv64: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb.old/lib/libgdbsupport/arch/riscv32: defs.mk src/external/gpl3/gdb.old/lib/libgdbsupport/arch/riscv32/gdbsupport: config.h src/external/gpl3/gdb.old/lib/libgdbsupport/arch/riscv64: defs.mk src/external/gpl3/gdb.old/lib/libgdbsupport/arch/riscv64/gdbsupport: config.h src/external/gpl3/gdb.old/lib/libgnulib/arch/riscv32: defs.mk src/external/gpl3/gdb.old/lib/libgnulib/arch/riscv32/gnulib: config.h src/external/gpl3/gdb.old/lib/libgnulib/arch/riscv32/gnulib/import: alloca.h ctype.h dirent.h fcntl.h fnmatch.h glob.h inttypes.h limits.h locale.h math.h signal.h stdint.h stdio.h stdlib.h string.h time.h unistd.h wchar.h wctype.h src/external/gpl3/gdb.old/lib/libgnulib/arch/riscv64: defs.mk src/external/gpl3/gdb.old/lib/libgnulib/arch/riscv64/gnulib: config.h src/external/gpl3/gdb.old/lib/libgnulib/arch/riscv64/gnulib/import: alloca.h ctype.h dirent.h fcntl.h fnmatch.h glob.h inttypes.h limits.h locale.h math.h signal.h stdint.h stdio.h stdlib.h string.h time.h unistd.h wchar.h wctype.h src/external/gpl3/gdb.old/lib/libiberty/arch/riscv32: config.h defs.mk src/external/gpl3/gdb.old/lib/libiberty/arch/riscv64: config.h defs.mk src/external/gpl3/gdb.old/lib/libopcodes/arch/riscv32: config.h defs.mk src/external/gpl3/gdb.old/lib/libopcodes/arch/riscv64: config.h defs.mk src/external/gpl3/gdb.old/lib/libreadline/arch/riscv32: config.h defs.mk src/external/gpl3/gdb.old/lib/libreadline/arch/riscv64: config.h defs.mk Log Message: RISC-V mknative and build support for gdb.old To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gdb.old/lib/libbfd/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32/bfd-in3.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32/bfd.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32/bfd_stdint.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32/bfdver.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32/config.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32/defs.mk \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32/targmatch.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64/bfd-in3.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64/bfd.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64/bfd_stdint.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64/bfdver.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64/config.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64/defs.mk \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64/targmatch.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb.old/lib/libctf/arch/riscv32/config.h \ src/external/gpl3/gdb.old/lib/libctf/arch/riscv32/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb.old/lib/libctf/arch/riscv64/config.h \ src/external/gpl3/gdb.old/lib/libctf/arch/riscv64/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv32/config.h \ src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv32/defs.mk \ src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv32/gstdint.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv64/config.h \ src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv64/defs.mk \ src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv64/gstdint.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb.old/lib/libgdb/arch/riscv32/config.h \ src/external/gpl3/gdb.old/lib/libgdb/arch/riscv32/defs.mk \ src/external/gpl3/gdb.old/lib/libgdb/arch/riscv32/init.c \ src/external/gpl3/gdb.old/lib/libgdb/arch/riscv32/jit-reader.h \
CVS commit: src/external/gpl3/gdb.old/lib
Module Name:src Committed By: skrll Date: Mon May 8 20:57:38 UTC 2023 Modified Files: src/external/gpl3/gdb.old/lib/libbfd: Makefile Added Files: src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb.old/lib/libctf/arch/riscv32: config.h defs.mk src/external/gpl3/gdb.old/lib/libctf/arch/riscv64: config.h defs.mk src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv32: config.h defs.mk gstdint.h src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv64: config.h defs.mk gstdint.h src/external/gpl3/gdb.old/lib/libgdb/arch/riscv32: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb.old/lib/libgdb/arch/riscv64: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb.old/lib/libgdbsupport/arch/riscv32: defs.mk src/external/gpl3/gdb.old/lib/libgdbsupport/arch/riscv32/gdbsupport: config.h src/external/gpl3/gdb.old/lib/libgdbsupport/arch/riscv64: defs.mk src/external/gpl3/gdb.old/lib/libgdbsupport/arch/riscv64/gdbsupport: config.h src/external/gpl3/gdb.old/lib/libgnulib/arch/riscv32: defs.mk src/external/gpl3/gdb.old/lib/libgnulib/arch/riscv32/gnulib: config.h src/external/gpl3/gdb.old/lib/libgnulib/arch/riscv32/gnulib/import: alloca.h ctype.h dirent.h fcntl.h fnmatch.h glob.h inttypes.h limits.h locale.h math.h signal.h stdint.h stdio.h stdlib.h string.h time.h unistd.h wchar.h wctype.h src/external/gpl3/gdb.old/lib/libgnulib/arch/riscv64: defs.mk src/external/gpl3/gdb.old/lib/libgnulib/arch/riscv64/gnulib: config.h src/external/gpl3/gdb.old/lib/libgnulib/arch/riscv64/gnulib/import: alloca.h ctype.h dirent.h fcntl.h fnmatch.h glob.h inttypes.h limits.h locale.h math.h signal.h stdint.h stdio.h stdlib.h string.h time.h unistd.h wchar.h wctype.h src/external/gpl3/gdb.old/lib/libiberty/arch/riscv32: config.h defs.mk src/external/gpl3/gdb.old/lib/libiberty/arch/riscv64: config.h defs.mk src/external/gpl3/gdb.old/lib/libopcodes/arch/riscv32: config.h defs.mk src/external/gpl3/gdb.old/lib/libopcodes/arch/riscv64: config.h defs.mk src/external/gpl3/gdb.old/lib/libreadline/arch/riscv32: config.h defs.mk src/external/gpl3/gdb.old/lib/libreadline/arch/riscv64: config.h defs.mk Log Message: RISC-V mknative and build support for gdb.old To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gdb.old/lib/libbfd/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32/bfd-in3.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32/bfd.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32/bfd_stdint.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32/bfdver.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32/config.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32/defs.mk \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv32/targmatch.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64/bfd-in3.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64/bfd.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64/bfd_stdint.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64/bfdver.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64/config.h \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64/defs.mk \ src/external/gpl3/gdb.old/lib/libbfd/arch/riscv64/targmatch.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb.old/lib/libctf/arch/riscv32/config.h \ src/external/gpl3/gdb.old/lib/libctf/arch/riscv32/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb.old/lib/libctf/arch/riscv64/config.h \ src/external/gpl3/gdb.old/lib/libctf/arch/riscv64/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv32/config.h \ src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv32/defs.mk \ src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv32/gstdint.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv64/config.h \ src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv64/defs.mk \ src/external/gpl3/gdb.old/lib/libdecnumber/arch/riscv64/gstdint.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb.old/lib/libgdb/arch/riscv32/config.h \ src/external/gpl3/gdb.old/lib/libgdb/arch/riscv32/defs.mk \ src/external/gpl3/gdb.old/lib/libgdb/arch/riscv32/init.c \ src/external/gpl3/gdb.old/lib/libgdb/arch/riscv32/jit-reader.h \
CVS commit: src/external/gpl3/gdb/lib
Module Name:src Committed By: skrll Date: Mon May 8 20:56:22 UTC 2023 Modified Files: src/external/gpl3/gdb/lib/libbfd: Makefile Added Files: src/external/gpl3/gdb/lib/libbfd/arch/riscv32: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libbfd/arch/riscv64: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libctf/arch/riscv32: config.h defs.mk src/external/gpl3/gdb/lib/libctf/arch/riscv64: config.h defs.mk src/external/gpl3/gdb/lib/libdecnumber/arch/riscv32: config.h defs.mk gstdint.h src/external/gpl3/gdb/lib/libdecnumber/arch/riscv64: config.h defs.mk gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/riscv32: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/riscv64: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdbsupport/arch/riscv32: defs.mk src/external/gpl3/gdb/lib/libgdbsupport/arch/riscv32/gdbsupport: config.h src/external/gpl3/gdb/lib/libgdbsupport/arch/riscv64: defs.mk src/external/gpl3/gdb/lib/libgdbsupport/arch/riscv64/gdbsupport: config.h src/external/gpl3/gdb/lib/libgnulib/arch/riscv32: defs.mk src/external/gpl3/gdb/lib/libgnulib/arch/riscv32/gnulib: config.h src/external/gpl3/gdb/lib/libgnulib/arch/riscv32/gnulib/import: alloca.h ctype.h dirent.h fcntl.h fnmatch.h glob.h inttypes.h limits.h locale.h math.h signal.h stdint.h stdio.h stdlib.h string.h time.h unistd.h wchar.h wctype.h src/external/gpl3/gdb/lib/libgnulib/arch/riscv64: defs.mk src/external/gpl3/gdb/lib/libgnulib/arch/riscv64/gnulib: config.h src/external/gpl3/gdb/lib/libgnulib/arch/riscv64/gnulib/import: alloca.h ctype.h dirent.h fcntl.h fnmatch.h glob.h inttypes.h limits.h locale.h math.h signal.h stdint.h stdio.h stdlib.h string.h time.h unistd.h wchar.h wctype.h src/external/gpl3/gdb/lib/libiberty/arch/riscv32: config.h defs.mk src/external/gpl3/gdb/lib/libiberty/arch/riscv64: config.h defs.mk src/external/gpl3/gdb/lib/libopcodes/arch/riscv32: config.h defs.mk src/external/gpl3/gdb/lib/libopcodes/arch/riscv64: config.h defs.mk src/external/gpl3/gdb/lib/libreadline/arch/riscv32: config.h defs.mk src/external/gpl3/gdb/lib/libreadline/arch/riscv64: config.h defs.mk Log Message: RISC-V mknative and build support. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gdb/lib/libbfd/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libbfd/arch/riscv32/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv32/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv32/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv32/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv32/config.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv32/defs.mk \ src/external/gpl3/gdb/lib/libbfd/arch/riscv32/targmatch.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libbfd/arch/riscv64/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv64/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv64/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv64/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv64/config.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv64/defs.mk \ src/external/gpl3/gdb/lib/libbfd/arch/riscv64/targmatch.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libctf/arch/riscv32/config.h \ src/external/gpl3/gdb/lib/libctf/arch/riscv32/defs.mk cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libctf/arch/riscv64/config.h \ src/external/gpl3/gdb/lib/libctf/arch/riscv64/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libdecnumber/arch/riscv32/config.h \ src/external/gpl3/gdb/lib/libdecnumber/arch/riscv32/defs.mk \ src/external/gpl3/gdb/lib/libdecnumber/arch/riscv32/gstdint.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libdecnumber/arch/riscv64/config.h \ src/external/gpl3/gdb/lib/libdecnumber/arch/riscv64/defs.mk \ src/external/gpl3/gdb/lib/libdecnumber/arch/riscv64/gstdint.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libgdb/arch/riscv32/config.h \ src/external/gpl3/gdb/lib/libgdb/arch/riscv32/defs.mk \ src/external/gpl3/gdb/lib/libgdb/arch/riscv32/init.c \ src/external/gpl3/gdb/lib/libgdb/arch/riscv32/jit-reader.h \ src/external/gpl3/gdb/lib/libgdb/arch/riscv32/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/riscv32/xml-builtin.c cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libgdb/arch/riscv64/config.h \ src/external/gpl3/gdb/lib/libgdb/arch/riscv64/defs.mk \
CVS commit: src/external/gpl3/gdb/lib
Module Name:src Committed By: skrll Date: Mon May 8 20:56:22 UTC 2023 Modified Files: src/external/gpl3/gdb/lib/libbfd: Makefile Added Files: src/external/gpl3/gdb/lib/libbfd/arch/riscv32: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libbfd/arch/riscv64: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libctf/arch/riscv32: config.h defs.mk src/external/gpl3/gdb/lib/libctf/arch/riscv64: config.h defs.mk src/external/gpl3/gdb/lib/libdecnumber/arch/riscv32: config.h defs.mk gstdint.h src/external/gpl3/gdb/lib/libdecnumber/arch/riscv64: config.h defs.mk gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/riscv32: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/riscv64: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdbsupport/arch/riscv32: defs.mk src/external/gpl3/gdb/lib/libgdbsupport/arch/riscv32/gdbsupport: config.h src/external/gpl3/gdb/lib/libgdbsupport/arch/riscv64: defs.mk src/external/gpl3/gdb/lib/libgdbsupport/arch/riscv64/gdbsupport: config.h src/external/gpl3/gdb/lib/libgnulib/arch/riscv32: defs.mk src/external/gpl3/gdb/lib/libgnulib/arch/riscv32/gnulib: config.h src/external/gpl3/gdb/lib/libgnulib/arch/riscv32/gnulib/import: alloca.h ctype.h dirent.h fcntl.h fnmatch.h glob.h inttypes.h limits.h locale.h math.h signal.h stdint.h stdio.h stdlib.h string.h time.h unistd.h wchar.h wctype.h src/external/gpl3/gdb/lib/libgnulib/arch/riscv64: defs.mk src/external/gpl3/gdb/lib/libgnulib/arch/riscv64/gnulib: config.h src/external/gpl3/gdb/lib/libgnulib/arch/riscv64/gnulib/import: alloca.h ctype.h dirent.h fcntl.h fnmatch.h glob.h inttypes.h limits.h locale.h math.h signal.h stdint.h stdio.h stdlib.h string.h time.h unistd.h wchar.h wctype.h src/external/gpl3/gdb/lib/libiberty/arch/riscv32: config.h defs.mk src/external/gpl3/gdb/lib/libiberty/arch/riscv64: config.h defs.mk src/external/gpl3/gdb/lib/libopcodes/arch/riscv32: config.h defs.mk src/external/gpl3/gdb/lib/libopcodes/arch/riscv64: config.h defs.mk src/external/gpl3/gdb/lib/libreadline/arch/riscv32: config.h defs.mk src/external/gpl3/gdb/lib/libreadline/arch/riscv64: config.h defs.mk Log Message: RISC-V mknative and build support. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gdb/lib/libbfd/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libbfd/arch/riscv32/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv32/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv32/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv32/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv32/config.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv32/defs.mk \ src/external/gpl3/gdb/lib/libbfd/arch/riscv32/targmatch.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libbfd/arch/riscv64/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv64/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv64/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv64/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv64/config.h \ src/external/gpl3/gdb/lib/libbfd/arch/riscv64/defs.mk \ src/external/gpl3/gdb/lib/libbfd/arch/riscv64/targmatch.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libctf/arch/riscv32/config.h \ src/external/gpl3/gdb/lib/libctf/arch/riscv32/defs.mk cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libctf/arch/riscv64/config.h \ src/external/gpl3/gdb/lib/libctf/arch/riscv64/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libdecnumber/arch/riscv32/config.h \ src/external/gpl3/gdb/lib/libdecnumber/arch/riscv32/defs.mk \ src/external/gpl3/gdb/lib/libdecnumber/arch/riscv32/gstdint.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libdecnumber/arch/riscv64/config.h \ src/external/gpl3/gdb/lib/libdecnumber/arch/riscv64/defs.mk \ src/external/gpl3/gdb/lib/libdecnumber/arch/riscv64/gstdint.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libgdb/arch/riscv32/config.h \ src/external/gpl3/gdb/lib/libgdb/arch/riscv32/defs.mk \ src/external/gpl3/gdb/lib/libgdb/arch/riscv32/init.c \ src/external/gpl3/gdb/lib/libgdb/arch/riscv32/jit-reader.h \ src/external/gpl3/gdb/lib/libgdb/arch/riscv32/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/riscv32/xml-builtin.c cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libgdb/arch/riscv64/config.h \ src/external/gpl3/gdb/lib/libgdb/arch/riscv64/defs.mk \
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: skrll Date: Mon May 8 20:51:53 UTC 2023 Modified Files: src/sys/arch/riscv/include: proc.h Log Message: Don't expose vaddr_t or register_t to userland. The gdb configure script needs this so it can detect struct lwp correctly. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/include/proc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/riscv/include
Module Name:src
Committed By: skrll
Date: Mon May 8 20:51:53 UTC 2023
Modified Files:
src/sys/arch/riscv/include: proc.h
Log Message:
Don't expose vaddr_t or register_t to userland. The gdb configure script
needs this so it can detect struct lwp correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/include/proc.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/riscv/include/proc.h
diff -u src/sys/arch/riscv/include/proc.h:1.4 src/sys/arch/riscv/include/proc.h:1.5
--- src/sys/arch/riscv/include/proc.h:1.4 Sun May 7 12:41:48 2023
+++ src/sys/arch/riscv/include/proc.h Mon May 8 20:51:53 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.4 2023/05/07 12:41:48 skrll Exp $ */
+/* $NetBSD: proc.h,v 1.5 2023/05/08 20:51:53 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -46,8 +46,8 @@ struct mdlwp {
struct trapframe *md_utf; /* trapframe from userspace */
struct trapframe *md_ktf; /* trapframe from userspace */
struct faultbuf *md_onfault; /* registers to store on fault */
- register_t md_usp; /* for locore.S */
- vaddr_t md_ss_addr; /* single step address for ptrace */
+ unsigned long md_usp; /* for locore.S */
+ unsigned long md_ss_addr; /* single step address for ptrace */
int md_ss_instr; /* single step instruction for ptrace */
volatile int md_astpending; /* AST pending on return to userland */
#if 0
CVS commit: src/tests/fs/vfs
Module Name:src
Committed By: andvar
Date: Mon May 8 19:23:45 UTC 2023
Modified Files:
src/tests/fs/vfs: t_vnops.c
Log Message:
fix the grammar in comments reported by Jim Spath in misc/57397.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/tests/fs/vfs/t_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/tests/fs/vfs/t_vnops.c
diff -u src/tests/fs/vfs/t_vnops.c:1.62 src/tests/fs/vfs/t_vnops.c:1.63
--- src/tests/fs/vfs/t_vnops.c:1.62 Tue Feb 1 18:27:24 2022
+++ src/tests/fs/vfs/t_vnops.c Mon May 8 19:23:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: t_vnops.c,v 1.62 2022/02/01 18:27:24 martin Exp $ */
+/* $NetBSD: t_vnops.c,v 1.63 2023/05/08 19:23:45 andvar Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -104,9 +104,9 @@ lookup_complex(const atf_tc_t *tc, const
* The lookup is permitted to modify the access time of
* any directories searched - such a directory is the
* subject of this test. Any difference should cause
- * the 2nd lookup atime tp be >= the first, if it is ==, all is
+ * the 2nd lookup atime to be >= the first, if it is ==, all is
* OK (atime is not required to be modified by the search, or
- * both references may happen within the came clock tick), if the
+ * both references may happen within the same clock tick), if the
* 2nd lookup atime is > the first, but not "too much" greater,
* just set it back, so the memcmp just below succeeds
* (assuming all else is OK).
@@ -167,7 +167,7 @@ dir_simple(const atf_tc_t *tc, const cha
if (rump_sys_stat(pb, ) == -1)
atf_tc_fail_errno("stat new directory");
- /* check we can remove then and that it makes them unreachable */
+ /* check we can remove them and that it makes them unreachable */
if (rump_sys_rmdir(pb) == -1)
atf_tc_fail_errno("rmdir");
if (rump_sys_stat(pb, ) != -1 || errno != ENOENT)
CVS commit: src/tests/fs/vfs
Module Name:src Committed By: andvar Date: Mon May 8 19:23:45 UTC 2023 Modified Files: src/tests/fs/vfs: t_vnops.c Log Message: fix the grammar in comments reported by Jim Spath in misc/57397. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/tests/fs/vfs/t_vnops.c 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/openssl/lib/libcrypto
Module Name:src Committed By: christos Date: Mon May 8 19:14:28 UTC 2023 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto: Makefile Log Message: put back ssl.h in libcrypto it is also in libssl To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 \ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile 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/openssl/lib/libcrypto
Module Name:src Committed By: christos Date: Mon May 8 19:14:28 UTC 2023 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto: Makefile Log Message: put back ssl.h in libcrypto it is also in libssl To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 \ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/lib/libcrypto/Makefile diff -u src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.25 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.26 --- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.25 Sun May 7 15:13:15 2023 +++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile Mon May 8 15:14:28 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2023/05/07 19:13:15 christos Exp $ +# $NetBSD: Makefile,v 1.26 2023/05/08 19:14:28 christos Exp $ # RCSid: # Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp @@ -282,6 +282,7 @@ pkcs12.h \ pkcs7.h \ safestack.h \ srp.h \ +ssl.h \ ui.h \ x509.h \ x509_vfy.h \
CVS commit: src/doc
Module Name:src Committed By: nia Date: Mon May 8 18:39:36 UTC 2023 Modified Files: src/doc: CHANGES Log Message: doc: Add recent changes. To generate a diff of this commit: cvs rdiff -u -r1.2962 -r1.2963 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.2962 src/doc/CHANGES:1.2963 --- src/doc/CHANGES:1.2962 Sun May 7 18:15:38 2023 +++ src/doc/CHANGES Mon May 8 18:39:36 2023 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2962 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2963 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -84,6 +84,21 @@ Changes from NetBSD 10.0 to NetBSD 11.0: lua: Import version 5.4.4. Bumped shlib major because of incompatible API/ABI changes. [nikita 20230416] + evbarm: Install a boot.cfg file for the EFI bootloader by default. + [brook 20230419] dhcpcd: Import version 10.0.1. [roy 20230421] + evbarm: Enable rkv1crypto driver on Rock64. [mrg 20230424] + worms(6): Add a little bit of optional colour, code and + ideas from RVP. [kre 20230426] + amiga: Add driver for the MNT ZZ9000 Zorro board - submitted by + Alain Runa. [phx 20230503] + evbarm: Experimental IMX6SX support - tested on the UDOO Neo Full board. + [bouyer 20230504] + chown(8): Add a -d flag to avoid changing a file's owner/group to the + current value. This avoids some unnecessary operations on the + file. [pgoyette 20230504] ftp(1): Add timeout for SSL connection setup, defaulting to 60 seconds. [lukem 20230505] + riscv: Add RISC-V support that works on QEMU with a single hart. + [skrll 20230507] + riscv: Add Google Goldfish RTC driver. [skrll 20230508]
CVS commit: src/doc
Module Name:src Committed By: nia Date: Mon May 8 18:39:36 UTC 2023 Modified Files: src/doc: CHANGES Log Message: doc: Add recent changes. To generate a diff of this commit: cvs rdiff -u -r1.2962 -r1.2963 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/crypto/libcrypto
Module Name:src
Committed By: christos
Date: Mon May 8 17:46:06 UTC 2023
Modified Files:
src/tests/crypto/libcrypto: Makefile Makefile.inc t_hashes.sh
t_libcrypto.sh t_pubkey.sh
src/tests/crypto/libcrypto/conf: Makefile
src/tests/crypto/libcrypto/dh: Makefile
src/tests/crypto/libcrypto/evp: Makefile
src/tests/crypto/libcrypto/threads: Makefile
Added Files:
src/tests/crypto/libcrypto/conf: d_conf-1x.out d_conf-3x.out
Removed Files:
src/tests/crypto/libcrypto/conf: d_conf.out
Log Message:
make tests support both 1.x and 3.x.
Lot of work needed to add all the 3.x tests, but that can wait until all
is switched
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/tests/crypto/libcrypto/Makefile
cvs rdiff -u -r1.10 -r1.11 src/tests/crypto/libcrypto/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/tests/crypto/libcrypto/t_hashes.sh
cvs rdiff -u -r1.8 -r1.9 src/tests/crypto/libcrypto/t_libcrypto.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/crypto/libcrypto/t_pubkey.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/crypto/libcrypto/conf/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/crypto/libcrypto/conf/d_conf-1x.out \
src/tests/crypto/libcrypto/conf/d_conf-3x.out
cvs rdiff -u -r1.1 -r0 src/tests/crypto/libcrypto/conf/d_conf.out
cvs rdiff -u -r1.1 -r1.2 src/tests/crypto/libcrypto/dh/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/crypto/libcrypto/evp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/crypto/libcrypto/threads/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/libcrypto/Makefile
diff -u src/tests/crypto/libcrypto/Makefile:1.14 src/tests/crypto/libcrypto/Makefile:1.15
--- src/tests/crypto/libcrypto/Makefile:1.14 Sun Sep 23 09:34:57 2018
+++ src/tests/crypto/libcrypto/Makefile Mon May 8 13:46:06 2023
@@ -1,9 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2018/09/23 13:34:57 christos Exp $
+# $NetBSD: Makefile,v 1.15 2023/05/08 17:46:06 christos Exp $
.include
-SUBDIR+=bf bn cast conf des dh dsa ec ecdh ecdsa engine evp hmac \
- md2 rc2 rc4 rsa srp threads
+SUBDIR+=bf bn cast conf des dh dsa ec engine evp hmac \
+ rc2 rc4 rsa srp threads
+
+.if ${HAVE_OPENSSL} <= 11
+SUBDIR+= ecdh ecdsa md2
+.endif
SUBDIR+=idea mdc2
SUBDIR+=rc5
Index: src/tests/crypto/libcrypto/Makefile.inc
diff -u src/tests/crypto/libcrypto/Makefile.inc:1.10 src/tests/crypto/libcrypto/Makefile.inc:1.11
--- src/tests/crypto/libcrypto/Makefile.inc:1.10 Fri Sep 28 19:40:45 2018
+++ src/tests/crypto/libcrypto/Makefile.inc Mon May 8 13:46:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2018/09/28 23:40:45 christos Exp $
+# $NetBSD: Makefile.inc,v 1.11 2023/05/08 17:46:06 christos Exp $
.include
.include "../Makefile.inc"
@@ -14,11 +14,13 @@ MAN= # empty
BINDIR= ${TESTSDIR}
CWARNFLAGS.clang+= -Wno-format
+CWARNFLAGS+=-Wno-error=deprecated-declarations
CPPFLAGS+= -DOPENSSL_FIPS
CPPFLAGS+= -I${OPENSSLSRC} -I${OPENSSLSRC}/crypto
CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/../include
CPPFLAGS+= -I${OPENSSLSRC}/crypto/include
+CPPFLAGS+= -I${OPENSSLSRC}/apps/include
CRYPTODIST= ${NETBSDSRCDIR}/crypto
.include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
.if ${HAVE_OPENSSL} != 10
Index: src/tests/crypto/libcrypto/t_hashes.sh
diff -u src/tests/crypto/libcrypto/t_hashes.sh:1.4 src/tests/crypto/libcrypto/t_hashes.sh:1.5
--- src/tests/crypto/libcrypto/t_hashes.sh:1.4 Mon Sep 24 12:25:24 2018
+++ src/tests/crypto/libcrypto/t_hashes.sh Mon May 8 13:46:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_hashes.sh,v 1.4 2018/09/24 16:25:24 christos Exp $
+# $NetBSD: t_hashes.sh,v 1.5 2023/05/08 17:46:06 christos Exp $
#
# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -58,6 +58,6 @@ mdc2_body()
atf_init_test_cases()
{
atf_add_test_case hmac
- atf_add_test_case md2
+# atf_add_test_case md2
atf_add_test_case mdc2
}
Index: src/tests/crypto/libcrypto/t_libcrypto.sh
diff -u src/tests/crypto/libcrypto/t_libcrypto.sh:1.8 src/tests/crypto/libcrypto/t_libcrypto.sh:1.9
--- src/tests/crypto/libcrypto/t_libcrypto.sh:1.8 Fri Jun 10 01:59:12 2022
+++ src/tests/crypto/libcrypto/t_libcrypto.sh Mon May 8 13:46:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_libcrypto.sh,v 1.8 2022/06/10 05:59:12 martin Exp $
+# $NetBSD: t_libcrypto.sh,v 1.9 2023/05/08 17:46:06 christos Exp $
#
# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -32,7 +32,8 @@ engine_head()
}
engine_body()
{
- atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_enginetest"
+ atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_enginetest" \
+ "$(atf_get_srcdir)/d_server.pem"
}
atf_test_case bn
@@ -68,11 +69,17 @@ threads_head()
}
threads_body()
{
- $(atf_get_srcdir)/h_threadstest \
- -cert $(atf_get_srcdir)/d_server.pem \
- -ccert $(atf_get_srcdir)/d_client.pem \
- 2>&1 | tee out
- atf_check -s eq:1 -o empty
CVS commit: src/tests/crypto/libcrypto
Module Name:src Committed By: christos Date: Mon May 8 17:46:06 UTC 2023 Modified Files: src/tests/crypto/libcrypto: Makefile Makefile.inc t_hashes.sh t_libcrypto.sh t_pubkey.sh src/tests/crypto/libcrypto/conf: Makefile src/tests/crypto/libcrypto/dh: Makefile src/tests/crypto/libcrypto/evp: Makefile src/tests/crypto/libcrypto/threads: Makefile Added Files: src/tests/crypto/libcrypto/conf: d_conf-1x.out d_conf-3x.out Removed Files: src/tests/crypto/libcrypto/conf: d_conf.out Log Message: make tests support both 1.x and 3.x. Lot of work needed to add all the 3.x tests, but that can wait until all is switched To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/tests/crypto/libcrypto/Makefile cvs rdiff -u -r1.10 -r1.11 src/tests/crypto/libcrypto/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/tests/crypto/libcrypto/t_hashes.sh cvs rdiff -u -r1.8 -r1.9 src/tests/crypto/libcrypto/t_libcrypto.sh cvs rdiff -u -r1.6 -r1.7 src/tests/crypto/libcrypto/t_pubkey.sh cvs rdiff -u -r1.1 -r1.2 src/tests/crypto/libcrypto/conf/Makefile cvs rdiff -u -r0 -r1.1 src/tests/crypto/libcrypto/conf/d_conf-1x.out \ src/tests/crypto/libcrypto/conf/d_conf-3x.out cvs rdiff -u -r1.1 -r0 src/tests/crypto/libcrypto/conf/d_conf.out cvs rdiff -u -r1.1 -r1.2 src/tests/crypto/libcrypto/dh/Makefile cvs rdiff -u -r1.2 -r1.3 src/tests/crypto/libcrypto/evp/Makefile cvs rdiff -u -r1.5 -r1.6 src/tests/crypto/libcrypto/threads/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon May 8 14:31:43 UTC 2023
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
Allow linking against archives like PROGDPLIBS does.
To generate a diff of this commit:
cvs rdiff -u -r1.390 -r1.391 src/share/mk/bsd.lib.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.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.390 src/share/mk/bsd.lib.mk:1.391
--- src/share/mk/bsd.lib.mk:1.390 Mon Feb 6 23:53:54 2023
+++ src/share/mk/bsd.lib.mk Mon May 8 10:31:43 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.390 2023/02/07 04:53:54 mrg Exp $
+# $NetBSD: bsd.lib.mk,v 1.391 2023/05/08 14:31:43 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -69,7 +69,13 @@ LIBDO.${_lib}!= cd "${_dir}" && ${PRINTO
LDADD+= -l${_lib}
.else
LDADD+= -L${LIBDO.${_lib}} -l${_lib}
-DPADD+= ${LIBDO.${_lib}}/lib${_lib}.so # Don't use _LIB_PREFIX
+.if exists(${LIBDO.${_lib}}/lib${_lib}_pic.a)
+DPADD+= ${LIBDO.${_lib}}/lib${_lib}_pic.a
+.elif exists(${LIBDO.${_lib}}/lib${_lib}.so)
+DPADD+= ${LIBDO.${_lib}}/lib${_lib}.so
+.else
+DPADD+= ${LIBDO.${_lib}}/lib${_lib}.a
+.endif
.endif
.endfor
.endif # }
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Mon May 8 14:31:43 UTC 2023 Modified Files: src/share/mk: bsd.lib.mk Log Message: Allow linking against archives like PROGDPLIBS does. To generate a diff of this commit: cvs rdiff -u -r1.390 -r1.391 src/share/mk/bsd.lib.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon May 8 14:31:08 UTC 2023
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
remove stuff accidentally committed
To generate a diff of this commit:
cvs rdiff -u -r1.342 -r1.343 src/share/mk/bsd.prog.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.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.342 src/share/mk/bsd.prog.mk:1.343
--- src/share/mk/bsd.prog.mk:1.342 Sun May 7 19:24:51 2023
+++ src/share/mk/bsd.prog.mk Mon May 8 10:31:08 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.342 2023/05/07 23:24:51 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.343 2023/05/08 14:31:08 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -408,7 +408,7 @@ PROGDO.${_lib}!= cd "${_dir}" && ${PRINT
DPADD+= ${PROGDO.${_lib}}/lib${_lib}.a
LDADD+= ${PROGDO.${_lib}}/lib${_lib}.a
.else
-LDADD+= ${PROGDPLIBBEGIN} -L${PROGDO.${_lib}} -l${_lib} ${PROGDPLIBEND}
+LDADD+= -L${PROGDO.${_lib}} -l${_lib}
.if exists(${PROGDO.${_lib}}/lib${_lib}_pic.a)
DPADD+= ${PROGDO.${_lib}}/lib${_lib}_pic.a
.elif exists(${PROGDO.${_lib}}/lib${_lib}.so)
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Mon May 8 14:31:08 UTC 2023 Modified Files: src/share/mk: bsd.prog.mk Log Message: remove stuff accidentally committed To generate a diff of this commit: cvs rdiff -u -r1.342 -r1.343 src/share/mk/bsd.prog.mk 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/openssl/lib
Module Name:src
Committed By: christos
Date: Mon May 8 14:30:34 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/lib: Makefile
src/crypto/external/bsd/openssl/lib/libdefault: Makefile
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile
Log Message:
make legacy.so work
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libdefault/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/liblegacy/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/Makefile
diff -u src/crypto/external/bsd/openssl/lib/Makefile:1.6 src/crypto/external/bsd/openssl/lib/Makefile:1.7
--- src/crypto/external/bsd/openssl/lib/Makefile:1.6 Sun May 7 12:22:10 2023
+++ src/crypto/external/bsd/openssl/lib/Makefile Mon May 8 10:30:33 2023
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2023/05/07 16:22:10 christos Exp $
+# $NetBSD: Makefile,v 1.7 2023/05/08 14:30:33 christos Exp $
.include "bsd.own.mk"
# OpenSSL libraries.
-SUBDIR= libapps liblegacy libcrypto libcryptotest libdes
+SUBDIR= libapps libcommon libcrypto libcryptotest libdes
-SUBDIR+= .WAIT libssl # depends on libcrypto
+SUBDIR+= .WAIT libssl liblegacy # depends on libcrypto, libcommon
.include
Index: src/crypto/external/bsd/openssl/lib/libdefault/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.1 src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.2
--- src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.1 Sat May 6 13:07:23 2023
+++ src/crypto/external/bsd/openssl/lib/libdefault/Makefile Mon May 8 10:30:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2023/05/06 17:07:23 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/05/08 14:30:33 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -43,8 +43,6 @@ CPPFLAGS+= -I${OPENSSLSRC}/include -I${O
CPPFLAGS+= -I${OPENSSLSRC}/crypto/asn1 -I${OPENSSLSRC}/crypto/evp
CPPFLAGS+= -I${OPENSSLSRC}/crypto/modes
CPPFLAGS+= -I${OPENSSLSRC}/../include
-CPPFLAGS+= -I${OPENSSLSRC}/providers/common/include
-CPPFLAGS+= -I${OPENSSLSRC}/providers/implementations/include
CRYPTODIST= ${NETBSDSRCDIR}/crypto
Index: src/crypto/external/bsd/openssl/lib/liblegacy/Makefile
diff -u src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.1 src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.2
--- src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.1 Sun May 7 12:22:10 2023
+++ src/crypto/external/bsd/openssl/lib/liblegacy/Makefile Mon May 8 10:30:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2023/05/07 16:22:10 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/05/08 14:30:34 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -54,11 +54,11 @@ OPENSSLINC= ${OPENSSLSRC}/include/openss
.include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
.PATH: ${OPENSSLSRC} ${OPENSSLINC}
.PATH: ${OPENSSLSRC}/../include/openssl
-.PATH: ${OPENSSLSRC}/providers/implementations/digests
-.PATH: ${OPENSSLSRC}/providers/implementations/macs
.include "srcs.inc"
+SRCS+=legacyprov.c
+
AFLAGS+=-DELF
OS_VERSION!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
@@ -78,6 +78,9 @@ libinstall::
LDFLAGS+=-Wl,--version-script=${.CURDIR}/${LIB}.map
+LIBDPLIBS+= common ${.CURDIR}/../libcommon
+LIBDPLIBS+= crypto ${.CURDIR}/../libcrypto
+
.include
${DESTDIR}${LIBDIR}/${LIB}.so: lib${LIB}.so.${SHLIB_FULLVERSION}
CVS commit: src/crypto/external/bsd/openssl/lib
Module Name:src Committed By: christos Date: Mon May 8 14:30:34 UTC 2023 Modified Files: src/crypto/external/bsd/openssl/lib: Makefile src/crypto/external/bsd/openssl/lib/libdefault: Makefile src/crypto/external/bsd/openssl/lib/liblegacy: Makefile Log Message: make legacy.so work To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/lib/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libdefault/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/liblegacy/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Mon May 8 10:24:07 UTC 2023
Modified Files:
src/usr.bin/make: for.c
src/usr.bin/make/unit-tests: directive-for-errors.exp
directive-for-errors.mk directive-for-escape.exp
directive-for-escape.mk directive-for.exp directive-for.mk
Log Message:
make: disallow characters like '$' in variable names in .for loops
Fixes PR 53146.
To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/usr.bin/make/for.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/directive-for-errors.exp
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/directive-for-errors.mk
cvs rdiff -u -r1.17 -r1.18 \
src/usr.bin/make/unit-tests/directive-for-escape.exp \
src/usr.bin/make/unit-tests/directive-for.mk
cvs rdiff -u -r1.16 -r1.17 \
src/usr.bin/make/unit-tests/directive-for-escape.mk
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/directive-for.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/for.c
diff -u src/usr.bin/make/for.c:1.172 src/usr.bin/make/for.c:1.173
--- src/usr.bin/make/for.c:1.172 Mon May 8 09:01:20 2023
+++ src/usr.bin/make/for.c Mon May 8 10:24:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: for.c,v 1.172 2023/05/08 09:01:20 rillig Exp $ */
+/* $NetBSD: for.c,v 1.173 2023/05/08 10:24:07 rillig Exp $ */
/*
* Copyright (c) 1992, The Regents of the University of California.
@@ -58,7 +58,7 @@
#include "make.h"
/* "@(#)for.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: for.c,v 1.172 2023/05/08 09:01:20 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.173 2023/05/08 10:24:07 rillig Exp $");
typedef struct ForLoop {
@@ -139,6 +139,13 @@ ForLoop_Details(ForLoop *f)
}
static bool
+IsValidInVarname(char c)
+{
+ return c != '$' && c != ':' && c != '\\' &&
+ c != '(' && c != '{' && c != ')' && c != '}';
+}
+
+static bool
ForLoop_ParseVarnames(ForLoop *f, const char **pp)
{
const char *p = *pp;
@@ -152,12 +159,15 @@ ForLoop_ParseVarnames(ForLoop *f, const
return false;
}
- /*
- * XXX: This allows arbitrary variable names;
- * see directive-for.mk.
- */
- for (len = 1; p[len] != '\0' && !ch_isspace(p[len]); len++)
- continue;
+ for (len = 0; p[len] != '\0' && !ch_isspace(p[len]); len++) {
+ if (!IsValidInVarname(p[len])) {
+Parse_Error(PARSE_FATAL,
+"invalid character '%c' "
+"in .for loop variable name",
+p[len]);
+return false;
+ }
+ }
if (len == 2 && p[0] == 'i' && p[1] == 'n') {
p += 2;
Index: src/usr.bin/make/unit-tests/directive-for-errors.exp
diff -u src/usr.bin/make/unit-tests/directive-for-errors.exp:1.2 src/usr.bin/make/unit-tests/directive-for-errors.exp:1.3
--- src/usr.bin/make/unit-tests/directive-for-errors.exp:1.2 Tue Feb 23 15:19:41 2021
+++ src/usr.bin/make/unit-tests/directive-for-errors.exp Mon May 8 10:24:07 2023
@@ -4,19 +4,20 @@ make: "directive-for-errors.mk" line 9:
make: "directive-for-errors.mk" line 19: Unknown directive "for"
make: "directive-for-errors.mk" line 20: warning:
make: "directive-for-errors.mk" line 21: for-less endfor
-make: "directive-for-errors.mk" line 37: Dollar $ 1 1 and backslash 2 2 2.
-make: "directive-for-errors.mk" line 37: Dollar $ 3 3 and backslash 4 4 4.
-make: "directive-for-errors.mk" line 43: no iteration variables in for
-make: "directive-for-errors.mk" line 47: warning: Should not be reached.
-make: "directive-for-errors.mk" line 48: for-less endfor
-make: "directive-for-errors.mk" line 53: Wrong number of words (5) in .for substitution list with 3 variables
-make: "directive-for-errors.mk" line 64: missing `in' in for
-make: "directive-for-errors.mk" line 66: warning: Should not be reached.
-make: "directive-for-errors.mk" line 67: for-less endfor
-make: "directive-for-errors.mk" line 73: Unknown modifier "Z"
-make: "directive-for-errors.mk" line 74: warning: Should not be reached.
-make: "directive-for-errors.mk" line 74: warning: Should not be reached.
-make: "directive-for-errors.mk" line 74: warning: Should not be reached.
+make: "directive-for-errors.mk" line 34: invalid character '$' in .for loop variable name
+make: "directive-for-errors.mk" line 35: Dollar $ and backslash backslash backslash backslash.
+make: "directive-for-errors.mk" line 36: for-less endfor
+make: "directive-for-errors.mk" line 41: no iteration variables in for
+make: "directive-for-errors.mk" line 45: warning: Should not be reached.
+make: "directive-for-errors.mk" line 46: for-less endfor
+make: "directive-for-errors.mk" line 51: Wrong number of words (5) in .for substitution list with 3 variables
+make: "directive-for-errors.mk" line 63: missing `in' in for
+make: "directive-for-errors.mk" line 65: warning: Should not be reached.
+make: "directive-for-errors.mk" line 66: for-less endfor
+make: "directive-for-errors.mk" line 72: Unknown modifier "Z"
+make:
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Mon May 8 10:24:07 UTC 2023 Modified Files: src/usr.bin/make: for.c src/usr.bin/make/unit-tests: directive-for-errors.exp directive-for-errors.mk directive-for-escape.exp directive-for-escape.mk directive-for.exp directive-for.mk Log Message: make: disallow characters like '$' in variable names in .for loops Fixes PR 53146. To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/usr.bin/make/for.c cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/directive-for-errors.exp cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/directive-for-errors.mk cvs rdiff -u -r1.17 -r1.18 \ src/usr.bin/make/unit-tests/directive-for-escape.exp \ src/usr.bin/make/unit-tests/directive-for.mk cvs rdiff -u -r1.16 -r1.17 \ src/usr.bin/make/unit-tests/directive-for-escape.mk cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/directive-for.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: skrll Date: Mon May 8 10:18:03 UTC 2023 Modified Files: src/sys/dev/fdt: files.fdt Log Message: Google goldfish config goop To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/dev/fdt/files.fdt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: skrll Date: Mon May 8 10:18:03 UTC 2023 Modified Files: src/sys/dev/fdt: files.fdt Log Message: Google goldfish config goop To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/dev/fdt/files.fdt 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/fdt/files.fdt diff -u src/sys/dev/fdt/files.fdt:1.69 src/sys/dev/fdt/files.fdt:1.70 --- src/sys/dev/fdt/files.fdt:1.69 Sat Apr 22 09:53:45 2023 +++ src/sys/dev/fdt/files.fdt Mon May 8 10:18:03 2023 @@ -1,4 +1,4 @@ -# $NetBSD: files.fdt,v 1.69 2023/04/22 09:53:45 skrll Exp $ +# $NetBSD: files.fdt,v 1.70 2023/05/08 10:18:03 skrll Exp $ include "external/bsd/libfdt/conf/files.libfdt" @@ -215,3 +215,8 @@ file dev/fdt/genet_fdt.c genet_fdt # VMware Tools driver attach vmt at fdt with vmt_fdt file dev/fdt/vmt_fdt.c vmt_fdt + +# Google Goldfish RTC +device gfrtc +attach gfrtc at fdt with gfrtc_fdt +file dev/fdt/gfrtc_fdt.c gfrtc_fdt
CVS commit: src/tools/gdb
Module Name:src Committed By: skrll Date: Mon May 8 09:47:21 UTC 2023 Modified Files: src/tools/gdb: Makefile Log Message: Set ac_cv_func_sigprocmask=yes as the symbol renaming confuses the configure script on architectures that don't provide a compatibilty symbol, e.g. RISC-V To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/tools/gdb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gdb
Module Name:src
Committed By: skrll
Date: Mon May 8 09:47:21 UTC 2023
Modified Files:
src/tools/gdb: Makefile
Log Message:
Set ac_cv_func_sigprocmask=yes as the symbol renaming confuses the
configure script on architectures that don't provide a compatibilty
symbol, e.g. RISC-V
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/tools/gdb/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/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.40 src/tools/gdb/Makefile:1.41
--- src/tools/gdb/Makefile:1.40 Thu Sep 24 14:53:17 2020
+++ src/tools/gdb/Makefile Mon May 8 09:47:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2020/09/24 14:53:17 christos Exp $
+# $NetBSD: Makefile,v 1.41 2023/05/08 09:47:20 skrll Exp $
.include
@@ -59,6 +59,7 @@ MKNATIVE?= ${.CURDIR}/mknative-gdb
MKNATIVE_CONFIGURE_PRESET= \
ac_cv_prog_cc_cross=yes \
ac_cv_func_fork_works=yes \
+ ac_cv_func_sigprocmask=yes \
ac_cv_func_strcoll_works=yes \
ac_cv_func_XML_StopParser=yes \
ac_cv_libexpat=yes \
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Mon May 8 09:24:42 UTC 2023
Modified Files:
src/usr.bin/make/unit-tests: directive-for.exp directive-for.mk
Log Message:
tests/make: add more tests for unusual variable names in .for loops
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/directive-for.exp
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/directive-for.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/directive-for.exp
diff -u src/usr.bin/make/unit-tests/directive-for.exp:1.13 src/usr.bin/make/unit-tests/directive-for.exp:1.14
--- src/usr.bin/make/unit-tests/directive-for.exp:1.13 Mon May 8 09:01:20 2023
+++ src/usr.bin/make/unit-tests/directive-for.exp Mon May 8 09:24:42 2023
@@ -16,16 +16,19 @@ make: "directive-for.mk" line 140: ][ ][
make: "directive-for.mk" line 140: }{ }{ }{
make: "directive-for.mk" line 148: outer value value
make: "directive-for.mk" line 148: outer "quoted" \"quoted\"
-make: "directive-for.mk" line 154: Unknown modifier "Z"
-make: "directive-for.mk" line 155: XXX: Not reached word1
-make: "directive-for.mk" line 155: XXX: Not reached word3
-make: "directive-for.mk" line 160: no iteration variables in for
-make: "directive-for.mk" line 162: Missing argument for ".error"
-make: "directive-for.mk" line 163: for-less endfor
-make: "directive-for.mk" line 187: 1 open conditional
-make: "directive-for.mk" line 203: for-less endfor
-make: "directive-for.mk" line 204: if-less endif
-make: "directive-for.mk" line 212: if-less endif
+make: "directive-for.mk" line 154: $ value value
+make: "directive-for.mk" line 160: <> <>
+make: "directive-for.mk" line 160: <> <>
+make: "directive-for.mk" line 166: Unknown modifier "Z"
+make: "directive-for.mk" line 167: XXX: Not reached word1
+make: "directive-for.mk" line 167: XXX: Not reached word3
+make: "directive-for.mk" line 172: no iteration variables in for
+make: "directive-for.mk" line 174: Missing argument for ".error"
+make: "directive-for.mk" line 175: for-less endfor
+make: "directive-for.mk" line 199: 1 open conditional
+make: "directive-for.mk" line 215: for-less endfor
+make: "directive-for.mk" line 216: if-less endif
+make: "directive-for.mk" line 224: if-less endif
For: new loop 2
For: end for 2
For: end for 1
Index: src/usr.bin/make/unit-tests/directive-for.mk
diff -u src/usr.bin/make/unit-tests/directive-for.mk:1.16 src/usr.bin/make/unit-tests/directive-for.mk:1.17
--- src/usr.bin/make/unit-tests/directive-for.mk:1.16 Mon May 8 09:01:20 2023
+++ src/usr.bin/make/unit-tests/directive-for.mk Mon May 8 09:24:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: directive-for.mk,v 1.16 2023/05/08 09:01:20 rillig Exp $
+# $NetBSD: directive-for.mk,v 1.17 2023/05/08 09:24:42 rillig Exp $
#
# Tests for the .for directive.
#
@@ -147,6 +147,18 @@ var= outer
.for var:Q in value "quoted"
. info ${var} ${var:Q} ${var:Q:Q}
.endfor
+# The short expression '$$' is preserved, the long expressions are
+# substituted.
+# expect+2: $ value value
+.for $ in value
+. info $$ ${$} $($)
+.endfor
+# From https://gnats.netbsd.org/53146.
+# expect+3: <> <>
+# expect+2: <> <>
+.for $(FOO) in a b
+. info <$(FOO)> <$(foo)> <$($(FOO))>
+.endfor
# XXX: A parse error or evaluation error in the items of the .for loop
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Mon May 8 09:24:42 UTC 2023 Modified Files: src/usr.bin/make/unit-tests: directive-for.exp directive-for.mk Log Message: tests/make: add more tests for unusual variable names in .for loops To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/directive-for.exp cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/directive-for.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Mon May 8 09:01:20 UTC 2023 Modified Files: src/usr.bin/make: for.c src/usr.bin/make/unit-tests: directive-for.exp directive-for.mk Log Message: make: fix parsing of unusual line continuations in .for loops To generate a diff of this commit: cvs rdiff -u -r1.171 -r1.172 src/usr.bin/make/for.c cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/directive-for.exp cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/directive-for.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Mon May 8 09:01:20 UTC 2023
Modified Files:
src/usr.bin/make: for.c
src/usr.bin/make/unit-tests: directive-for.exp directive-for.mk
Log Message:
make: fix parsing of unusual line continuations in .for loops
To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/usr.bin/make/for.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/directive-for.exp
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/directive-for.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/for.c
diff -u src/usr.bin/make/for.c:1.171 src/usr.bin/make/for.c:1.172
--- src/usr.bin/make/for.c:1.171 Tue Feb 14 21:38:31 2023
+++ src/usr.bin/make/for.c Mon May 8 09:01:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: for.c,v 1.171 2023/02/14 21:38:31 rillig Exp $ */
+/* $NetBSD: for.c,v 1.172 2023/05/08 09:01:20 rillig Exp $ */
/*
* Copyright (c) 1992, The Regents of the University of California.
@@ -58,7 +58,7 @@
#include "make.h"
/* "@(#)for.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: for.c,v 1.171 2023/02/14 21:38:31 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.172 2023/05/08 09:01:20 rillig Exp $");
typedef struct ForLoop {
@@ -72,6 +72,22 @@ typedef struct ForLoop {
static ForLoop *accumFor; /* Loop being accumulated */
+/* See LK_FOR_BODY. */
+static void
+skip_whitespace_or_line_continuation(const char **pp)
+{
+ const char *p = *pp;
+ for (;;) {
+ if (ch_isspace(*p))
+ p++;
+ else if (p[0] == '\\' && p[1] == '\n')
+ p += 2;
+ else
+ break;
+ }
+ *pp = p;
+}
+
static ForLoop *
ForLoop_New(void)
{
@@ -221,7 +237,7 @@ For_Eval(const char *line)
ForLoop *f;
p = line + 1; /* skip the '.' */
- cpp_skip_whitespace();
+ skip_whitespace_or_line_continuation();
if (IsFor(p)) {
p += 3;
@@ -254,7 +270,7 @@ For_Accum(const char *line, int *forLeve
if (*p == '.') {
p++;
- cpp_skip_whitespace();
+ skip_whitespace_or_line_continuation();
if (IsEndfor(p)) {
DEBUG1(FOR, "For: end for %d\n", *forLevel);
Index: src/usr.bin/make/unit-tests/directive-for.exp
diff -u src/usr.bin/make/unit-tests/directive-for.exp:1.12 src/usr.bin/make/unit-tests/directive-for.exp:1.13
--- src/usr.bin/make/unit-tests/directive-for.exp:1.12 Sat Jan 8 20:21:34 2022
+++ src/usr.bin/make/unit-tests/directive-for.exp Mon May 8 09:01:20 2023
@@ -26,17 +26,16 @@ make: "directive-for.mk" line 187: 1 ope
make: "directive-for.mk" line 203: for-less endfor
make: "directive-for.mk" line 204: if-less endif
make: "directive-for.mk" line 212: if-less endif
+For: new loop 2
+For: end for 2
For: end for 1
For: loop body:
.\
for inner in i
.\
endfor
-make: "directive-for.mk" line 229: Unexpected end of file in .for loop
+For: end for 1
For: loop body:
-.\
- endfor
-make: "directive-for.mk" line 227: for-less endfor
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/directive-for.mk
diff -u src/usr.bin/make/unit-tests/directive-for.mk:1.15 src/usr.bin/make/unit-tests/directive-for.mk:1.16
--- src/usr.bin/make/unit-tests/directive-for.mk:1.15 Sat Oct 1 09:23:04 2022
+++ src/usr.bin/make/unit-tests/directive-for.mk Mon May 8 09:01:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: directive-for.mk,v 1.15 2022/10/01 09:23:04 rillig Exp $
+# $NetBSD: directive-for.mk,v 1.16 2023/05/08 09:01:20 rillig Exp $
#
# Tests for the .for directive.
#
@@ -214,12 +214,19 @@ var= outer
.endif# no 'if-less endif'
-# When make parses a .for loop, it assumes that there is no line break between
-# the '.' and the 'for' or 'endfor', as there is no practical reason to break
-# the line at this point. When make scans the outer .for loop, it does not
-# recognize the inner directives as such. When make scans the inner .for
-# loop, it recognizes the '.\n for' but does not recognize the '.\n endfor',
-# as LK_FOR_BODY preserves the backslash-newline sequences.
+# Before for.c 1.172 from 2023-05-08, when make parsed a .for loop, it
+# assumed that there was no line continuation between the '.' and the 'for'
+# or 'endfor', as there is no practical reason to break the line at this
+# point.
+#
+# When make scanned the outer .for loop, it did not recognize the inner .for
+# loop as such and instead treated it as an unknown directive. The body of
+# the outer .for loop thus ended above the '.endfor'.
+#
+# When make scanned the inner .for loop, it did not recognize the inner
+# .endfor as such, which led to a parse error 'Unexpected end of file in .for
+# loop' from the '.endfor' line, followed by a second parse error 'for-less
+# .endfor' from the '.\\n endfor' line.
.MAKEFLAGS: -df
.for outer in o
.\
CVS commit: src/sys/arch/amiga/amiga
Module Name:src Committed By: skrll Date: Mon May 8 08:26:11 UTC 2023 Modified Files: src/sys/arch/amiga/amiga: conf.c Log Message: Ugly hack to fix the builds. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/arch/amiga/amiga/conf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amiga/amiga
Module Name:src Committed By: skrll Date: Mon May 8 08:26:11 UTC 2023 Modified Files: src/sys/arch/amiga/amiga: conf.c Log Message: Ugly hack to fix the builds. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/arch/amiga/amiga/conf.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/amiga/amiga/conf.c diff -u src/sys/arch/amiga/amiga/conf.c:1.75 src/sys/arch/amiga/amiga/conf.c:1.76 --- src/sys/arch/amiga/amiga/conf.c:1.75 Wed May 3 13:49:30 2023 +++ src/sys/arch/amiga/amiga/conf.c Mon May 8 08:26:11 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.75 2023/05/03 13:49:30 phx Exp $ */ +/* $NetBSD: conf.c,v 1.76 2023/05/08 08:26:11 skrll Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.75 2023/05/03 13:49:30 phx Exp $"); +__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.76 2023/05/08 08:26:11 skrll Exp $"); #include #include @@ -44,7 +44,9 @@ __KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.7 #include "grf.h" #include "amidisplaycc.h" #include "mntva.h" +#ifndef __powerpc__ #include "zz9k_fb.h" +#endif #include "wsdisplay.h" /*
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: skrll Date: Mon May 8 08:07:36 UTC 2023 Modified Files: src/sys/arch/riscv/include: pmap.h Log Message: Remove some #if 0'ed code To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/riscv/include/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: skrll Date: Mon May 8 08:07:36 UTC 2023 Modified Files: src/sys/arch/riscv/include: pmap.h Log Message: Remove some #if 0'ed code To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/riscv/include/pmap.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/riscv/include/pmap.h diff -u src/sys/arch/riscv/include/pmap.h:1.16 src/sys/arch/riscv/include/pmap.h:1.17 --- src/sys/arch/riscv/include/pmap.h:1.16 Mon May 8 07:56:08 2023 +++ src/sys/arch/riscv/include/pmap.h Mon May 8 08:07:36 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.16 2023/05/08 07:56:08 skrll Exp $ */ +/* $NetBSD: pmap.h,v 1.17 2023/05/08 08:07:36 skrll Exp $ */ /* * Copyright (c) 2014, 2019, 2021 The NetBSD Foundation, Inc. @@ -147,15 +147,9 @@ vsize_t pmap_kenter_range(vaddr_t, paddr #ifdef _LP64 extern vaddr_t pmap_direct_base; extern vaddr_t pmap_direct_end; -#if 0 /* XXXSB is pmap_direct_base not initialised correctly somehow? didn't check */ -#define PMAP_DIRECT_MAP(pa) (pmap_direct_base + (pa)) -#define PMAP_DIRECT_UNMAP(va) ((paddr_t)(va) - pmap_direct_base) -#else #define PMAP_DIRECT_MAP(pa) RISCV_PA_TO_KVA(pa) #define PMAP_DIRECT_UNMAP(va) RISCV_KVA_TO_PA(va) -#endif - /* * Other hooks for the pool allocator. */
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: skrll Date: Mon May 8 07:56:08 UTC 2023 Modified Files: src/sys/arch/riscv/include: pmap.h Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/riscv/include/pmap.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/riscv/include/pmap.h diff -u src/sys/arch/riscv/include/pmap.h:1.15 src/sys/arch/riscv/include/pmap.h:1.16 --- src/sys/arch/riscv/include/pmap.h:1.15 Sun May 7 12:41:48 2023 +++ src/sys/arch/riscv/include/pmap.h Mon May 8 07:56:08 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.15 2023/05/07 12:41:48 skrll Exp $ */ +/* $NetBSD: pmap.h,v 1.16 2023/05/08 07:56:08 skrll Exp $ */ /* * Copyright (c) 2014, 2019, 2021 The NetBSD Foundation, Inc. @@ -140,7 +140,7 @@ void pmap_md_pdetab_init(struct pmap *); void pmap_md_pdetab_fini(struct pmap *); bool pmap_md_ok_to_steal_p(const uvm_physseg_t, size_t); -void pmap_bootstrap(vaddr_t kstart, vaddr_t kend); +void pmap_bootstrap(vaddr_t, vaddr_t); vsize_t pmap_kenter_range(vaddr_t, paddr_t, vsize_t, vm_prot_t, u_int);
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: skrll Date: Mon May 8 07:56:08 UTC 2023 Modified Files: src/sys/arch/riscv/include: pmap.h Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/riscv/include/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/riscv/conf
Module Name:src Committed By: skrll Date: Mon May 8 07:52:55 UTC 2023 Modified Files: src/sys/arch/riscv/conf: GENERIC.common Log Message: RISC-V: Add the Google Goldfish RTC to the GENERIC.common To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/conf/GENERIC.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/riscv/conf
Module Name:src Committed By: skrll Date: Mon May 8 07:52:55 UTC 2023 Modified Files: src/sys/arch/riscv/conf: GENERIC.common Log Message: RISC-V: Add the Google Goldfish RTC to the GENERIC.common To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/conf/GENERIC.common 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/riscv/conf/GENERIC.common diff -u src/sys/arch/riscv/conf/GENERIC.common:1.1 src/sys/arch/riscv/conf/GENERIC.common:1.2 --- src/sys/arch/riscv/conf/GENERIC.common:1.1 Sun May 7 12:41:48 2023 +++ src/sys/arch/riscv/conf/GENERIC.common Mon May 8 07:52:55 2023 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC.common,v 1.1 2023/05/07 12:41:48 skrll Exp $ +# $NetBSD: GENERIC.common,v 1.2 2023/05/08 07:52:55 skrll Exp $ # # GENERIC common RISC-V kernel config items shared between 32 and 64 # kernels @@ -140,6 +140,9 @@ com* at fdt? # UART # Firmware devices #qemufwcfg* at fdt? # QEMU Firmware Configuration device +# RTC devices +gfrtc* at fdt? # Google Goldfish RTC + # USB xhci* at fdt? # XHCI usb* at usbus?
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: skrll Date: Mon May 8 07:51:44 UTC 2023 Added Files: src/sys/dev/fdt: gfrtc_fdt.c Log Message: Add a Google Goldfish RTC driver To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/dev/fdt/gfrtc_fdt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/fdt
Module Name:src
Committed By: skrll
Date: Mon May 8 07:51:44 UTC 2023
Added Files:
src/sys/dev/fdt: gfrtc_fdt.c
Log Message:
Add a Google Goldfish RTC driver
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/dev/fdt/gfrtc_fdt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/dev/fdt/gfrtc_fdt.c
diff -u /dev/null src/sys/dev/fdt/gfrtc_fdt.c:1.1
--- /dev/null Mon May 8 07:51:44 2023
+++ src/sys/dev/fdt/gfrtc_fdt.c Mon May 8 07:51:44 2023
@@ -0,0 +1,141 @@
+/* $NetBSD: gfrtc_fdt.c,v 1.1 2023/05/08 07:51:44 skrll Exp $ */
+
+/*-
+ * Copyright (c) 2023 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nick Hudson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: gfrtc_fdt.c,v 1.1 2023/05/08 07:51:44 skrll Exp $");
+
+#include
+
+#include
+#include
+
+#include
+
+/*
+ * https://android.googlesource.com/platform/external/qemu/+/master/docs/GOLDFISH-VIRTUAL-HARDWARE.TXT
+ */
+
+static const struct device_compatible_entry compat_data[] = {
+ { .compat = "google,goldfish-rtc" },
+ DEVICE_COMPAT_EOL
+};
+
+struct gfrtc_fdt_softc {
+ device_t sc_dev;
+ bus_space_tag_t sc_bst;
+ bus_space_handle_t sc_bsh;
+
+ struct todr_chip_handle sc_todr;
+};
+
+#define GOLDFISH_RTC_READ(sc, reg) \
+ bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, (reg))
+#define GOLDFISH_RTC_WRITE(sc, reg, val) \
+ bus_space_write_4((sc)->sc_bst, (sc)->sc_bsh, (reg), (val))
+
+
+#define GOLDFISH_RTC_TIME_LOW 0x00
+#define GOLDFISH_RTC_TIME_HIGH 0x04
+
+
+static int
+gfrtc_gettime(struct todr_chip_handle *ch, struct timeval *tv)
+{
+ struct gfrtc_fdt_softc *sc = ch->cookie;
+ const uint64_t lo = GOLDFISH_RTC_READ(sc, GOLDFISH_RTC_TIME_LOW);
+ const uint64_t hi = GOLDFISH_RTC_READ(sc, GOLDFISH_RTC_TIME_HIGH);
+
+ uint64_t nsec = (hi << 32) | lo;
+
+ tv->tv_sec = nsec / 10;
+ tv->tv_usec = (nsec - tv->tv_sec) / 1000; // Always 0?
+
+ return 0;
+}
+
+static int
+gfrtc_settime(struct todr_chip_handle *ch, struct timeval *tv)
+{
+ struct gfrtc_fdt_softc *sc = ch->cookie;
+
+ uint64_t nsec = (tv->tv_sec * 100 + tv->tv_usec) * 1000;
+ uint32_t hi = nsec >> 32;
+ uint32_t lo = nsec;
+
+ GOLDFISH_RTC_WRITE(sc, GOLDFISH_RTC_TIME_HIGH, hi);
+ GOLDFISH_RTC_WRITE(sc, GOLDFISH_RTC_TIME_HIGH, lo);
+
+ return 0;
+}
+
+
+static int
+gfrtc_fdt_match(device_t parent, cfdata_t cf, void *aux)
+{
+ struct fdt_attach_args * const faa = aux;
+
+ return of_compatible_match(faa->faa_phandle, compat_data);
+}
+
+static void
+gfrtc_fdt_attach(device_t parent, device_t self, void *aux)
+{
+ struct gfrtc_fdt_softc * const sc = device_private(self);
+ struct fdt_attach_args * const faa = aux;
+ const int phandle = faa->faa_phandle;
+ bus_addr_t addr;
+ bus_size_t size;
+
+ if (fdtbus_get_reg(phandle, 0, , ) != 0) {
+ aprint_error(": couldn't get registers\n");
+ return;
+ }
+
+ sc->sc_dev = self;
+ sc->sc_bst = faa->faa_bst;
+ if (bus_space_map(sc->sc_bst, addr, size, 0, >sc_bsh) != 0) {
+ aprint_error(": couldn't map registers\n");
+ return;
+ }
+
+ aprint_naive("\n");
+ aprint_normal(": Google Goldfish RTC\n");
+
+ sc->sc_todr.cookie = sc;
+ sc->sc_todr.todr_gettime = gfrtc_gettime;
+ sc->sc_todr.todr_settime = gfrtc_settime;
+ sc->sc_todr.todr_setwen = NULL;
+
+ todr_attach(>sc_todr);
+}
+
+CFATTACH_DECL_NEW(gfrtc_fdt, sizeof(struct gfrtc_fdt_softc),
+ gfrtc_fdt_match, gfrtc_fdt_attach, NULL, NULL);
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: skrll Date: Mon May 8 07:38:48 UTC 2023 Modified Files: src/external/gpl3/gdb/dist/gdb: configure.host Log Message: Missed a file in the RISC-V support commit To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gdb/dist/gdb/configure.host 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/gdb/dist/gdb/configure.host diff -u src/external/gpl3/gdb/dist/gdb/configure.host:1.12 src/external/gpl3/gdb/dist/gdb/configure.host:1.13 --- src/external/gpl3/gdb/dist/gdb/configure.host:1.12 Tue Sep 15 02:05:18 2020 +++ src/external/gpl3/gdb/dist/gdb/configure.host Mon May 8 07:38:48 2023 @@ -147,6 +147,7 @@ powerpc64*-*-linux*) gdb_host=ppc64-linu powerpc*-*-linux*) gdb_host=linux ;; riscv*-*-freebsd*) gdb_host=fbsd ;; +riscv*-*-netbsd*) gdb_host=nbsd ;; riscv*-*-linux*) gdb_host=linux ;; s390*-*-linux*) gdb_host=linux ;;
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: skrll Date: Mon May 8 07:38:48 UTC 2023 Modified Files: src/external/gpl3/gdb/dist/gdb: configure.host Log Message: Missed a file in the RISC-V support commit To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gdb/dist/gdb/configure.host Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
