CVS commit: src/external/mpl/bind/dist/lib/ns
Module Name:src Committed By: christos Date: Fri Apr 19 12:35:28 UTC 2024 Modified Files: src/external/mpl/bind/dist/lib/ns: query.c Log Message: PR/58170: Yoshitaka Tokugawa: Remove blocking statement when the requestor asks for for an address that is in the cache and that access is prevented by a cache acl because the querier has no way to know that this access is denied, so it is not an abuse. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/external/mpl/bind/dist/lib/ns/query.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/ns
Module Name:src
Committed By: christos
Date: Fri Apr 19 12:35:28 UTC 2024
Modified Files:
src/external/mpl/bind/dist/lib/ns: query.c
Log Message:
PR/58170: Yoshitaka Tokugawa: Remove blocking statement when the requestor
asks for for an address that is in the cache and that access is prevented
by a cache acl because the querier has no way to know that this access is
denied, so it is not an abuse.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/mpl/bind/dist/lib/ns/query.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/bind/dist/lib/ns/query.c
diff -u src/external/mpl/bind/dist/lib/ns/query.c:1.20 src/external/mpl/bind/dist/lib/ns/query.c:1.21
--- src/external/mpl/bind/dist/lib/ns/query.c:1.20 Wed Feb 21 17:52:46 2024
+++ src/external/mpl/bind/dist/lib/ns/query.c Fri Apr 19 08:35:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.20 2024/02/21 22:52:46 christos Exp $ */
+/* $NetBSD: query.c,v 1.21 2024/04/19 12:35:28 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -909,7 +909,6 @@ query_checkcacheaccess(ns_client_t *clie
msg);
}
} else {
- pfilter_notify(result, client, "checkcacheaccess");
/*
* We were denied by the "allow-query-cache" ACL.
* There is no need to clear NS_QUERYATTR_CACHEACLOK
CVS commit: src/distrib/sets/lists/base32
Module Name:src Committed By: christos Date: Wed Apr 17 13:23:33 UTC 2024 Modified Files: src/distrib/sets/lists/base32: ad.mipsn64eb ad.mipsn64el ad.riscv64 Log Message: more plugin set fixes To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base32/ad.mipsn64eb \ src/distrib/sets/lists/base32/ad.mipsn64el cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/ad.riscv64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base32
Module Name:src Committed By: christos Date: Wed Apr 17 13:23:33 UTC 2024 Modified Files: src/distrib/sets/lists/base32: ad.mipsn64eb ad.mipsn64el ad.riscv64 Log Message: more plugin set fixes To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base32/ad.mipsn64eb \ src/distrib/sets/lists/base32/ad.mipsn64el cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/ad.riscv64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base32/ad.mipsn64eb diff -u src/distrib/sets/lists/base32/ad.mipsn64eb:1.4 src/distrib/sets/lists/base32/ad.mipsn64eb:1.5 --- src/distrib/sets/lists/base32/ad.mipsn64eb:1.4 Tue Apr 16 10:15:53 2024 +++ src/distrib/sets/lists/base32/ad.mipsn64eb Wed Apr 17 09:23:32 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mipsn64eb,v 1.4 2024/04/16 14:15:53 martin Exp $ +# $NetBSD: ad.mipsn64eb,v 1.5 2024/04/17 13:23:32 christos Exp $ ./lib/n32 base-compat-shlib compat ./lib/n32/npf base-compat-shlib compat,npf ./lib/n32/npf/ext_log.so base-compat-shlib compat,npf @@ -493,6 +493,8 @@ ./usr/lib/n32/lua/5.4/netpgp.so base-compat-shlib compat ./usr/lib/n32/lua/5.4/sqlite.so base-compat-shlib compat ./usr/lib/n32/lua/5.4/syslog.so base-compat-shlib compat +./usr/lib/n32/namedbase-compat-shlib compat +./usr/lib/n32/named/filter-.so.0 base-compat-shlib compat ./usr/lib/n32/opensslbase-crypto-usr compat ./usr/lib/n32/openssl/engines base-crypto-usr compat ./usr/lib/n32/openssl/engines/dasync.so base-crypto-usr compat,pic,openssl=30 @@ -996,6 +998,8 @@ ./usr/lib/o32/lua/5.4/netpgp.so base-compat-shlib compat ./usr/lib/o32/lua/5.4/sqlite.so base-compat-shlib compat ./usr/lib/o32/lua/5.4/syslog.so base-compat-shlib compat +./usr/lib/o32/namedbase-compat-shlib compat +./usr/lib/o32/named/filter-.so.0 base-compat-shlib compat ./usr/lib/o32/opensslbase-crypto-usr compat ./usr/lib/o32/openssl/engines base-crypto-usr compat ./usr/lib/o32/openssl/engines/dasync.so base-crypto-usr compat,pic,openssl=30 @@ -1035,9 +1039,11 @@ ./usr/libdata/debug/lib/o32/npf base-compat-shlib compat ./usr/libdata/debug/usr/lib/n32 base-compat-shlib compat ./usr/libdata/debug/usr/lib/n32/i18n base-compat-shlib compat +./usr/libdata/debug/usr/lib/n32/named base-compat-shlib compat ./usr/libdata/debug/usr/lib/n32/security base-compat-shlib compat ./usr/libdata/debug/usr/lib/o32 base-compat-shlib compat ./usr/libdata/debug/usr/lib/o32/i18n base-compat-shlib compat +./usr/libdata/debug/usr/lib/o32/named base-compat-shlib compat ./usr/libdata/debug/usr/lib/o32/security base-compat-shlib compat ./usr/libexec/ld.elf_so-n32 base-sys-shlib compat,pic ./usr/libexec/ld.elf_so-o32 base-sys-shlib compat,pic Index: src/distrib/sets/lists/base32/ad.mipsn64el diff -u src/distrib/sets/lists/base32/ad.mipsn64el:1.4 src/distrib/sets/lists/base32/ad.mipsn64el:1.5 --- src/distrib/sets/lists/base32/ad.mipsn64el:1.4 Tue Apr 16 10:15:53 2024 +++ src/distrib/sets/lists/base32/ad.mipsn64el Wed Apr 17 09:23:32 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mipsn64el,v 1.4 2024/04/16 14:15:53 martin Exp $ +# $NetBSD: ad.mipsn64el,v 1.5 2024/04/17 13:23:32 christos Exp $ ./lib/n32 base-compat-shlib compat ./lib/n32/npf base-compat-shlib compat,npf ./lib/n32/npf/ext_log.so base-compat-shlib compat,npf @@ -493,6 +493,8 @@ ./usr/lib/n32/lua/5.4/netpgp.so base-compat-shlib compat ./usr/lib/n32/lua/5.4/sqlite.so base-compat-shlib compat ./usr/lib/n32/lua/5.4/syslog.so base-compat-shlib compat +./usr/lib/n32/namedbase-compat-shlib compat +./usr/lib/n32/named/filter-.so.0 base-compat-shlib compat ./usr/lib/n32/opensslbase-crypto-usr compat ./usr/lib/n32/openssl/engines base-crypto-usr compat ./usr/lib/n32/openssl/engines/dasync.so base-crypto-usr compat,pic,openssl=30 @@ -996,6 +998,8 @@ ./usr/lib/o32/lua/5.4/netpgp.so base-compat-shlib compat ./usr/lib/o32/lua/5.4/sqlite.so base-compat-shlib compat ./usr/lib/o32/lua/5.4/syslog.so base-compat-shlib compat +./usr/lib/o32/namedbase-compat-shlib compat +./usr/lib/o32/named/filter-.so.0 base-compat-shlib compat ./usr/lib/o32/opensslbase-crypto-usr compat ./usr/lib/o32/openssl/engines base-crypto-usr compat ./usr/lib/o32/openssl/engines/dasync.so base-crypto-usr compat,pic,openssl=30 @@ -1035,9 +1039,11 @@ ./usr/libdata/debug/lib/o32/npf base-compat-shlib compat ./usr/libdata/debug/usr/lib/n32 base-compat-shlib compat ./usr/libdata/debug/usr/lib/n32/i18n base-compat-shlib compat +./usr/libdata/debug/usr/lib/n32/named base-compat-shlib compat ./usr/libdata/debug/usr/lib/n32/security base-compat-shlib compat ./usr/libdata/debug/usr/lib/o32 base-compat-shlib compat ./usr/libdata/debug/usr/lib/o32/i18n base-compat-shlib compat +./usr/libdata/debug/usr/lib/o32/named base-compat-shlib compat
CVS commit: src/external/gpl2/texinfo/dist/makeinfo
Module Name:src
Committed By: christos
Date: Tue Apr 16 23:43:08 UTC 2024
Modified Files:
src/external/gpl2/texinfo/dist/makeinfo: index.c
Log Message:
Add comparison function so that it can be used to provide a stable sort
(Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/texinfo/dist/makeinfo/index.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/texinfo/dist/makeinfo/index.c
diff -u src/external/gpl2/texinfo/dist/makeinfo/index.c:1.1.1.1 src/external/gpl2/texinfo/dist/makeinfo/index.c:1.2
--- src/external/gpl2/texinfo/dist/makeinfo/index.c:1.1.1.1 Wed Jan 13 19:11:29 2016
+++ src/external/gpl2/texinfo/dist/makeinfo/index.c Tue Apr 16 19:43:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: index.c,v 1.1.1.1 2016/01/14 00:11:29 christos Exp $ */
+/* $NetBSD: index.c,v 1.2 2024/04/16 23:43:08 christos Exp $ */
/* index.c -- indexing for Texinfo.
Id: index.c,v 1.17 2004/11/30 02:03:23 karl Exp
@@ -511,8 +511,30 @@ index_element_compare (const void *eleme
{
INDEX_ELT **elt1 = (INDEX_ELT **) element1;
INDEX_ELT **elt2 = (INDEX_ELT **) element2;
+ int ret = 0;
- return index_compare_fn ((*elt1)->entry, (*elt2)->entry);
+ /* Find a stable sort order. */
+ if (ret == 0)
+ret = index_compare_fn ((*elt1)->entry, (*elt2)->entry);
+ if (ret == 0)
+ret = strcmp ((*elt1)->defining_file, (*elt2)->defining_file);
+ if (ret == 0)
+ret = strcmp ((*elt1)->node, (*elt2)->node);
+ if (ret == 0)
+if ((*elt1)->defining_line < (*elt2)->defining_line)
+ ret = -1;
+else if ((*elt1)->defining_line > (*elt2)->defining_line)
+ ret = 1;
+ if (ret == 0)
+if ((*elt1)->entry_number < (*elt2)->entry_number)
+ ret = -1;
+else if ((*elt1)->entry_number > (*elt2)->entry_number)
+ ret = 1;
+ if (ret == 0) {
+abort ();
+ }
+
+ return ret;
}
/* Force all index entries to be unique. */
CVS commit: src/external/gpl2/texinfo/dist/makeinfo
Module Name:src Committed By: christos Date: Tue Apr 16 23:43:08 UTC 2024 Modified Files: src/external/gpl2/texinfo/dist/makeinfo: index.c Log Message: Add comparison function so that it can be used to provide a stable sort (Jan-Benedict Glaw) To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/texinfo/dist/makeinfo/index.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/common
Module Name:src Committed By: christos Date: Tue Apr 16 23:40:36 UTC 2024 Modified Files: src/distrib/common: parselist.awk Log Message: Set LC_ALL=C before calling sort so that it works consistently. Unfortunately ENVIRON["LC_ALL"] = "C"; does not work like in gawk (Jan-Benedict Glaw) To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/distrib/common/parselist.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/common
Module Name:src
Committed By: christos
Date: Tue Apr 16 23:40:36 UTC 2024
Modified Files:
src/distrib/common: parselist.awk
Log Message:
Set LC_ALL=C before calling sort so that it works consistently. Unfortunately
ENVIRON["LC_ALL"] = "C"; does not work like in gawk (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/common/parselist.awk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/parselist.awk
diff -u src/distrib/common/parselist.awk:1.16 src/distrib/common/parselist.awk:1.17
--- src/distrib/common/parselist.awk:1.16 Fri Apr 10 12:16:12 2009
+++ src/distrib/common/parselist.awk Tue Apr 16 19:40:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: parselist.awk,v 1.16 2009/04/10 16:16:12 apb Exp $
+# $NetBSD: parselist.awk,v 1.17 2024/04/16 23:40:36 christos Exp $
#
# Copyright (c) 2002 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -177,7 +177,7 @@ $1 == "COPYDIR" \
destdir=$3;
if (mode == "mtree") {
printf("./%s type=dir mode=755\n", destdir);
- command="cd " srcdir " && find . -type d -print"
+ command="cd " srcdir " && find . -type d -print | LC_ALL=C sort"
while (command | getline dir) {
gsub(/^\.\//, "", dir);
if (dir == ".")
@@ -187,7 +187,7 @@ $1 == "COPYDIR" \
close(command);
}
if (mode == "install" || mode == "mtree" || mode == "populate") {
- command="cd " srcdir " && find . -type f -print"
+ command="cd " srcdir " && find . -type f -print | LC_ALL=C sort"
while (command | getline srcfile) {
gsub(/^\.\//, "", srcfile);
copy(srcdir "/" srcfile, destdir "/" srcfile, "");
CVS commit: src/bin/sh
Module Name:src
Committed By: christos
Date: Tue Apr 16 23:30:19 UTC 2024
Modified Files:
src/bin/sh: mkoptions.sh
Log Message:
Be more explicit with sort fields to produce consistent results with gnu
sort (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/bin/sh/mkoptions.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/mkoptions.sh
diff -u src/bin/sh/mkoptions.sh:1.7 src/bin/sh/mkoptions.sh:1.8
--- src/bin/sh/mkoptions.sh:1.7 Sat Apr 6 10:20:27 2024
+++ src/bin/sh/mkoptions.sh Tue Apr 16 19:30:19 2024
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: mkoptions.sh,v 1.7 2024/04/06 14:20:27 kre Exp $
+# $NetBSD: mkoptions.sh,v 1.8 2024/04/16 23:30:19 christos Exp $
#
# It would be more sensible to generate 2 .h files, one which
@@ -52,8 +52,8 @@ ${SED:-sed} <"${IF}" \
-e '/^#/d' \
-e '/^[ ]*\//d' \
-e '/^[ ]*\*/d' \
- -e '/^[ ]*;/d' |
-sort -b -k2,2f -k2,2|
+ -e '/^[ ]*;/d' |
+sort -k2b,2f -k2b,2 |
while read line
do
# Look for comments in various styles, and ignore them
CVS commit: src/bin/sh
Module Name:src Committed By: christos Date: Tue Apr 16 23:30:19 UTC 2024 Modified Files: src/bin/sh: mkoptions.sh Log Message: Be more explicit with sort fields to produce consistent results with gnu sort (Jan-Benedict Glaw) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/bin/sh/mkoptions.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: christos Date: Tue Apr 16 19:15:37 UTC 2024 Modified Files: src/distrib/sets/lists/base32: ad.aarch64 ad.mips64eb ad.mips64el ad.powerpc64 ad.riscv64 md.amd64 md.sparc64 src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64 md.sparc64 src/etc/mtree: NetBSD.dist.compat.in src/external/mpl/bind/lib/plugins: Makefile Log Message: fix compat build of filter-.so.0 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base32/ad.aarch64 \ src/distrib/sets/lists/base32/ad.mips64eb \ src/distrib/sets/lists/base32/ad.mips64el \ src/distrib/sets/lists/base32/ad.powerpc64 \ src/distrib/sets/lists/base32/ad.riscv64 \ src/distrib/sets/lists/base32/md.sparc64 cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base32/md.amd64 cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug32/ad.aarch64 \ src/distrib/sets/lists/debug32/ad.mips64eb \ src/distrib/sets/lists/debug32/ad.mips64el \ src/distrib/sets/lists/debug32/ad.powerpc64 \ src/distrib/sets/lists/debug32/ad.riscv64 \ src/distrib/sets/lists/debug32/md.sparc64 cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug32/ad.mipsn64eb \ src/distrib/sets/lists/debug32/ad.mipsn64el cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug32/md.amd64 cvs rdiff -u -r1.7 -r1.8 src/etc/mtree/NetBSD.dist.compat.in cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/lib/plugins/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base32/ad.aarch64 diff -u src/distrib/sets/lists/base32/ad.aarch64:1.2 src/distrib/sets/lists/base32/ad.aarch64:1.3 --- src/distrib/sets/lists/base32/ad.aarch64:1.2 Sat Apr 13 04:50:18 2024 +++ src/distrib/sets/lists/base32/ad.aarch64 Tue Apr 16 15:15:36 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.2 2024/04/13 08:50:18 nakayama Exp $ +# $NetBSD: ad.aarch64,v 1.3 2024/04/16 19:15:36 christos Exp $ ./lib/eabi base-compat-shlib compat ./lib/eabi/npf base-compat-shlib compat,npf ./lib/eabi/npf/ext_log.so base-compat-shlib compat,npf @@ -490,6 +490,8 @@ ./usr/lib/eabi/lua/5.4/netpgp.so base-compat-shlib compat ./usr/lib/eabi/lua/5.4/sqlite.so base-compat-shlib compat ./usr/lib/eabi/lua/5.4/syslog.so base-compat-shlib compat +./usr/lib/eabi/namedbase-compat-shlib compat +./usr/lib/eabi/named/filter-.so.0 base-compat-shlib compat ./usr/lib/eabi/opensslbase-crypto-usr compat ./usr/lib/eabi/openssl/engines base-crypto-usr compat ./usr/lib/eabi/openssl/engines/dasync.so base-crypto-usr compat,pic,openssl=30 @@ -990,6 +992,8 @@ ./usr/lib/eabihf/lua/5.4/netpgp.so base-compat-shlib compat ./usr/lib/eabihf/lua/5.4/sqlite.so base-compat-shlib compat ./usr/lib/eabihf/lua/5.4/syslog.so base-compat-shlib compat +./usr/lib/eabihf/namedbase-compat-shlib compat +./usr/lib/eabihf/named/filter-.so.0 base-compat-shlib compat ./usr/lib/eabihf/opensslbase-crypto-usr compat ./usr/lib/eabihf/openssl/engines base-crypto-usr compat ./usr/lib/eabihf/openssl/engines/dasync.so base-crypto-usr compat,pic,openssl=30 @@ -1029,9 +1033,11 @@ ./usr/libdata/debug/lib/eabihf/npf base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabi base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabi/i18n base-compat-shlib compat +./usr/libdata/debug/usr/lib/eabi/named base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabi/security base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabihf base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabihf/i18n base-compat-shlib compat +./usr/libdata/debug/usr/lib/eabihf/named base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabihf/security base-compat-shlib compat ./usr/libexec/ld.elf_so-eabi base-sys-shlib compat,pic ./usr/libexec/ld.elf_so-eabihf base-sys-shlib compat,pic Index: src/distrib/sets/lists/base32/ad.mips64eb diff -u src/distrib/sets/lists/base32/ad.mips64eb:1.2 src/distrib/sets/lists/base32/ad.mips64eb:1.3 --- src/distrib/sets/lists/base32/ad.mips64eb:1.2 Sat Apr 13 04:50:19 2024 +++ src/distrib/sets/lists/base32/ad.mips64eb Tue Apr 16 15:15:36 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.2 2024/04/13 08:50:19 nakayama Exp $ +# $NetBSD: ad.mips64eb,v 1.3 2024/04/16 19:15:36 christos Exp $ ./lib/64 base-compat-shlib compat ./lib/64/npf base-compat-shlib compat,npf ./lib/64/npf/ext_log.so base-compat-shlib compat,npf @@ -493,6 +493,8 @@ ./usr/lib/64/lua/5.4/netpgp.so base-compat-shlib compat ./usr/lib/64/lua/5.4/sqlite.so base-compat-shlib compat ./usr/lib/64/lua/5.4/syslog.so base-compat-shlib compat +./usr/lib/64/namedbase-compat-shlib compat +./usr/lib/64/named/filter-.so.0 base-compat-shlib compat ./usr/lib/64/opensslbase-crypto-usr compat
CVS commit: src
Module Name:src Committed By: christos Date: Tue Apr 16 19:15:37 UTC 2024 Modified Files: src/distrib/sets/lists/base32: ad.aarch64 ad.mips64eb ad.mips64el ad.powerpc64 ad.riscv64 md.amd64 md.sparc64 src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64 md.sparc64 src/etc/mtree: NetBSD.dist.compat.in src/external/mpl/bind/lib/plugins: Makefile Log Message: fix compat build of filter-.so.0 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base32/ad.aarch64 \ src/distrib/sets/lists/base32/ad.mips64eb \ src/distrib/sets/lists/base32/ad.mips64el \ src/distrib/sets/lists/base32/ad.powerpc64 \ src/distrib/sets/lists/base32/ad.riscv64 \ src/distrib/sets/lists/base32/md.sparc64 cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base32/md.amd64 cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug32/ad.aarch64 \ src/distrib/sets/lists/debug32/ad.mips64eb \ src/distrib/sets/lists/debug32/ad.mips64el \ src/distrib/sets/lists/debug32/ad.powerpc64 \ src/distrib/sets/lists/debug32/ad.riscv64 \ src/distrib/sets/lists/debug32/md.sparc64 cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug32/ad.mipsn64eb \ src/distrib/sets/lists/debug32/ad.mipsn64el cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug32/md.amd64 cvs rdiff -u -r1.7 -r1.8 src/etc/mtree/NetBSD.dist.compat.in cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/lib/plugins/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/lib/plugins
Module Name:src
Committed By: christos
Date: Sat Apr 13 17:22:33 UTC 2024
Modified Files:
src/external/mpl/bind/lib/plugins: Makefile
Log Message:
Don't build/install the compat plugin.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/lib/plugins/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/mpl/bind/lib/plugins/Makefile
diff -u src/external/mpl/bind/lib/plugins/Makefile:1.5 src/external/mpl/bind/lib/plugins/Makefile:1.6
--- src/external/mpl/bind/lib/plugins/Makefile:1.5 Thu Apr 4 21:16:01 2024
+++ src/external/mpl/bind/lib/plugins/Makefile Sat Apr 13 13:22:33 2024
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2024/04/05 01:16:01 christos Exp $
+# $NetBSD: Makefile,v 1.6 2024/04/13 17:22:33 christos Exp $
LIBISMODULE= yes
MAKELINKLIB= no
+.include
+
+.if !defined(MLIBDIR)
LIB= filter-
-.include
SHLIB_MAJOR=0
SRCS= filter-.c
@@ -13,5 +15,6 @@ LIBDIR= /usr/lib/named
DIST=${IDIST}/bin/plugins
.PATH: ${DIST}
+.endif
.include
CVS commit: src/external/mpl/bind/lib/plugins
Module Name:src Committed By: christos Date: Sat Apr 13 17:22:33 UTC 2024 Modified Files: src/external/mpl/bind/lib/plugins: Makefile Log Message: Don't build/install the compat plugin. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/lib/plugins/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libintl
Module Name:src
Committed By: christos
Date: Sat Apr 13 02:01:38 UTC 2024
Modified Files:
src/lib/libintl: gettext.c
Log Message:
PR/58136: Paul Ripke: Fix use after free.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/lib/libintl/gettext.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libintl/gettext.c
diff -u src/lib/libintl/gettext.c:1.31 src/lib/libintl/gettext.c:1.32
--- src/lib/libintl/gettext.c:1.31 Thu Oct 3 12:35:57 2019
+++ src/lib/libintl/gettext.c Fri Apr 12 22:01:38 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gettext.c,v 1.31 2019/10/03 16:35:57 christos Exp $ */
+/* $NetBSD: gettext.c,v 1.32 2024/04/13 02:01:38 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 Citrus Project,
@@ -29,7 +29,7 @@
*/
#include
-__RCSID("$NetBSD: gettext.c,v 1.31 2019/10/03 16:35:57 christos Exp $");
+__RCSID("$NetBSD: gettext.c,v 1.32 2024/04/13 02:01:38 christos Exp $");
#include
#include
@@ -176,6 +176,9 @@ pgettext_impl(const char *domainname, co
msgid2, n, category);
free(msgctxt_id);
+ if (translation == msgctxt_id)
+ return msgid1;
+
p = strchr(translation, '\004');
if (p)
return p + 1;
CVS commit: src/lib/libintl
Module Name:src Committed By: christos Date: Sat Apr 13 02:01:38 UTC 2024 Modified Files: src/lib/libintl: gettext.c Log Message: PR/58136: Paul Ripke: Fix use after free. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libintl/gettext.c 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: Thu Apr 11 19:12:11 UTC 2024 Modified Files: src/share/mk: bsd.lib.mk Log Message: fix previous. Doing assignmnents of conditionals does not work for being used as conditionals (thanks rillig@) To generate a diff of this commit: cvs rdiff -u -r1.401 -r1.402 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: Thu Apr 11 19:12:11 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
fix previous. Doing assignmnents of conditionals does not work for being
used as conditionals (thanks rillig@)
To generate a diff of this commit:
cvs rdiff -u -r1.401 -r1.402 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.401 src/share/mk/bsd.lib.mk:1.402
--- src/share/mk/bsd.lib.mk:1.401 Tue Apr 9 18:37:23 2024
+++ src/share/mk/bsd.lib.mk Thu Apr 11 15:12:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.401 2024/04/09 22:37:23 christos Exp $
+# $NetBSD: bsd.lib.mk,v 1.402 2024/04/11 19:12:11 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -425,11 +425,15 @@ _DEST.LINT:=${DESTDIR}${LINTLIBDIR}
_DEST.DEBUG:=${DESTDIR}${DEBUGDIR}${LIBDIR}
_DEST.ODEBUG:=${DESTDIR}${DEBUGDIR}${_LIBSODIR}
-_BUILDSTATICLIB= ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
+.if ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
|| ${MAKELINKLIB} != "no" || ${MAKESTATICLIB} != "no"
+_BUILDSTATICLIB=yes
+.else
+_BUILDSTATICLIB=no
+.endif
.if defined(LIB) # {
-.if ${_BUILDSTATICLIB}
+.if ${_BUILDSTATICLIB} != "no"
_LIBS=${_LIB.a}
.else
_LIBS=
@@ -484,7 +488,7 @@ _LIBS+=${_LIB.ln}
.endif
ALLOBJS=
-.if ${_BUILDSTATICLIB}
+.if ${_BUILDSTATICLIB} != "no"
ALLOBJS+=${STOBJS}
.endif
ALLOBJS+=${POBJS} ${SOBJS}
CVS commit: src/lib/libc/rpc
Module Name:src
Committed By: christos
Date: Thu Apr 11 18:41:03 UTC 2024
Modified Files:
src/lib/libc/rpc: xdr_float.c
Log Message:
avoid lint warning on the vax
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/lib/libc/rpc/xdr_float.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/rpc/xdr_float.c
diff -u src/lib/libc/rpc/xdr_float.c:1.41 src/lib/libc/rpc/xdr_float.c:1.42
--- src/lib/libc/rpc/xdr_float.c:1.41 Mon Feb 15 06:07:48 2016
+++ src/lib/libc/rpc/xdr_float.c Thu Apr 11 14:41:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: xdr_float.c,v 1.41 2016/02/15 11:07:48 martin Exp $ */
+/* $NetBSD: xdr_float.c,v 1.42 2024/04/11 18:41:03 christos Exp $ */
/*
* Copyright (c) 2010, Oracle America, Inc.
@@ -37,7 +37,7 @@
static char *sccsid = "@(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)xdr_float.c 2.1 88/07/29 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: xdr_float.c,v 1.41 2016/02/15 11:07:48 martin Exp $");
+__RCSID("$NetBSD: xdr_float.c,v 1.42 2024/04/11 18:41:03 christos Exp $");
#endif
#endif
@@ -254,6 +254,7 @@ xdr_double(XDR *xdrs, double *dp)
goto shipit;
}
}
+ /*LINTED: possible overflow*/
id.exp = vd.exp - VAX_DBL_BIAS + IEEE_DBL_BIAS;
id.mantissa1 = (vd.mantissa1 << 13) |
((unsigned int)vd.mantissa2 >> 3);
@@ -296,6 +297,7 @@ xdr_double(XDR *xdrs, double *dp)
goto doneit;
}
}
+ /*LINTED: can overflow */
vd.exp = id.exp - IEEE_DBL_BIAS + VAX_DBL_BIAS;
vd.mantissa1 = ((unsigned int)id.mantissa1 >> 13);
vd.mantissa2 = ((id.mantissa1 & MASK(13)) << 3) |
CVS commit: src/lib/libc/rpc
Module Name:src Committed By: christos Date: Thu Apr 11 18:41:03 UTC 2024 Modified Files: src/lib/libc/rpc: xdr_float.c Log Message: avoid lint warning on the vax To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/lib/libc/rpc/xdr_float.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/libuv/lib
Module Name:src Committed By: christos Date: Tue Apr 9 22:38:17 UTC 2024 Modified Files: src/external/mit/libuv/lib: Makefile Log Message: Now that the bug in bsd.lib.mk, MAKELINKLIB is not needed anymore (as it should not be). Pointed out by kre@ To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/mit/libuv/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/libuv/lib
Module Name:src
Committed By: christos
Date: Tue Apr 9 22:38:17 UTC 2024
Modified Files:
src/external/mit/libuv/lib: Makefile
Log Message:
Now that the bug in bsd.lib.mk, MAKELINKLIB is not needed anymore (as it
should not be). Pointed out by kre@
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/libuv/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/mit/libuv/lib/Makefile
diff -u src/external/mit/libuv/lib/Makefile:1.9 src/external/mit/libuv/lib/Makefile:1.10
--- src/external/mit/libuv/lib/Makefile:1.9 Fri Apr 5 08:03:24 2024
+++ src/external/mit/libuv/lib/Makefile Tue Apr 9 18:38:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2024/04/05 12:03:24 kre Exp $
+# $NetBSD: Makefile,v 1.10 2024/04/09 22:38:17 christos Exp $
LIBISPRIVATE=pic
@@ -8,7 +8,6 @@ MKLINT= no
LIB= uv
MAKESTATICLIB=yes
-MAKELINKLIB=yes
.if ${LIBISPRIVATE:Uno} == "no"
INCS= uv.h uv/unix.h uv/bsd.h uv/errno.h uv/version.h uv/threadpool.h
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Apr 9 22:37:23 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
Merge two identical if's and fix a logic error in them ( && instead of ||)
To generate a diff of this commit:
cvs rdiff -u -r1.400 -r1.401 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.400 src/share/mk/bsd.lib.mk:1.401
--- src/share/mk/bsd.lib.mk:1.400 Thu Apr 4 21:16:00 2024
+++ src/share/mk/bsd.lib.mk Tue Apr 9 18:37:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.400 2024/04/05 01:16:00 christos Exp $
+# $NetBSD: bsd.lib.mk,v 1.401 2024/04/09 22:37:23 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -425,9 +425,11 @@ _DEST.LINT:=${DESTDIR}${LINTLIBDIR}
_DEST.DEBUG:=${DESTDIR}${DEBUGDIR}${LIBDIR}
_DEST.ODEBUG:=${DESTDIR}${DEBUGDIR}${_LIBSODIR}
+_BUILDSTATICLIB= ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
+|| ${MAKELINKLIB} != "no" || ${MAKESTATICLIB} != "no"
+
.if defined(LIB) # {
-.if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
- || ${MAKELINKLIB} != "no") && ${MAKESTATICLIB} != "no"
+.if ${_BUILDSTATICLIB}
_LIBS=${_LIB.a}
.else
_LIBS=
@@ -482,8 +484,7 @@ _LIBS+=${_LIB.ln}
.endif
ALLOBJS=
-.if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
- || ${MAKELINKLIB} != "no") && ${MAKESTATICLIB} != "no"
+.if ${_BUILDSTATICLIB}
ALLOBJS+=${STOBJS}
.endif
ALLOBJS+=${POBJS} ${SOBJS}
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Tue Apr 9 22:37:23 UTC 2024 Modified Files: src/share/mk: bsd.lib.mk Log Message: Merge two identical if's and fix a logic error in them ( && instead of ||) To generate a diff of this commit: cvs rdiff -u -r1.400 -r1.401 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/etc/mtree
Module Name:src Committed By: christos Date: Mon Apr 8 12:38:59 UTC 2024 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: kre says this should be obsolete To generate a diff of this commit: cvs rdiff -u -r1.258 -r1.259 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Mon Apr 8 12:38:59 UTC 2024 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: kre says this should be obsolete To generate a diff of this commit: cvs rdiff -u -r1.258 -r1.259 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.258 src/etc/mtree/NetBSD.dist.base:1.259 --- src/etc/mtree/NetBSD.dist.base:1.258 Mon Apr 8 08:32:15 2024 +++ src/etc/mtree/NetBSD.dist.base Mon Apr 8 08:38:59 2024 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.258 2024/04/08 12:32:15 christos Exp $ +# $NetBSD: NetBSD.dist.base,v 1.259 2024/04/08 12:38:59 christos Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -1451,7 +1451,6 @@ ./var/preserve ./var/quotas gname=operator mode=0750 ./var/run -./var/run/named mode=0775 uname=named gname=named ./var/rwho uname=_rwhod gname=_rwhod ./var/shm mode=01777 ./var/spool
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Mon Apr 8 12:32:16 UTC 2024 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: put back /var/run/named To generate a diff of this commit: cvs rdiff -u -r1.257 -r1.258 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.257 src/etc/mtree/NetBSD.dist.base:1.258 --- src/etc/mtree/NetBSD.dist.base:1.257 Thu Apr 4 21:15:59 2024 +++ src/etc/mtree/NetBSD.dist.base Mon Apr 8 08:32:15 2024 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.257 2024/04/05 01:15:59 christos Exp $ +# $NetBSD: NetBSD.dist.base,v 1.258 2024/04/08 12:32:15 christos Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -1451,6 +1451,7 @@ ./var/preserve ./var/quotas gname=operator mode=0750 ./var/run +./var/run/named mode=0775 uname=named gname=named ./var/rwho uname=_rwhod gname=_rwhod ./var/shm mode=01777 ./var/spool
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Mon Apr 8 12:32:16 UTC 2024 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: put back /var/run/named To generate a diff of this commit: cvs rdiff -u -r1.257 -r1.258 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Sun Apr 7 15:02:08 UTC 2024 Modified Files: src/distrib/sets/lists/base: mi Log Message: /var/run/named is not obsolete To generate a diff of this commit: cvs rdiff -u -r1.1339 -r1.1340 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Sun Apr 7 15:02:08 UTC 2024 Modified Files: src/distrib/sets/lists/base: mi Log Message: /var/run/named is not obsolete To generate a diff of this commit: cvs rdiff -u -r1.1339 -r1.1340 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1339 src/distrib/sets/lists/base/mi:1.1340 --- src/distrib/sets/lists/base/mi:1.1339 Thu Apr 4 21:15:59 2024 +++ src/distrib/sets/lists/base/mi Sun Apr 7 11:02:08 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1339 2024/04/05 01:15:59 christos Exp $ +# $NetBSD: mi,v 1.1340 2024/04/07 15:02:08 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -6377,7 +6377,7 @@ ./var/quotas base-util-root ./var/run base-sys-root ./var/run/lwresdbase-obsolete obsolete -./var/run/named base-obsolete obsolete +./var/run/named base-bind-root ./var/rwho base-netutil-root ./var/shm base-sys-root ./var/spool base-sys-root
CVS commit: src/external/gpl2/texinfo/dist/util
Module Name:src
Committed By: christos
Date: Sun Apr 7 12:30:38 UTC 2024
Modified Files:
src/external/gpl2/texinfo/dist/util: texindex.c
Log Message:
make qsort sorting deterministic
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/texinfo/dist/util/texindex.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/texinfo/dist/util/texindex.c
diff -u src/external/gpl2/texinfo/dist/util/texindex.c:1.2 src/external/gpl2/texinfo/dist/util/texindex.c:1.3
--- src/external/gpl2/texinfo/dist/util/texindex.c:1.2 Wed Jan 13 19:34:53 2016
+++ src/external/gpl2/texinfo/dist/util/texindex.c Sun Apr 7 08:30:38 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: texindex.c,v 1.2 2016/01/14 00:34:53 christos Exp $ */
+/* $NetBSD: texindex.c,v 1.3 2024/04/07 12:30:38 christos Exp $ */
/* texindex -- sort TeX index dribble output into an actual index.
Id: texindex.c,v 1.11 2004/04/11 17:56:47 karl Exp
@@ -55,6 +55,7 @@ struct lineinfo
long number;/* The numeric value (for numeric comparison). */
} key;
long keylen; /* Length of KEY field. */
+ size_t idx; /* tie breaker */
};
/* This structure describes a field to use as a sort key. */
@@ -369,7 +370,9 @@ compare_full (const void *p1, const void
}
}
- return 0; /* Lines match exactly. */
+ if (*line1 == *line2)
+abort ();
+ return *line1 < *line2 ? -1 : 1;
}
/* Compare LINE1 and LINE2, described by structures
@@ -428,7 +431,9 @@ compare_prepared (const void *p1, const
}
}
- return 0; /* Lines match exactly. */
+ if (line1->idx == line2->idx)
+abort ();
+ return line1->idx < line2->idx ? -1 : 1;
}
/* Like compare_full but more general.
@@ -799,11 +804,13 @@ sort_in_core (char *infile, int total, c
if (lineinfo)
{
+ size_t idx = 0;
struct lineinfo *lp;
char **p;
for (lp = lineinfo, p = linearray; p != nextline; lp++, p++)
{
+ lp->idx = idx++;
lp->text = *p;
lp->key.text = find_field (keyfields, *p, >keylen);
if (keyfields->numeric)
CVS commit: src/external/gpl2/texinfo/dist/util
Module Name:src Committed By: christos Date: Sun Apr 7 12:30:38 UTC 2024 Modified Files: src/external/gpl2/texinfo/dist/util: texindex.c Log Message: make qsort sorting deterministic To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/texinfo/dist/util/texindex.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libedit
Module Name:src Committed By: christos Date: Sat Apr 6 13:36:11 UTC 2024 Modified Files: src/lib/libedit: editline.7 Log Message: update em-toggle-overwrite binding (Xose Vazquez Perez) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libedit/editline.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libedit/editline.7 diff -u src/lib/libedit/editline.7:1.5 src/lib/libedit/editline.7:1.6 --- src/lib/libedit/editline.7:1.5 Mon May 9 17:27:55 2016 +++ src/lib/libedit/editline.7 Sat Apr 6 09:36:11 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: editline.7,v 1.5 2016/05/09 21:27:55 christos Exp $ +.\" $NetBSD: editline.7,v 1.6 2024/04/06 13:36:11 christos Exp $ .\" $OpenBSD: editline.7,v 1.1 2016/04/20 01:11:45 schwarze Exp $ .\" .\" Copyright (c) 2016 Ingo Schwarze @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd May 7, 2016 +.Dd April 6, 2024 .Dt EDITLINE 7 .Os .Sh NAME @@ -546,7 +546,7 @@ It is an error if the cursor is already buffer. .It Ic em-set-mark Pq emacs: Ctrl-Q, NUL Set the mark at the current cursor position. -.It Ic em-toggle-overwrite Pq not bound by default +.It Ic em-toggle-overwrite Pq insert Switch from insert to overwrite mode or vice versa. .It Ic em-universal-argument Pq not bound by default If in argument input mode, multiply the argument by 4.
CVS commit: src/lib/libedit
Module Name:src Committed By: christos Date: Sat Apr 6 13:36:11 UTC 2024 Modified Files: src/lib/libedit: editline.7 Log Message: update em-toggle-overwrite binding (Xose Vazquez Perez) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libedit/editline.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/doc/standards/xopen
Module Name:src
Committed By: christos
Date: Fri Apr 5 23:06:32 UTC 2024
Modified Files:
src/share/doc/standards/xopen: Makefile
Log Message:
spacify the paper size for PostScript
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/doc/standards/xopen/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/doc/standards/xopen/Makefile
diff -u src/share/doc/standards/xopen/Makefile:1.5 src/share/doc/standards/xopen/Makefile:1.6
--- src/share/doc/standards/xopen/Makefile:1.5 Fri Aug 1 13:04:01 2003
+++ src/share/doc/standards/xopen/Makefile Fri Apr 5 19:06:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/08/01 17:04:01 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2024/04/05 23:06:32 christos Exp $
DOCS= xcu5
.for i in ${DOCS}
@@ -7,7 +7,7 @@ TARGS+= ${i}.ps ${i}.txt ${i}.html ${i}.
POST_PLAIN= -P-b -P-u -P-o -Tascii
-ARGS_PS= ${GFLAGS} -dformat=PostScript
+ARGS_PS= ${GFLAGS} -dformat=PostScript ${ROFF_PAGESIZE}
ARGS_TXT= ${GFLAGS} -dformat=ASCII ${POST_PLAIN}
ARGS_HTML= ${GFLAGS} -dformat=HTML ${POST_PLAIN} -ww
ARGS_MORE= ${GFLAGS} -dformat=more -P-h -Tascii
CVS commit: src/share/doc/standards/xopen
Module Name:src Committed By: christos Date: Fri Apr 5 23:06:32 UTC 2024 Modified Files: src/share/doc/standards/xopen: Makefile Log Message: spacify the paper size for PostScript To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/doc/standards/xopen/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man0
Module Name:src
Committed By: christos
Date: Fri Apr 5 23:05:54 UTC 2024
Modified Files:
src/share/man/man0: Makefile
Log Message:
specify the page size for PostScript
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/share/man/man0/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man0/Makefile
diff -u src/share/man/man0/Makefile:1.18 src/share/man/man0/Makefile:1.19
--- src/share/man/man0/Makefile:1.18 Mon May 22 08:55:44 2023
+++ src/share/man/man0/Makefile Fri Apr 5 19:05:53 2024
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.9 (Berkeley) 7/1/91
-# $NetBSD: Makefile,v 1.18 2023/05/22 12:55:44 lukem Exp $
+# $NetBSD: Makefile,v 1.19 2024/04/05 23:05:53 christos Exp $
#
# Note: Needs ps2pdf to convert .ps to .pdf
@@ -77,10 +77,10 @@ man${_S}pages.ps: man${_S}pages.files
if ${TOOL_GREP} -q ^\\.TS "${.CURDIR}/back" ; \
then \
${_MKSHMSG_FORMAT} >&2 $${f} ; \
- cat $${f} | ${TOOL_TBL} | ${TOOL_GROFF} -Z -msafer -man -Tps ; \
+ cat $${f} | ${TOOL_TBL} | ${TOOL_GROFF} -Z -msafer -man -Tps ${ROFF_PAGESIZE}; \
else \
${_MKSHMSG_FORMAT} >&2 $${f} "(tbl)"; \
- cat $${f} | ${TOOL_GROFF} -Z -msafer -man -Tps ; \
+ cat $${f} | ${TOOL_GROFF} -Z -msafer -man -Tps ${ROFF_PAGESIZE}; \
fi ; \
done > ${.TARGET}.troff.tmp \
&& cat ${.TARGET}.troff.tmp \
CVS commit: src/share/man/man0
Module Name:src Committed By: christos Date: Fri Apr 5 23:05:54 UTC 2024 Modified Files: src/share/man/man0: Makefile Log Message: specify the page size for PostScript To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/man/man0/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes
Module Name:src
Committed By: christos
Date: Fri Apr 5 23:05:04 UTC 2024
Modified Files:
src/distrib/notes: Makefile.inc
Log Message:
specify the paper size for PostScript
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/distrib/notes/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.59 src/distrib/notes/Makefile.inc:1.60
--- src/distrib/notes/Makefile.inc:1.59 Thu Nov 16 13:06:05 2023
+++ src/distrib/notes/Makefile.inc Fri Apr 5 19:05:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.59 2023/11/16 18:06:05 christos Exp $
+# $NetBSD: Makefile.inc,v 1.60 2024/04/05 23:05:04 christos Exp $
#
# Ross Harvey
@@ -71,7 +71,7 @@ PRESET+= -dcur_date="${curdate}"
POST_PLAIN= -P-b -P-u -P-o
-ARGS_PS= ${PRESET} -dformat=PostScript
+ARGS_PS= ${PRESET} -dformat=PostScript ${ROFF_PAGESIZE}
ARGS_TXT= ${PRESET} -dformat=ASCII ${POST_PLAIN} -Tascii -mtty-char
ARGS_HTML= ${PRESET} -dformat=HTML ${POST_PLAIN} -Tlatin1 -ww
ARGS_MORE= ${PRESET} -dformat=more -P-h -Tascii -mtty-char
CVS commit: src/distrib/notes
Module Name:src Committed By: christos Date: Fri Apr 5 23:05:04 UTC 2024 Modified Files: src/distrib/notes: Makefile.inc Log Message: specify the paper size for PostScript To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/distrib/notes/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libterminfo
Module Name:src Committed By: christos Date: Fri Apr 5 22:30:18 UTC 2024 Modified Files: src/lib/libterminfo: genman Log Message: >From Jan-Benedict Glaw: Use `printf` instead of `echo` for precise output `man` pages generated under NetBSD and Linux differ as the escape codes may or may not be interpreted when going through those two chained `echo`es. Instead just use `printf`, which produces the desired output, always. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libterminfo/genman Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libterminfo
Module Name:src
Committed By: christos
Date: Fri Apr 5 22:30:18 UTC 2024
Modified Files:
src/lib/libterminfo: genman
Log Message:
>From Jan-Benedict Glaw:
Use `printf` instead of `echo` for precise output
`man` pages generated under NetBSD and Linux differ as the escape codes
may or may not be interpreted when going through those two chained `echo`es.
Instead just use `printf`, which produces the desired output, always.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libterminfo/genman
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/genman
diff -u src/lib/libterminfo/genman:1.5 src/lib/libterminfo/genman:1.6
--- src/lib/libterminfo/genman:1.5 Fri Jan 25 07:52:45 2013
+++ src/lib/libterminfo/genman Fri Apr 5 18:30:18 2024
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: genman,v 1.5 2013/01/25 12:52:45 roy Exp $
+# $NetBSD: genman,v 1.6 2024/04/05 22:30:18 christos Exp $
# Copyright (c) 2009, 2013 The NetBSD Foundation, Inc.
#
@@ -44,11 +44,11 @@ gentab()
# Generate a list of long names and codes
$TOOL_SED -n \
-e "s/#define t_\([^(]*\).*>$tab\[TICODE_\([^]]*\).*/\1 \2/p" \
- $ti | $TOOL_SORT | while read name code foo; do
+ $ti | $TOOL_SORT | while read name code _; do
cap=$($TOOL_SED -ne "s/.*{ \"\(..\)\", TICODE_$code }.*/\1/p" \
$tc | head -n 1)
desc=$($TOOL_SED -ne "s/ \* $name\: \(.*\)/\1/p" $ti)
- echo ".It \"\\&$name\" Ta Sy \"\\&$code\" Ta Sy \"\\&$cap\" Ta \"\\&$desc\""
+ printf '.It "\\&%s" Ta Sy "\\&%s" Ta Sy "\\&%s" Ta "\\&%s"\n' "${name}" "${code}" "${cap}" "${desc}"
done
}
@@ -56,15 +56,15 @@ boolcaps=$(gentab $TERMH $TERMC flags)
numcaps=$(gentab $TERMH $TERMC nums)
strcaps=$(gentab $TERMH $TERMC strs)
-echo ".\\\"DO NOT EDIT"
-echo ".\\\"Automatically generated from termcap.5.in"
-echo ".\\\""
+printf '.\\"DO NOT EDIT\n'
+printf '.\\"Automatically generated from termcap.5.in\n'
+printf '.\\"\n'
while read -r line; do
case "$line" in
- "@BOOLCAPS@") echo "$boolcaps";;
- "@NUMCAPS@") echo "$numcaps";;
- "@STRCAPS@") echo "$strcaps";;
- *) echo "$line";;
+ "@BOOLCAPS@") printf '%s\n' "${boolcaps}";;
+ "@NUMCAPS@") printf '%s\n' "${numcaps}";;
+ "@STRCAPS@") printf '%s\n' "${strcaps}";;
+ *) printf '%s\n' "${line}";;
esac
done <$TERMM
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Fri Apr 5 22:28:20 UTC 2024
Modified Files:
src/sys/conf: newvers_stand.mk
Log Message:
Use ${TOOL_DATE} (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/conf/newvers_stand.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers_stand.mk
diff -u src/sys/conf/newvers_stand.mk:1.4 src/sys/conf/newvers_stand.mk:1.5
--- src/sys/conf/newvers_stand.mk:1.4 Fri May 21 07:28:11 2021
+++ src/sys/conf/newvers_stand.mk Fri Apr 5 18:28:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: newvers_stand.mk,v 1.4 2021/05/21 11:28:11 nakayama Exp $
+# $NetBSD: newvers_stand.mk,v 1.5 2024/04/05 22:28:20 christos Exp $
VERSIONFILE?=version
VERSIONMACHINE?=${MACHINE}
@@ -19,7 +19,7 @@ VERSIONFLAGS+=-d
vers.c: ${VERSIONFILE} ${_NETBSD_VERSION_DEPENDS}
${_MKTARGET_CREATE}
- ${HOST_SH} ${S}/conf/newvers_stand.sh \
+ TOOL_DATE=${TOOL_DATE} ${HOST_SH} ${S}/conf/newvers_stand.sh \
-m ${VERSIONMACHINE} ${VERSIONFLAGS} ${.ALLSRC:[1]} ${NEWVERSWHAT}
.endif
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Fri Apr 5 22:28:20 UTC 2024
Modified Files:
src/sys/conf: newvers_stand.mk
Log Message:
Use ${TOOL_DATE} (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/conf/newvers_stand.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Fri Apr 5 22:27:25 UTC 2024
Modified Files:
src/sys/conf: newvers.mk newvers.sh
Log Message:
Use ${TOOL_DATE} (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/conf/newvers.mk
cvs rdiff -u -r1.62 -r1.63 src/sys/conf/newvers.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Fri Apr 5 22:27:25 UTC 2024
Modified Files:
src/sys/conf: newvers.mk newvers.sh
Log Message:
Use ${TOOL_DATE} (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/conf/newvers.mk
cvs rdiff -u -r1.62 -r1.63 src/sys/conf/newvers.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers.mk
diff -u src/sys/conf/newvers.mk:1.2 src/sys/conf/newvers.mk:1.3
--- src/sys/conf/newvers.mk:1.2 Sat Apr 8 14:24:09 2017
+++ src/sys/conf/newvers.mk Fri Apr 5 18:27:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: newvers.mk,v 1.2 2017/04/08 18:24:09 christos Exp $
+# $NetBSD: newvers.mk,v 1.3 2024/04/05 22:27:25 christos Exp $
MKREPRO?=no
@@ -17,7 +17,7 @@ newvers: vers.o
vers.o: ${SYSTEM_OBJ:O} Makefile $S/conf/newvers.sh \
$S/conf/osrelease.sh ${_NETBSD_VERSION_DEPENDS}
${_MKMSG_CREATE} vers.c
- ${HOST_SH} $S/conf/newvers.sh ${_NVFLAGS}
+ TOOL_DATE=${TOOL_DATE} ${HOST_SH} $S/conf/newvers.sh ${_NVFLAGS}
${_MKTARGET_COMPILE}
${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
${COMPILE_CTFCONVERT}
Index: src/sys/conf/newvers.sh
diff -u src/sys/conf/newvers.sh:1.62 src/sys/conf/newvers.sh:1.63
--- src/sys/conf/newvers.sh:1.62 Sat Apr 8 14:24:09 2017
+++ src/sys/conf/newvers.sh Fri Apr 5 18:27:25 2024
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: newvers.sh,v 1.62 2017/04/08 18:24:09 christos Exp $
+# $NetBSD: newvers.sh,v 1.63 2024/04/05 22:27:25 christos Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
# The Regents of the University of California. All rights reserved.
@@ -153,6 +153,7 @@ if [ ! -e version ]; then
echo 0 > version
fi
+DATE=${TOOL_DATE:-date}
Rflag=false
nflag=false
timestamp=
@@ -206,7 +207,7 @@ if ${Rflag}; then
else
if [ -z "${timestamp}" ]; then
v=$(cat version)
- t=$(LC_ALL=C date)
+ t=$(LC_ALL=C ${DATE})
u=${USER-root}
h=$(hostname)
d=$(pwd)
@@ -214,7 +215,7 @@ else
echo $(expr ${v} + 1) > version
else
v=0
- t=$(LC_ALL=C TZ=UTC date -r "${timestamp}")
+ t=$(LC_ALL=C TZ=UTC ${DATE} -r "${timestamp}")
u=mkrepro
h=mkrepro.NetBSD.org
d="/usr/src/sys/arch/${machine}/compile/${id}"
CVS commit: src/bin/sh
Module Name:src
Committed By: christos
Date: Fri Apr 5 22:22:17 UTC 2024
Modified Files:
src/bin/sh: mkoptions.sh
Log Message:
>From Jan-Benedict Glaw:
Fix a redirection and prepare a stable sort for upper-/lowercase
option letters
This script is a mess, I strongly believe that it should be rewritten.
However, I'm not 100% sure why it was invented in the first place
(come on, the generated header file isn't _that_ complicated that
it couldn't be sanely managed by hand!), but let's fix the sorting
order by using LC_ALL=C.
Also add a few 'X' to the `mktemp` template to make non-BSD
implementations happy. As a bonus, actually *use* the initial `sed`
output instead of throwing it away by piping it into `sort` with
also connecting `sort`'s stdin with the original input file...
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/bin/sh/mkoptions.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/mkoptions.sh
diff -u src/bin/sh/mkoptions.sh:1.5 src/bin/sh/mkoptions.sh:1.6
--- src/bin/sh/mkoptions.sh:1.5 Wed Nov 15 04:21:19 2017
+++ src/bin/sh/mkoptions.sh Fri Apr 5 18:22:17 2024
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: mkoptions.sh,v 1.5 2017/11/15 09:21:19 kre Exp $
+# $NetBSD: mkoptions.sh,v 1.6 2024/04/05 22:22:17 christos Exp $
#
# It would be more sensible to generate 2 .h files, one which
@@ -13,12 +13,13 @@
set -f
IFS=' ' # blank, tab (no newline)
+export LC_ALL=C # for sort consistency
IF="$1"
OF="${3+$3/}$2"
-E_FILE=$(${MKTEMP:-mktemp} -t MKO.E.$$)
-O_FILE=$(${MKTEMP:-mktemp} -t MKO.O.$$)
+E_FILE=$(${MKTEMP:-mktemp} -t MKO.E.$$)
+O_FILE=$(${MKTEMP:-mktemp} -t MKO.O.$$)
trap 'rm -f "${E_FILE}" "${O_FILE}"' EXIT
exec 5> "${E_FILE}"
@@ -40,8 +41,8 @@ ${SED:-sed} <"${IF}" \
-e '/^#/d' \
-e '/^[ ]*\//d' \
-e '/^[ ]*\*/d' \
- -e '/^[ ]*;/d' |
-sort -b -k2,2f -k2,2 < "${IF}" |
+ -e '/^[ ]*;/d' |
+sort -b -k2,2f -k2,2 |
while read line
do
# Look for comments in various styles, and ignore them
CVS commit: src/bin/sh
Module Name:src Committed By: christos Date: Fri Apr 5 22:22:17 UTC 2024 Modified Files: src/bin/sh: mkoptions.sh Log Message: >From Jan-Benedict Glaw: Fix a redirection and prepare a stable sort for upper-/lowercase option letters This script is a mess, I strongly believe that it should be rewritten. However, I'm not 100% sure why it was invented in the first place (come on, the generated header file isn't _that_ complicated that it couldn't be sanely managed by hand!), but let's fix the sorting order by using LC_ALL=C. Also add a few 'X' to the `mktemp` template to make non-BSD implementations happy. As a bonus, actually *use* the initial `sed` output instead of throwing it away by piping it into `sort` with also connecting `sort`'s stdin with the original input file... To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/bin/sh/mkoptions.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/file/dist/src
Module Name:src
Committed By: christos
Date: Fri Apr 5 16:56:58 UTC 2024
Modified Files:
src/external/bsd/file/dist/src: apprentice.c
Log Message:
break strength ties so that qsort is deterministic
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/bsd/file/dist/src/apprentice.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/file/dist/src/apprentice.c
diff -u src/external/bsd/file/dist/src/apprentice.c:1.28 src/external/bsd/file/dist/src/apprentice.c:1.29
--- src/external/bsd/file/dist/src/apprentice.c:1.28 Fri Aug 18 15:00:11 2023
+++ src/external/bsd/file/dist/src/apprentice.c Fri Apr 5 12:56:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: apprentice.c,v 1.28 2023/08/18 19:00:11 christos Exp $ */
+/* $NetBSD: apprentice.c,v 1.29 2024/04/05 16:56:58 christos Exp $ */
/*
* Copyright (c) Ian F. Darwin 1986-1995.
@@ -37,7 +37,7 @@
#if 0
FILE_RCSID("@(#)$File: apprentice.c,v 1.342 2023/07/17 14:38:35 christos Exp $")
#else
-__RCSID("$NetBSD: apprentice.c,v 1.28 2023/08/18 19:00:11 christos Exp $");
+__RCSID("$NetBSD: apprentice.c,v 1.29 2024/04/05 16:56:58 christos Exp $");
#endif
#endif /* lint */
@@ -1141,8 +1141,12 @@ apprentice_sort(const void *a, const voi
const struct magic_entry *mb = CAST(const struct magic_entry *, b);
size_t sa = file_magic_strength(ma->mp, ma->cont_count);
size_t sb = file_magic_strength(mb->mp, mb->cont_count);
- if (sa == sb)
- return 0;
+ if (sa == sb) {
+ int x = memcmp(ma->mp, mb->mp, sizeof(*ma->mp));
+ if (x == 0)
+ abort();
+ return x > 0 ? -1 : 1;
+ }
else if (sa > sb)
return -1;
else
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: christos Date: Fri Apr 5 16:56:58 UTC 2024 Modified Files: src/external/bsd/file/dist/src: apprentice.c Log Message: break strength ties so that qsort is deterministic To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/external/bsd/file/dist/src/apprentice.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Fri Apr 5 16:44:54 UTC 2024
Modified Files:
src/usr.sbin/postinstall: postinstall.in
Log Message:
remove dup named dir
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/usr.sbin/postinstall/postinstall.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.62 src/usr.sbin/postinstall/postinstall.in:1.63
--- src/usr.sbin/postinstall/postinstall.in:1.62 Sun Mar 10 14:23:18 2024
+++ src/usr.sbin/postinstall/postinstall.in Fri Apr 5 12:44:54 2024
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.62 2024/03/10 18:23:18 rillig Exp $
+# $NetBSD: postinstall.in,v 1.63 2024/04/05 16:44:54 christos Exp $
#
# Copyright (c) 2002-2022 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1706,6 +1706,12 @@ do_named()
compare_dir "${op}" "${SRC_DIR}/etc/namedb" "${DEST_DIR}/etc/namedb" \
644 \
root.cache
+
+ local od="${DEST_DIR}/usr/libexec/named"
+ if [ -d "$od" ]; then
+ rm -fr "$od"
+ msg "Removed obsolete '${od}'"
+ fi
}
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Fri Apr 5 16:44:54 UTC 2024 Modified Files: src/usr.sbin/postinstall: postinstall.in Log Message: remove dup named dir To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/usr.sbin/postinstall/postinstall.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/libuv/lib
Module Name:src
Committed By: christos
Date: Fri Apr 5 11:04:37 UTC 2024
Modified Files:
src/external/mit/libuv/lib: Makefile
Log Message:
Just build the staticlib.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/libuv/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/mit/libuv/lib/Makefile
diff -u src/external/mit/libuv/lib/Makefile:1.7 src/external/mit/libuv/lib/Makefile:1.8
--- src/external/mit/libuv/lib/Makefile:1.7 Fri Apr 5 04:51:27 2024
+++ src/external/mit/libuv/lib/Makefile Fri Apr 5 07:04:37 2024
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2024/04/05 08:51:27 kre Exp $
+# $NetBSD: Makefile,v 1.8 2024/04/05 11:04:37 christos Exp $
-LIBISPRIVATE=pic
+LIBISPRIVATE=yes
.include
MKLINT= no
LIB= uv
-MAKESTATICLIB=yes
-MAKELINKLIB=yes
-
.if ${LIBISPRIVATE:Uno} == "no"
INCS= uv.h uv/unix.h uv/bsd.h uv/errno.h uv/version.h uv/threadpool.h
INCSDIR=/usr/include
CVS commit: src/external/mit/libuv/lib
Module Name:src Committed By: christos Date: Fri Apr 5 11:04:37 UTC 2024 Modified Files: src/external/mit/libuv/lib: Makefile Log Message: Just build the staticlib. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mit/libuv/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external
Module Name:src Committed By: christos Date: Fri Apr 5 11:04:19 UTC 2024 Modified Files: src/external: Makefile Log Message: Fold long line To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/external/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/Makefile diff -u src/external/Makefile:1.24 src/external/Makefile:1.25 --- src/external/Makefile:1.24 Fri Apr 5 04:51:27 2024 +++ src/external/Makefile Fri Apr 5 07:04:19 2024 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2024/04/05 08:51:27 kre Exp $ +# $NetBSD: Makefile,v 1.25 2024/04/05 11:04:19 christos Exp $ SUBDIR+= amdgpu-firmware apache2 atheros broadcom bsd cddl gpl2 gpl3 historical -SUBDIR+= intel-fw-eula intel-fw-public ibm-public mit .WAIT mpl nvidia-firmware ofl +SUBDIR+= intel-fw-eula intel-fw-public ibm-public +SUBDIR+= mit .WAIT mpl nvidia-firmware ofl SUBDIR+= public-domain realtek .include
CVS commit: src/external
Module Name:src Committed By: christos Date: Fri Apr 5 11:04:19 UTC 2024 Modified Files: src/external: Makefile Log Message: Fold long line To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/external/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/external
In article <20240405085127.b998ef...@cvs.netbsd.org>, Robert Elz wrote: >Module Name: src >Committed By: kre >Date: Fri Apr 5 08:51:27 UTC 2024 > >Modified Files: > src/external: Makefile > src/external/mit/libuv/lib: Makefile > >Log Message: >Probable hack fix for current build breakage. > >Make sure to build external/mit before external/mpl (as bind in mpl >needs libuv from mit) and in mit/libuv make sure to build the >static library with the new MAKESTATICLIB mechanism, as that is >what bind needs. Thanks for fixing. The Makefile in external does not handle dependencies and I don't think it gets invoked until libraries have been built, which in src/lib/Makefile handles the mit/uv mpl/bind order. The change you made is fine, I will make the line shorter. The libuv Makefile change is ok too, but it is simplere to just not build the pic library in the first place, which is what I have done. christos
CVS commit: src
Module Name:src Committed By: christos Date: Fri Apr 5 01:16:01 UTC 2024 Modified Files: src/distrib/sets/lists/base: mi shl.mi src/distrib/sets/lists/debug: shl.mi src/etc/mtree: NetBSD.dist.base NetBSD.dist.compat.in src/external/mpl/bind: Makefile src/external/mpl/bind/lib/libns: Makefile src/external/mpl/bind/lib/plugins: Makefile src/lib/libpam: Makefile.inc src/lib/libpam/libpam: Makefile src/lib/libpam/modules: mod.mk src/lib/npf: mod.mk src/share/mk: bsd.README bsd.lib.mk Removed Files: src/external/mpl/bind/libexec: Makefile plugin.mk src/external/mpl/bind/libexec/filter-: Makefile Log Message: - Create 3 new variables: MAKELINKLIB that follows MKLINKLIB but can be overwritten by Makefiles MAKESTATICLIB that follows MKSTATICLIB but can be overwritten by Makefiles LINKINSTALL that follows MAKELINKLIB but can be overwritten by Makefiles These give enough control to the module Makefiles so that they don't need to override the default library install rules which break the debug sets. - Remove /usr/libexec/named which duplicated /usr/lib/named To generate a diff of this commit: cvs rdiff -u -r1.1338 -r1.1339 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.976 -r1.977 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.338 -r1.339 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.256 -r1.257 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.6 -r1.7 src/etc/mtree/NetBSD.dist.compat.in cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/lib/libns/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/lib/plugins/Makefile cvs rdiff -u -r1.1 -r0 src/external/mpl/bind/libexec/Makefile \ src/external/mpl/bind/libexec/plugin.mk cvs rdiff -u -r1.1 -r0 src/external/mpl/bind/libexec/filter-/Makefile cvs rdiff -u -r1.20 -r1.21 src/lib/libpam/Makefile.inc cvs rdiff -u -r1.31 -r1.32 src/lib/libpam/libpam/Makefile cvs rdiff -u -r1.17 -r1.18 src/lib/libpam/modules/mod.mk cvs rdiff -u -r1.8 -r1.9 src/lib/npf/mod.mk cvs rdiff -u -r1.446 -r1.447 src/share/mk/bsd.README cvs rdiff -u -r1.399 -r1.400 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/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1338 src/distrib/sets/lists/base/mi:1.1339 --- src/distrib/sets/lists/base/mi:1.1338 Sat Mar 30 12:47:55 2024 +++ src/distrib/sets/lists/base/mi Thu Apr 4 21:15:59 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1338 2024/03/30 16:47:55 thorpej Exp $ +# $NetBSD: mi,v 1.1339 2024/04/05 01:15:59 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1267,6 +1267,7 @@ ./usr/libdata/debug/usr/lib/i18n base-i18n-root compatfile ./usr/libdata/debug/usr/lib/named base-sys-usr ./usr/libdata/debug/usr/lib/npf base-obsolete obsolete +./usr/libdata/debug/usr/lib/security base-sys-usr compatfile ./usr/libdata/debug/usr/libexec base-sys-usr ./usr/libdata/debug/usr/libexec/ching base-sys-usr ./usr/libdata/debug/usr/libexec/lpr base-sys-usr @@ -1321,7 +1322,7 @@ ./usr/libexec/mail.local base-mail-bin ./usr/libexec/makekeybase-crypto-bin ./usr/libexec/makewhatis base-man-bin !makemandb -./usr/libexec/namedbase-bind-bin +./usr/libexec/namedbase-obsolete obsolete ./usr/libexec/named-xfer base-obsolete obsolete ./usr/libexec/ntalkdbase-netutil-bin ./usr/libexec/pfspamdbase-obsolete obsolete Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.976 src/distrib/sets/lists/base/shl.mi:1.977 --- src/distrib/sets/lists/base/shl.mi:1.976 Wed Feb 21 17:53:47 2024 +++ src/distrib/sets/lists/base/shl.mi Thu Apr 4 21:15:59 2024 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.976 2024/02/21 22:53:47 christos Exp $ +# $NetBSD: shl.mi,v 1.977 2024/04/05 01:15:59 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1002,4 +1002,4 @@ ./usr/lib/security/pam_u2f.so.4 base-sys-shlib compatfile,pam ./usr/lib/security/pam_unix.so.4 base-sys-shlib compatfile,pam ./usr/libexec/ld.elf_sobase-sys-shlib dynamicroot -./usr/libexec/named/filter-.so base-bind-bin +./usr/libexec/named/filter-.so base-obsolete obsoleteind-bin Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.338 src/distrib/sets/lists/debug/shl.mi:1.339 --- src/distrib/sets/lists/debug/shl.mi:1.338 Wed Feb 21 17:53:47 2024 +++ src/distrib/sets/lists/debug/shl.mi Thu Apr 4 21:15:59 2024 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.338 2024/02/21 22:53:47 christos Exp $ +# $NetBSD: shl.mi,v 1.339 2024/04/05 01:15:59 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils
CVS commit: src
Module Name:src Committed By: christos Date: Fri Apr 5 01:16:01 UTC 2024 Modified Files: src/distrib/sets/lists/base: mi shl.mi src/distrib/sets/lists/debug: shl.mi src/etc/mtree: NetBSD.dist.base NetBSD.dist.compat.in src/external/mpl/bind: Makefile src/external/mpl/bind/lib/libns: Makefile src/external/mpl/bind/lib/plugins: Makefile src/lib/libpam: Makefile.inc src/lib/libpam/libpam: Makefile src/lib/libpam/modules: mod.mk src/lib/npf: mod.mk src/share/mk: bsd.README bsd.lib.mk Removed Files: src/external/mpl/bind/libexec: Makefile plugin.mk src/external/mpl/bind/libexec/filter-: Makefile Log Message: - Create 3 new variables: MAKELINKLIB that follows MKLINKLIB but can be overwritten by Makefiles MAKESTATICLIB that follows MKSTATICLIB but can be overwritten by Makefiles LINKINSTALL that follows MAKELINKLIB but can be overwritten by Makefiles These give enough control to the module Makefiles so that they don't need to override the default library install rules which break the debug sets. - Remove /usr/libexec/named which duplicated /usr/lib/named To generate a diff of this commit: cvs rdiff -u -r1.1338 -r1.1339 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.976 -r1.977 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.338 -r1.339 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.256 -r1.257 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.6 -r1.7 src/etc/mtree/NetBSD.dist.compat.in cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/lib/libns/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/lib/plugins/Makefile cvs rdiff -u -r1.1 -r0 src/external/mpl/bind/libexec/Makefile \ src/external/mpl/bind/libexec/plugin.mk cvs rdiff -u -r1.1 -r0 src/external/mpl/bind/libexec/filter-/Makefile cvs rdiff -u -r1.20 -r1.21 src/lib/libpam/Makefile.inc cvs rdiff -u -r1.31 -r1.32 src/lib/libpam/libpam/Makefile cvs rdiff -u -r1.17 -r1.18 src/lib/libpam/modules/mod.mk cvs rdiff -u -r1.8 -r1.9 src/lib/npf/mod.mk cvs rdiff -u -r1.446 -r1.447 src/share/mk/bsd.README cvs rdiff -u -r1.399 -r1.400 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/external/gpl3
Module Name:src Committed By: christos Date: Thu Apr 4 23:54:18 UTC 2024 Modified Files: src/external/gpl3/gcc.old/lib/liblto_plugin: Makefile src/external/gpl3/gcc/lib/liblto_plugin: Makefile Log Message: LIBISMODULE should be yes or no... To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 \ src/external/gpl3/gcc.old/lib/liblto_plugin/Makefile cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/lib/liblto_plugin/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/gpl3/gcc.old/lib/liblto_plugin/Makefile diff -u src/external/gpl3/gcc.old/lib/liblto_plugin/Makefile:1.15 src/external/gpl3/gcc.old/lib/liblto_plugin/Makefile:1.16 --- src/external/gpl3/gcc.old/lib/liblto_plugin/Makefile:1.15 Sun Dec 31 17:52:49 2023 +++ src/external/gpl3/gcc.old/lib/liblto_plugin/Makefile Thu Apr 4 19:54:17 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2023/12/31 22:52:49 mrg Exp $ +# $NetBSD: Makefile,v 1.16 2024/04/04 23:54:17 christos Exp $ .include .include @@ -22,7 +22,7 @@ CPPFLAGS+= -DHAVE_CONFIG_H CPPFLAGS+= -Dxstrdup=strdup -Dxexit=exit CPPFLAGS+= -Dxcalloc=calloc -Dxmalloc=malloc -Dxrealloc=realloc -LIBISMODULE= 1 +LIBISMODULE= yes USE_SHLIBDIR= yes REQUIRETOOLS= yes NOLINT= # defined Index: src/external/gpl3/gcc/lib/liblto_plugin/Makefile diff -u src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.11 src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.12 --- src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.11 Sun Dec 31 17:52:49 2023 +++ src/external/gpl3/gcc/lib/liblto_plugin/Makefile Thu Apr 4 19:54:17 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2023/12/31 22:52:49 mrg Exp $ +# $NetBSD: Makefile,v 1.12 2024/04/04 23:54:17 christos Exp $ .include .include @@ -22,7 +22,7 @@ CPPFLAGS+= -DHAVE_CONFIG_H CPPFLAGS+= -Dxstrdup=strdup -Dxexit=exit CPPFLAGS+= -Dxcalloc=calloc -Dxmalloc=malloc -Dxrealloc=realloc -LIBISMODULE= 1 +LIBISMODULE= yes USE_SHLIBDIR= yes REQUIRETOOLS= yes NOLINT= # defined
CVS commit: src/external/gpl3
Module Name:src Committed By: christos Date: Thu Apr 4 23:54:18 UTC 2024 Modified Files: src/external/gpl3/gcc.old/lib/liblto_plugin: Makefile src/external/gpl3/gcc/lib/liblto_plugin: Makefile Log Message: LIBISMODULE should be yes or no... To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 \ src/external/gpl3/gcc.old/lib/liblto_plugin/Makefile cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/lib/liblto_plugin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Apr 4 23:53:05 UTC 2024 Modified Files: src/doc: HACKS Log Message: mention gallium.old hack To generate a diff of this commit: cvs rdiff -u -r1.241 -r1.242 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src
Committed By: christos
Date: Thu Apr 4 23:53:05 UTC 2024
Modified Files:
src/doc: HACKS
Log Message:
mention gallium.old hack
To generate a diff of this commit:
cvs rdiff -u -r1.241 -r1.242 src/doc/HACKS
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/HACKS
diff -u src/doc/HACKS:1.241 src/doc/HACKS:1.242
--- src/doc/HACKS:1.241 Fri Jan 12 03:44:42 2024
+++ src/doc/HACKS Thu Apr 4 19:53:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.241 2024/01/12 08:44:42 martin Exp $
+# $NetBSD: HACKS,v 1.242 2024/04/04 23:53:05 christos Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -1115,3 +1115,12 @@ descr
56 | __asm("movq %%gs:%1, %0" :
and can't easily be worked around.
kcah
+
+hack ctfconvert/gcc: disable gcc dwarf-4 generation
+cdate Thu Apr 4 19:51:05 EDT 2024
+who christos
+file src/external/mit/xorg/lib/gallium.old/Makefile : 1.9
+descr
+ Some files create dwarf info that our ctfmerge can't handle.
+ We downgrade dwarf generation to version 3 which works.
+kcah
CVS commit: src/external/mit/xorg/lib/gallium.old
Module Name:src
Committed By: christos
Date: Thu Apr 4 23:50:13 UTC 2024
Modified Files:
src/external/mit/xorg/lib/gallium.old: Makefile
Log Message:
Don't ccreate dwarf-4 on these files because it breaks ctfconvert.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/gallium.old/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/mit/xorg/lib/gallium.old/Makefile
diff -u src/external/mit/xorg/lib/gallium.old/Makefile:1.8 src/external/mit/xorg/lib/gallium.old/Makefile:1.9
--- src/external/mit/xorg/lib/gallium.old/Makefile:1.8 Sat Oct 7 08:15:52 2023
+++ src/external/mit/xorg/lib/gallium.old/Makefile Thu Apr 4 19:50:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/10/07 12:15:52 rin Exp $
+# $NetBSD: Makefile,v 1.9 2024/04/04 23:50:13 christos Exp $
# Transparent struct/union broken
NOLINT=yes
@@ -33,8 +33,8 @@ LDFLAGS+= -pthread
# Reduce debugging for these extremely large objects.
.if ${MKDEBUG:Uno} != "no"
-CXXFLAGS+= -g1
-CFLAGS+= -g1
+CXXFLAGS+= -g1 -gdwarf-3
+CFLAGS+= -g1 -gdwarf-3
.endif
GALLIUM_SUBDIRS= \
CVS commit: src/external/mit/xorg/lib/gallium.old
Module Name:src Committed By: christos Date: Thu Apr 4 23:50:13 UTC 2024 Modified Files: src/external/mit/xorg/lib/gallium.old: Makefile Log Message: Don't ccreate dwarf-4 on these files because it breaks ctfconvert. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/gallium.old/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/fs/tmpfs
Module Name:src
Committed By: christos
Date: Thu Apr 4 16:58:35 UTC 2024
Modified Files:
src/tests/fs/tmpfs: t_times.sh
Log Message:
Better output handling (des at FreeBSD)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/tmpfs/t_times.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/tmpfs/t_times.sh
diff -u src/tests/fs/tmpfs/t_times.sh:1.6 src/tests/fs/tmpfs/t_times.sh:1.7
--- src/tests/fs/tmpfs/t_times.sh:1.6 Wed Jun 16 20:03:05 2021
+++ src/tests/fs/tmpfs/t_times.sh Thu Apr 4 12:58:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: t_times.sh,v 1.6 2021/06/17 00:03:05 riastradh Exp $
+# $NetBSD: t_times.sh,v 1.7 2024/04/04 16:58:35 christos Exp $
#
# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -48,7 +48,7 @@ empty_body() {
atf_fail "Incorrect mtime: ${ost_birthtime} != ${ost_mtime}"
sleep 1
- atf_check -s eq:0 -o ignore -e empty cat a
+ atf_check -s eq:0 -o empty -e empty cat a
eval $(stat -s a) || atf_fail "stat failed"
[ ${st_atime} -gt ${ost_atime} ] || \
atf_fail "Incorrect atime: ${st_atime} <= ${ost_atime}"
@@ -83,7 +83,7 @@ non_empty_body() {
eval $(stat -s b | sed -e 's|st_|ost_|g') || atf_fail "stat failed"
sleep 1
- atf_check -s eq:0 -o ignore -e empty cat b
+ atf_check -s eq:0 -o inline:"foo\n" -e empty cat b
eval $(stat -s b) || atf_fail "stat failed"
[ ${st_atime} -gt ${ost_atime} ] || \
atf_fail "Incorrect atime: ${st_atime} <= ${ost_atime}"
CVS commit: src/tests/fs/tmpfs
Module Name:src Committed By: christos Date: Thu Apr 4 16:58:35 UTC 2024 Modified Files: src/tests/fs/tmpfs: t_times.sh Log Message: Better output handling (des at FreeBSD) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/fs/tmpfs/t_times.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/fs/tmpfs
Module Name:src
Committed By: christos
Date: Thu Apr 4 16:57:45 UTC 2024
Modified Files:
src/tests/fs/tmpfs: t_vnd.sh
Log Message:
make this work again
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/fs/tmpfs/t_vnd.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/tmpfs/t_vnd.sh
diff -u src/tests/fs/tmpfs/t_vnd.sh:1.12 src/tests/fs/tmpfs/t_vnd.sh:1.13
--- src/tests/fs/tmpfs/t_vnd.sh:1.12 Wed Nov 30 12:50:00 2022
+++ src/tests/fs/tmpfs/t_vnd.sh Thu Apr 4 12:57:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: t_vnd.sh,v 1.12 2022/11/30 17:50:00 martin Exp $
+# $NetBSD: t_vnd.sh,v 1.13 2024/04/04 16:57:45 christos Exp $
#
# Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -29,7 +29,8 @@
#
vnddev=vnd3
-vnd=/dev/${vnddev}
+rvnd=/dev/r${vnddev}a
+vnd=/dev/${vnddev}a
atf_test_case basic cleanup
basic_head() {
@@ -43,7 +44,7 @@ basic_body() {
dd if=/dev/zero of=disk.img bs=1m count=10
atf_check -s eq:0 -o empty -e empty vndconfig -c ${vnddev} disk.img
- atf_check -s eq:0 -o ignore -e ignore newfs -I ${vnd}
+ atf_check -s eq:0 -o ignore -e ignore newfs -I ${rvnd}
atf_check -s eq:0 -o empty -e empty mkdir mnt
atf_check -s eq:0 -o empty -e empty mount ${vnd} mnt
CVS commit: src/tests/fs/tmpfs
Module Name:src Committed By: christos Date: Thu Apr 4 16:57:45 UTC 2024 Modified Files: src/tests/fs/tmpfs: t_vnd.sh Log Message: make this work again To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/tests/fs/tmpfs/t_vnd.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm
Module Name:src Committed By: christos Date: Wed Apr 3 18:53:42 UTC 2024 Modified Files: src/lib/libm/ld80: b_tgammal.c e_lgammal_r.c s_cexpl.c s_cospil.c s_erfl.c s_exp2l.c s_expl.c s_logl.c s_sinpil.c s_tanpil.c src/lib/libm/src: e_acoshl.c e_atanhl.c e_coshl.c e_sinhl.c s_asinhl.c s_cbrtl.c s_clogl.c s_cosl.c s_sincosl.c s_sinl.c s_tanhl.c s_tanl.c Log Message: remove #include for i386 now that it is included in math_private.h To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libm/ld80/b_tgammal.c cvs rdiff -u -r1.1 -r1.2 src/lib/libm/ld80/e_lgammal_r.c \ src/lib/libm/ld80/s_cexpl.c src/lib/libm/ld80/s_cospil.c \ src/lib/libm/ld80/s_erfl.c src/lib/libm/ld80/s_exp2l.c \ src/lib/libm/ld80/s_expl.c src/lib/libm/ld80/s_logl.c \ src/lib/libm/ld80/s_sinpil.c src/lib/libm/ld80/s_tanpil.c cvs rdiff -u -r1.3 -r1.4 src/lib/libm/src/e_acoshl.c \ src/lib/libm/src/e_atanhl.c src/lib/libm/src/s_asinhl.c \ src/lib/libm/src/s_cbrtl.c src/lib/libm/src/s_sincosl.c \ src/lib/libm/src/s_tanhl.c cvs rdiff -u -r1.2 -r1.3 src/lib/libm/src/e_coshl.c src/lib/libm/src/s_sinl.c \ src/lib/libm/src/s_tanl.c cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/e_sinhl.c \ src/lib/libm/src/s_clogl.c src/lib/libm/src/s_cosl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/ld80/b_tgammal.c diff -u src/lib/libm/ld80/b_tgammal.c:1.2 src/lib/libm/ld80/b_tgammal.c:1.3 --- src/lib/libm/ld80/b_tgammal.c:1.2 Mon Jan 22 07:15:19 2024 +++ src/lib/libm/ld80/b_tgammal.c Wed Apr 3 14:53:41 2024 @@ -53,10 +53,6 @@ #error "Unsupported long double format" #endif -#ifdef __i386__ -#include -#endif - #include "math.h" #include "math_private.h" Index: src/lib/libm/ld80/e_lgammal_r.c diff -u src/lib/libm/ld80/e_lgammal_r.c:1.1 src/lib/libm/ld80/e_lgammal_r.c:1.2 --- src/lib/libm/ld80/e_lgammal_r.c:1.1 Sun Jan 21 13:53:16 2024 +++ src/lib/libm/ld80/e_lgammal_r.c Wed Apr 3 14:53:41 2024 @@ -17,10 +17,6 @@ * Converted to long double by Steven G. Kargl. */ -#ifdef __i386__ -#include -#endif - #include "math.h" #include "math_private.h" Index: src/lib/libm/ld80/s_cexpl.c diff -u src/lib/libm/ld80/s_cexpl.c:1.1 src/lib/libm/ld80/s_cexpl.c:1.2 --- src/lib/libm/ld80/s_cexpl.c:1.1 Sun Jan 21 13:53:17 2024 +++ src/lib/libm/ld80/s_cexpl.c Wed Apr 3 14:53:41 2024 @@ -31,9 +31,6 @@ #include #include #include -#ifdef __i386__ -#include -#endif #include "fpmath.h" #include "math.h" Index: src/lib/libm/ld80/s_cospil.c diff -u src/lib/libm/ld80/s_cospil.c:1.1 src/lib/libm/ld80/s_cospil.c:1.2 --- src/lib/libm/ld80/s_cospil.c:1.1 Sun Jan 21 13:53:17 2024 +++ src/lib/libm/ld80/s_cospil.c Wed Apr 3 14:53:41 2024 @@ -28,9 +28,6 @@ * See ../src/s_cospi.c for implementation details. */ -#ifdef __i386__ -#include -#endif #include #include "math.h" Index: src/lib/libm/ld80/s_erfl.c diff -u src/lib/libm/ld80/s_erfl.c:1.1 src/lib/libm/ld80/s_erfl.c:1.2 --- src/lib/libm/ld80/s_erfl.c:1.1 Sun Jan 21 13:53:17 2024 +++ src/lib/libm/ld80/s_erfl.c Wed Apr 3 14:53:41 2024 @@ -17,9 +17,6 @@ * Converted to long double by Steven G. Kargl. */ #include -#ifdef __i386__ -#include -#endif #include "math.h" #include "math_private.h" Index: src/lib/libm/ld80/s_exp2l.c diff -u src/lib/libm/ld80/s_exp2l.c:1.1 src/lib/libm/ld80/s_exp2l.c:1.2 --- src/lib/libm/ld80/s_exp2l.c:1.1 Sun Jan 21 13:53:17 2024 +++ src/lib/libm/ld80/s_exp2l.c Wed Apr 3 14:53:41 2024 @@ -30,10 +30,6 @@ #include #include -#ifdef __i386__ -#include -#endif - #ifdef __FreeBSD__ #include "fpmath.h" #endif Index: src/lib/libm/ld80/s_expl.c diff -u src/lib/libm/ld80/s_expl.c:1.1 src/lib/libm/ld80/s_expl.c:1.2 --- src/lib/libm/ld80/s_expl.c:1.1 Sun Jan 21 13:53:17 2024 +++ src/lib/libm/ld80/s_expl.c Wed Apr 3 14:53:41 2024 @@ -41,10 +41,6 @@ #include -#ifdef __i386__ -#include -#endif - #ifdef __FreeBSD__ #include "fpmath.h" #endif Index: src/lib/libm/ld80/s_logl.c diff -u src/lib/libm/ld80/s_logl.c:1.1 src/lib/libm/ld80/s_logl.c:1.2 --- src/lib/libm/ld80/s_logl.c:1.1 Sun Jan 21 13:53:17 2024 +++ src/lib/libm/ld80/s_logl.c Wed Apr 3 14:53:41 2024 @@ -78,10 +78,6 @@ #include #endif -#ifdef __i386__ -#include -#endif - #ifdef __FreeBSD__ #include "fpmath.h" #endif Index: src/lib/libm/ld80/s_sinpil.c diff -u src/lib/libm/ld80/s_sinpil.c:1.1 src/lib/libm/ld80/s_sinpil.c:1.2 --- src/lib/libm/ld80/s_sinpil.c:1.1 Sun Jan 21 13:53:17 2024 +++ src/lib/libm/ld80/s_sinpil.c Wed Apr 3 14:53:41 2024 @@ -28,9 +28,6 @@ * See ../src/s_sinpi.c for implementation details. */ -#ifdef __i386__ -#include -#endif #include #include "math.h" Index: src/lib/libm/ld80/s_tanpil.c diff -u src/lib/libm/ld80/s_tanpil.c:1.1 src/lib/libm/ld80/s_tanpil.c:1.2 --- src/lib/libm/ld80/s_tanpil.c:1.1 Sun Jan 21 13:53:17 2024 +++
CVS commit: src/lib/libm
Module Name:src Committed By: christos Date: Wed Apr 3 18:53:42 UTC 2024 Modified Files: src/lib/libm/ld80: b_tgammal.c e_lgammal_r.c s_cexpl.c s_cospil.c s_erfl.c s_exp2l.c s_expl.c s_logl.c s_sinpil.c s_tanpil.c src/lib/libm/src: e_acoshl.c e_atanhl.c e_coshl.c e_sinhl.c s_asinhl.c s_cbrtl.c s_clogl.c s_cosl.c s_sincosl.c s_sinl.c s_tanhl.c s_tanl.c Log Message: remove #include for i386 now that it is included in math_private.h To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libm/ld80/b_tgammal.c cvs rdiff -u -r1.1 -r1.2 src/lib/libm/ld80/e_lgammal_r.c \ src/lib/libm/ld80/s_cexpl.c src/lib/libm/ld80/s_cospil.c \ src/lib/libm/ld80/s_erfl.c src/lib/libm/ld80/s_exp2l.c \ src/lib/libm/ld80/s_expl.c src/lib/libm/ld80/s_logl.c \ src/lib/libm/ld80/s_sinpil.c src/lib/libm/ld80/s_tanpil.c cvs rdiff -u -r1.3 -r1.4 src/lib/libm/src/e_acoshl.c \ src/lib/libm/src/e_atanhl.c src/lib/libm/src/s_asinhl.c \ src/lib/libm/src/s_cbrtl.c src/lib/libm/src/s_sincosl.c \ src/lib/libm/src/s_tanhl.c cvs rdiff -u -r1.2 -r1.3 src/lib/libm/src/e_coshl.c src/lib/libm/src/s_sinl.c \ src/lib/libm/src/s_tanl.c cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/e_sinhl.c \ src/lib/libm/src/s_clogl.c src/lib/libm/src/s_cosl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/src
Module Name:src
Committed By: christos
Date: Wed Apr 3 14:54:51 UTC 2024
Modified Files:
src/lib/libm/src: s_cbrtl.c
Log Message:
need for i386.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libm/src/s_cbrtl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/s_cbrtl.c
diff -u src/lib/libm/src/s_cbrtl.c:1.2 src/lib/libm/src/s_cbrtl.c:1.3
--- src/lib/libm/src/s_cbrtl.c:1.2 Tue Apr 2 21:51:01 2024
+++ src/lib/libm/src/s_cbrtl.c Wed Apr 3 10:54:50 2024
@@ -14,10 +14,11 @@
* and David A. Schultz.
*/
#include
-__RCSID("$NetBSD: s_cbrtl.c,v 1.2 2024/04/03 01:51:01 christos Exp $");
+__RCSID("$NetBSD: s_cbrtl.c,v 1.3 2024/04/03 14:54:50 christos Exp $");
#include "namespace.h"
+#include
#include
#include
CVS commit: src/lib/libm/src
Module Name:src Committed By: christos Date: Wed Apr 3 14:54:51 UTC 2024 Modified Files: src/lib/libm/src: s_cbrtl.c Log Message: need for i386. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libm/src/s_cbrtl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libm
Module Name:src Committed By: christos Date: Wed Apr 3 01:52:28 UTC 2024 Modified Files: src/tests/lib/libm: t_cbrt.c Log Message: fix the cbrtl/powl test To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libm/t_cbrt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: christos
Date: Wed Apr 3 01:52:28 UTC 2024
Modified Files:
src/tests/lib/libm: t_cbrt.c
Log Message:
fix the cbrtl/powl test
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libm/t_cbrt.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/lib/libm/t_cbrt.c
diff -u src/tests/lib/libm/t_cbrt.c:1.5 src/tests/lib/libm/t_cbrt.c:1.6
--- src/tests/lib/libm/t_cbrt.c:1.5 Thu Nov 15 00:14:20 2018
+++ src/tests/lib/libm/t_cbrt.c Tue Apr 2 21:52:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: t_cbrt.c,v 1.5 2018/11/15 05:14:20 riastradh Exp $ */
+/* $NetBSD: t_cbrt.c,v 1.6 2024/04/03 01:52:28 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_cbrt.c,v 1.5 2018/11/15 05:14:20 riastradh Exp $");
+__RCSID("$NetBSD: t_cbrt.c,v 1.6 2024/04/03 01:52:28 christos Exp $");
#include
#include
@@ -285,12 +285,9 @@ ATF_TC_BODY(cbrtl_powl, tc)
const long double eps = 2*LDBL_EPSILON;
size_t i;
-#if LDBL_MANT_DIG > DBL_MANT_DIG
- atf_tc_expect_fail("powl not yet implemented with full precision");
-#endif
for (i = 0; i < __arraycount(x); i++) {
long double x_cbrt = cbrtl(x[i]);
- long double x_pow13 = powl(x[i], 1.0 / 3.0);
+ long double x_pow13 = powl(x[i], 1.0L / 3.0L);
bool ok;
if (x[i] == 0) {
CVS commit: src/lib/libm/src
Module Name:src
Committed By: christos
Date: Wed Apr 3 01:51:02 UTC 2024
Modified Files:
src/lib/libm/src: s_cbrtl.c
Log Message:
reduce diff with FreeBSD
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_cbrtl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/s_cbrtl.c
diff -u src/lib/libm/src/s_cbrtl.c:1.1 src/lib/libm/src/s_cbrtl.c:1.2
--- src/lib/libm/src/s_cbrtl.c:1.1 Tue Nov 19 14:24:34 2013
+++ src/lib/libm/src/s_cbrtl.c Tue Apr 2 21:51:01 2024
@@ -13,12 +13,9 @@
* written by Steven G. Kargl with input from Bruce D. Evans
* and David A. Schultz.
*/
-
#include
-__RCSID("$NetBSD: s_cbrtl.c,v 1.1 2013/11/19 19:24:34 joerg Exp $");
-#if 0
-__FBSDID("$FreeBSD: head/lib/msun/src/s_cbrtl.c 238924 2012-07-30 21:58:28Z kargl $");
-#endif
+__RCSID("$NetBSD: s_cbrtl.c,v 1.2 2024/04/03 01:51:01 christos Exp $");
+
#include "namespace.h"
#include
@@ -30,44 +27,48 @@ __FBSDID("$FreeBSD: head/lib/msun/src/s_
#ifdef __HAVE_LONG_DOUBLE
__weak_alias(cbrtl, _cbrtl)
+#define BIAS (LDBL_MAX_EXP - 1)
+
static const unsigned
B1 = 709958130; /* B1 = (127-127.0/3-0.03306235651)*2**23 */
long double
cbrtl(long double x)
{
- union ieee_ext_u ux, vx;
+ union ieee_ext_u u, v;
long double r, s, t, w;
double dr, dt, dx;
float ft, fx;
uint32_t hx;
+ uint16_t expsign;
int k;
- ux.extu_ld = x;
-
+ u.extu_ld = x;
+ expsign = GET_EXPSIGN();
+ k = expsign & 0x7fff;
/*
* If x = +-Inf, then cbrt(x) = +-Inf.
* If x = NaN, then cbrt(x) = NaN.
*/
- if (ux.extu_exp == EXT_EXP_INFNAN)
+ if (k == BIAS + LDBL_MAX_EXP)
return (x + x);
- if ((ux.extu_frach | ux.extu_fracl | ux.extu_exp) == 0)
- return (x);
- vx.extu_ld = 1;
- vx.extu_ext.ext_sign = ux.extu_ext.ext_sign;
- ux.extu_ext.ext_sign = 0;
- if (ux.extu_exp == 0) {
+ ENTERI();
+ if (k == 0) {
+ /* If x = +-0, then cbrt(x) = +-0. */
+ if ((u.extu_frach | u.extu_fracl) == 0)
+ RETURNI(x);
/* Adjust subnormal numbers. */
- ux.extu_ld *= 0x1.0p514;
- k = ux.extu_exp - EXT_EXP_BIAS - 514;
- } else {
- k = ux.extu_exp - EXT_EXP_BIAS;
- }
+ u.extu_ld *= 0x1.0p514;
+ k = u.extu_exp;
+ k -= BIAS + 514;
+ } else
+ k -= BIAS;
+ SET_EXPSIGN(, BIAS);
+ v.extu_ld = 1;
- ux.extu_exp = EXT_EXP_BIAS;
- x = ux.extu_ld;
+ x = u.extu_ld;
switch (k % 3) {
case 1:
case -2:
@@ -80,7 +81,7 @@ cbrtl(long double x)
k -= 2;
break;
}
- vx.extu_exp = EXT_EXP_BIAS + k / 3;
+ SET_EXPSIGN(, (expsign & 0x8000) | (BIAS + k / 3));
/*
* The following is the guts of s_cbrtf, with the handling of
@@ -136,10 +137,9 @@ cbrtl(long double x)
r=x/s;/* error <= 0.5 ulps; |r| < |t| */
w=t+t;/* t+t is exact */
r=(r-t)/(w+r); /* r-t is exact; w+r ~= 3*t */
- t=t+t*r; /* error <= 0.5 + 0.5/3 + epsilon */
+ t=t+t*r; /* error <= (0.5 + 0.5/3) * ulp */
- t *= vx.extu_ld;
- return t;
+ t *= v.extu_ld;
+ RETURNI(t);
}
-
#endif /* __HAVE_LONG_DOUBLE */
CVS commit: src/lib/libm/src
Module Name:src Committed By: christos Date: Wed Apr 3 01:51:02 UTC 2024 Modified Files: src/lib/libm/src: s_cbrtl.c Log Message: reduce diff with FreeBSD To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_cbrtl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/ntp/lib/libntp
Module Name:src
Committed By: christos
Date: Wed Apr 3 00:38:36 UTC 2024
Modified Files:
src/external/bsd/ntp/lib/libntp: Makefile
Log Message:
fix format.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/bsd/ntp/lib/libntp/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/ntp/lib/libntp/Makefile
diff -u src/external/bsd/ntp/lib/libntp/Makefile:1.28 src/external/bsd/ntp/lib/libntp/Makefile:1.29
--- src/external/bsd/ntp/lib/libntp/Makefile:1.28 Tue Apr 2 10:19:02 2024
+++ src/external/bsd/ntp/lib/libntp/Makefile Tue Apr 2 20:38:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2024/04/02 14:19:02 christos Exp $
+# $NetBSD: Makefile,v 1.29 2024/04/03 00:38:36 christos Exp $
LIBISPRIVATE=yes
@@ -89,8 +89,8 @@ CPPFLAGS+= -I${IDIST}/sntp/libopts
# Instead, use the date and time from ${MKREPRO_TIMESTAMP}
.if ${MKREPRO:Uno} == "yes"
IMPORTDATE_FILE := ${.PARSEDIR}/../../importdate
-MKREPRO_DATE != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "%F"
-MKREPRO_TIME != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "%T"
+MKREPRO_DATE != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%F"
+MKREPRO_TIME != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%T"
CPPFLAGS.ntp_calendar.c += -DMKREPRO_DATE=\"${MKREPRO_DATE:Q}\"
CPPFLAGS.ntp_calendar.c += -DMKREPRO_TIME=\"${MKREPRO_TIME:Q}\"
.endif
CVS commit: src/external/bsd/ntp/lib/libntp
Module Name:src Committed By: christos Date: Wed Apr 3 00:38:36 UTC 2024 Modified Files: src/external/bsd/ntp/lib/libntp: Makefile Log Message: fix format. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/external/bsd/ntp/lib/libntp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/sparc/gen
Module Name:src Committed By: christos Date: Tue Apr 2 20:27:44 UTC 2024 Modified Files: src/lib/libc/arch/sparc/gen: fpsetround.c Log Message: fix lint To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/sparc/gen/fpsetround.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/sparc/gen
Module Name:src
Committed By: christos
Date: Tue Apr 2 20:27:44 UTC 2024
Modified Files:
src/lib/libc/arch/sparc/gen: fpsetround.c
Log Message:
fix lint
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/sparc/gen/fpsetround.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/sparc/gen/fpsetround.c
diff -u src/lib/libc/arch/sparc/gen/fpsetround.c:1.6 src/lib/libc/arch/sparc/gen/fpsetround.c:1.7
--- src/lib/libc/arch/sparc/gen/fpsetround.c:1.6 Tue Mar 20 20:38:35 2012
+++ src/lib/libc/arch/sparc/gen/fpsetround.c Tue Apr 2 16:27:44 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetround.c,v 1.6 2012/03/21 00:38:35 christos Exp $ */
+/* $NetBSD: fpsetround.c,v 1.7 2024/04/02 20:27:44 christos Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,7 +7,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.6 2012/03/21 00:38:35 christos Exp $");
+__RCSID("$NetBSD: fpsetround.c,v 1.7 2024/04/02 20:27:44 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -27,7 +27,7 @@ fpsetround(fp_rnd rnd_dir)
__asm("st %%fsr,%0" : "=m" (*));
new = old;
- new &= ~(0x03 << 30);
+ new &= ~(0x03U << 30);
new |= ((rnd_dir & 0x03) << 30);
__asm("ld %0,%%fsr" : : "m" (*));
CVS commit: src/sys/dev/vmt
Module Name:src
Committed By: christos
Date: Tue Apr 2 20:04:16 UTC 2024
Modified Files:
src/sys/dev/vmt: vmt_subr.c
Log Message:
fix llvm build
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/vmt/vmt_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/vmt/vmt_subr.c
diff -u src/sys/dev/vmt/vmt_subr.c:1.8 src/sys/dev/vmt/vmt_subr.c:1.9
--- src/sys/dev/vmt/vmt_subr.c:1.8 Wed Mar 20 19:34:24 2024
+++ src/sys/dev/vmt/vmt_subr.c Tue Apr 2 16:04:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vmt_subr.c,v 1.8 2024/03/20 23:34:24 msaitoh Exp $ */
+/* $NetBSD: vmt_subr.c,v 1.9 2024/04/02 20:04:16 christos Exp $ */
/* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */
/*
@@ -108,7 +108,6 @@ struct vmt_tclo_rpc {
{ "Set_Option broadcastIP 1", vmt_tclo_broadcastip },
{ "ping", vmt_tclo_ping },
{ "reset", vmt_tclo_reset },
- { NULL },
#if 0
/* Various unsupported commands */
{ "Set_Option autohide 0" },
@@ -130,6 +129,7 @@ struct vmt_tclo_rpc {
{ "Time_Synchronize 0" },
{ "Vix_1_Relayed_Command \"38cdcae40e075d66\"" },
#endif
+ { NULL, NULL },
};
extern char hostname[MAXHOSTNAMELEN];
CVS commit: src/sys/dev/vmt
Module Name:src Committed By: christos Date: Tue Apr 2 20:04:16 UTC 2024 Modified Files: src/sys/dev/vmt: vmt_subr.c Log Message: fix llvm build To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/vmt/vmt_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/src
Module Name:src
Committed By: christos
Date: Tue Apr 2 18:40:50 UTC 2024
Modified Files:
src/lib/libm/src: s_fabsl.c
Log Message:
undo accidental commit.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libm/src/s_fabsl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/s_fabsl.c
diff -u src/lib/libm/src/s_fabsl.c:1.7 src/lib/libm/src/s_fabsl.c:1.8
--- src/lib/libm/src/s_fabsl.c:1.7 Tue Apr 2 14:39:51 2024
+++ src/lib/libm/src/s_fabsl.c Tue Apr 2 14:40:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: s_fabsl.c,v 1.7 2024/04/02 18:39:51 christos Exp $ */
+/* $NetBSD: s_fabsl.c,v 1.8 2024/04/02 18:40:50 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: s_fabsl.c,v 1.7 2024/04/02 18:39:51 christos Exp $");
+__RCSID("$NetBSD: s_fabsl.c,v 1.8 2024/04/02 18:40:50 christos Exp $");
#include
#include
@@ -47,6 +47,7 @@ fabsl(long double x)
return (ux.extu_ld);
}
#else
+#if 0
/* defined in libc */
long double
fabsl(long double x)
@@ -54,3 +55,4 @@ fabsl(long double x)
return fabs(x);
}
#endif
+#endif
CVS commit: src/lib/libm/src
Module Name:src Committed By: christos Date: Tue Apr 2 18:40:50 UTC 2024 Modified Files: src/lib/libm/src: s_fabsl.c Log Message: undo accidental commit. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libm/src/s_fabsl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/src
Module Name:src Committed By: christos Date: Tue Apr 2 18:39:51 UTC 2024 Modified Files: src/lib/libm/src: s_fabsl.c s_rintl.c Log Message: PR/58054: Martin Husemann: fix bug in expsign extraction and only use the code for the floating point formats where it works (does not work for 112 bit mantisa in sparc64) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libm/src/s_fabsl.c cvs rdiff -u -r1.5 -r1.6 src/lib/libm/src/s_rintl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/src
Module Name:src
Committed By: christos
Date: Tue Apr 2 18:39:51 UTC 2024
Modified Files:
src/lib/libm/src: s_fabsl.c s_rintl.c
Log Message:
PR/58054: Martin Husemann: fix bug in expsign extraction and only use the
code for the floating point formats where it works (does not work for 112
bit mantisa in sparc64)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libm/src/s_fabsl.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libm/src/s_rintl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/s_fabsl.c
diff -u src/lib/libm/src/s_fabsl.c:1.6 src/lib/libm/src/s_fabsl.c:1.7
--- src/lib/libm/src/s_fabsl.c:1.6 Sun Feb 25 14:26:33 2024
+++ src/lib/libm/src/s_fabsl.c Tue Apr 2 14:39:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: s_fabsl.c,v 1.6 2024/02/25 19:26:33 christos Exp $ */
+/* $NetBSD: s_fabsl.c,v 1.7 2024/04/02 18:39:51 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: s_fabsl.c,v 1.6 2024/02/25 19:26:33 christos Exp $");
+__RCSID("$NetBSD: s_fabsl.c,v 1.7 2024/04/02 18:39:51 christos Exp $");
#include
#include
@@ -47,7 +47,6 @@ fabsl(long double x)
return (ux.extu_ld);
}
#else
-#if 0
/* defined in libc */
long double
fabsl(long double x)
@@ -55,4 +54,3 @@ fabsl(long double x)
return fabs(x);
}
#endif
-#endif
Index: src/lib/libm/src/s_rintl.c
diff -u src/lib/libm/src/s_rintl.c:1.5 src/lib/libm/src/s_rintl.c:1.6
--- src/lib/libm/src/s_rintl.c:1.5 Wed Aug 21 09:04:44 2013
+++ src/lib/libm/src/s_rintl.c Tue Apr 2 14:39:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: s_rintl.c,v 1.5 2013/08/21 13:04:44 martin Exp $ */
+/* $NetBSD: s_rintl.c,v 1.6 2024/04/02 18:39:51 christos Exp $ */
/*-
* Copyright (c) 2008 David Schultz
@@ -30,7 +30,7 @@
#if 0
__FBSDID("$FreeBSD: src/lib/msun/src/s_rintl.c,v 1.5 2008/02/22 11:59:05 bde Exp $");
#else
-__RCSID("$NetBSD: s_rintl.c,v 1.5 2013/08/21 13:04:44 martin Exp $");
+__RCSID("$NetBSD: s_rintl.c,v 1.6 2024/04/02 18:39:51 christos Exp $");
#endif
#include
@@ -40,17 +40,19 @@ __RCSID("$NetBSD: s_rintl.c,v 1.5 2013/0
#include "math_private.h"
#ifdef __HAVE_LONG_DOUBLE
+
+# if EXT_FRACBITS == 64 || EXT_FRACBITS == 113 && LDBL_MAX_EXP == 0x4000
+
+# define BIAS (LDBL_MAX_EXP - 1)
static const float
shift[2] = {
-#if EXT_FRACBITS == 64
+# if EXT_FRACBITS == 64
0x1.0p63, -0x1.0p63
-#elif EXT_FRACBITS == 113
+# elif EXT_FRACBITS == 113
0x1.0p112, -0x1.0p112
-#elif EXT_FRACBITS == 112
- 0x1.0p111, -0x1.0p111
-#else
-#error "Unsupported long double format"
-#endif
+# else
+# error "Unsupported long double format"
+# endif
};
static const float zero[2] = { 0.0, -0.0 };
@@ -63,11 +65,11 @@ rintl(long double x)
u.extu_ld = x;
u.extu_ext.ext_frach &= ~0x8000;
- expsign = u.extu_ext.ext_sign;
+ expsign = GET_EXPSIGN();
ex = expsign & 0x7fff;
- if (ex >= EXT_EXP_BIAS + EXT_FRACBITS - 1) {
- if (ex == EXT_EXP_BIAS + EXT_FRACBITS)
+ if (ex >= BIAS + EXT_FRACBITS - 1) {
+ if (ex == BIAS + EXT_FRACBITS)
return (x + x); /* Inf, NaN, or unsupported format */
return (x); /* finite and already an integer */
}
@@ -87,9 +89,18 @@ rintl(long double x)
* If the result is +-0, then it must have the same sign as x, but
* the above calculation doesn't always give this. Fix up the sign.
*/
- if (ex < EXT_EXP_BIAS && x == 0.0L)
+ if (ex < BIAS && x == 0.0L)
return (zero[sign]);
return (x);
}
-#endif
+# else
+
+long double
+rintl(long double x)
+{
+ return rint(x);
+}
+
+# endif
+#endif /* __HAVE_LONG_DOUBLE */
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Apr 2 16:18:23 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
Back-out unintented commit.
To generate a diff of this commit:
cvs rdiff -u -r1.398 -r1.399 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.398 src/share/mk/bsd.lib.mk:1.399
--- src/share/mk/bsd.lib.mk:1.398 Tue Apr 2 12:17:29 2024
+++ src/share/mk/bsd.lib.mk Tue Apr 2 12:18:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.398 2024/04/02 16:17:29 christos Exp $
+# $NetBSD: bsd.lib.mk,v 1.399 2024/04/02 16:18:23 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -16,13 +16,9 @@ LIBISCXX?= no
.if ${LIBISMODULE} != "no"
_LIB_PREFIX?= # empty
MKDEBUGLIB:= no
-MKPROFILE:= no
-.if ${LIBISMODULE} != "pic"
MKPICINSTALL:= no
-MKLINKLIB:= no
+MKPROFILE:= no
MKSTATICLIB:= no
-.endif
-_LINKINSTALL?= no
_LINTINSTALL?= no
.else
_LIB_PREFIX?= lib
@@ -30,19 +26,17 @@ _LIB_PREFIX?= lib
.if ${LIBISPRIVATE} != "no"
MKDEBUGLIB:= no
-MKPROFILE:= no
MKPICINSTALL:= no
. if defined(NOSTATICLIB) && ${MKPICLIB} != "no"
MKSTATICLIB:= no
. elif ${LIBISPRIVATE} != "pic"
MKPIC:= no
. endif
-_LINKINSTALL?= no
+MKPROFILE:= no
_LINTINSTALL?= no
.endif
_LINTINSTALL?= ${MKLINT}
-_LINKINSTALL?= ${MKLINKLIB}
# Basic targets
.PHONY: checkver libinstall
@@ -737,7 +731,7 @@ LIBCLEANFILES5+= ${_LIB.ln} ${LOBJS}
# Make sure it gets defined, in case MKPIC==no && MKLINKLIB==no
libinstall::
-.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no" && ${_LINKINSTALL} != "no"
+.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no"
libinstall:: ${_DEST.LIB}/${_LIB.a}
.PRECIOUS: ${_DEST.LIB}/${_LIB.a}
@@ -844,7 +838,7 @@ ${_DEST.OBJ}/${_LIB.so.full}: ${_LIB.so.
${_DEST.LIB}/${_LIB.so.major}
.endif
.endif
-.if ${MKLINKLIB} != "no" && ${_LINKINSTALL} != "no"
+.if ${MKLINKLIB} != "no"
${INSTALL_SYMLINK} ${_LIB.so.full} ${_DEST.OBJ}/${_LIB.so}
.if ${_LIBSODIR} != ${LIBDIR}
${INSTALL_SYMLINK} -l r ${_DEST.OBJ}/${_LIB.so.full} \
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Tue Apr 2 16:18:23 UTC 2024 Modified Files: src/share/mk: bsd.lib.mk Log Message: Back-out unintented commit. To generate a diff of this commit: cvs rdiff -u -r1.398 -r1.399 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: Tue Apr 2 16:17:29 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk bsd.x11.mk
Log Message:
PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
To generate a diff of this commit:
cvs rdiff -u -r1.397 -r1.398 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.151 -r1.152 src/share/mk/bsd.x11.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.397 src/share/mk/bsd.lib.mk:1.398
--- src/share/mk/bsd.lib.mk:1.397 Tue Mar 26 14:38:52 2024
+++ src/share/mk/bsd.lib.mk Tue Apr 2 12:17:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.397 2024/03/26 18:38:52 riastradh Exp $
+# $NetBSD: bsd.lib.mk,v 1.398 2024/04/02 16:17:29 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -16,9 +16,13 @@ LIBISCXX?= no
.if ${LIBISMODULE} != "no"
_LIB_PREFIX?= # empty
MKDEBUGLIB:= no
-MKPICINSTALL:= no
MKPROFILE:= no
+.if ${LIBISMODULE} != "pic"
+MKPICINSTALL:= no
+MKLINKLIB:= no
MKSTATICLIB:= no
+.endif
+_LINKINSTALL?= no
_LINTINSTALL?= no
.else
_LIB_PREFIX?= lib
@@ -26,17 +30,19 @@ _LIB_PREFIX?= lib
.if ${LIBISPRIVATE} != "no"
MKDEBUGLIB:= no
+MKPROFILE:= no
MKPICINSTALL:= no
. if defined(NOSTATICLIB) && ${MKPICLIB} != "no"
MKSTATICLIB:= no
. elif ${LIBISPRIVATE} != "pic"
MKPIC:= no
. endif
-MKPROFILE:= no
+_LINKINSTALL?= no
_LINTINSTALL?= no
.endif
_LINTINSTALL?= ${MKLINT}
+_LINKINSTALL?= ${MKLINKLIB}
# Basic targets
.PHONY: checkver libinstall
@@ -731,7 +737,7 @@ LIBCLEANFILES5+= ${_LIB.ln} ${LOBJS}
# Make sure it gets defined, in case MKPIC==no && MKLINKLIB==no
libinstall::
-.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no"
+.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no" && ${_LINKINSTALL} != "no"
libinstall:: ${_DEST.LIB}/${_LIB.a}
.PRECIOUS: ${_DEST.LIB}/${_LIB.a}
@@ -838,7 +844,7 @@ ${_DEST.OBJ}/${_LIB.so.full}: ${_LIB.so.
${_DEST.LIB}/${_LIB.so.major}
.endif
.endif
-.if ${MKLINKLIB} != "no"
+.if ${MKLINKLIB} != "no" && ${_LINKINSTALL} != "no"
${INSTALL_SYMLINK} ${_LIB.so.full} ${_DEST.OBJ}/${_LIB.so}
.if ${_LIBSODIR} != ${LIBDIR}
${INSTALL_SYMLINK} -l r ${_DEST.OBJ}/${_LIB.so.full} \
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.151 src/share/mk/bsd.x11.mk:1.152
--- src/share/mk/bsd.x11.mk:1.151 Wed Oct 25 00:37:59 2023
+++ src/share/mk/bsd.x11.mk Tue Apr 2 12:17:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.151 2023/10/25 04:37:59 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.152 2024/04/02 16:17:29 christos Exp $
.include
@@ -145,7 +145,7 @@ __XKBDEFRULES__= '"xorg"'
XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
-DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
-PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
+PRINT_PACKAGE_VERSION= ${TOOL_AWK} '/^PACKAGE_VERSION=/ { \
match($$1, "([0-9]+\\.)+[0-9]+"); \
version = substr($$1, RSTART, RLENGTH); \
} END { print version }'
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Apr 2 16:17:29 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk bsd.x11.mk
Log Message:
PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
To generate a diff of this commit:
cvs rdiff -u -r1.397 -r1.398 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.151 -r1.152 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/games/backgammon/common_source
Module Name:src Committed By: christos Date: Tue Apr 2 14:24:26 UTC 2024 Modified Files: src/games/backgammon/common_source: subs.c Log Message: Fix DEBUG build. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/games/backgammon/common_source/subs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/backgammon/common_source
Module Name:src
Committed By: christos
Date: Tue Apr 2 14:24:26 UTC 2024
Modified Files:
src/games/backgammon/common_source: subs.c
Log Message:
Fix DEBUG build.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/games/backgammon/common_source/subs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/backgammon/common_source/subs.c
diff -u src/games/backgammon/common_source/subs.c:1.20 src/games/backgammon/common_source/subs.c:1.21
--- src/games/backgammon/common_source/subs.c:1.20 Fri Sep 13 16:46:50 2013
+++ src/games/backgammon/common_source/subs.c Tue Apr 2 10:24:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: subs.c,v 1.20 2013/09/13 20:46:50 joerg Exp $ */
+/* $NetBSD: subs.c,v 1.21 2024/04/02 14:24:26 christos Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)subs.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: subs.c,v 1.20 2013/09/13 20:46:50 joerg Exp $");
+__RCSID("$NetBSD: subs.c,v 1.21 2024/04/02 14:24:26 christos Exp $");
#endif
#endif /* not lint */
@@ -119,6 +119,7 @@ void
writel(const char *l)
{
#ifdef DEBUG
+ static FILE *trace;
const char *s;
if (trace == NULL)
CVS commit: src/sys/arch/powerpc/include
Module Name:src Committed By: christos Date: Tue Apr 2 14:21:29 UTC 2024 Modified Files: src/sys/arch/powerpc/include: limits.h Log Message: harmonize with the rest of MD limits files. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/include/limits.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/powerpc/include
Module Name:src Committed By: christos Date: Tue Apr 2 14:21:29 UTC 2024 Modified Files: src/sys/arch/powerpc/include: limits.h Log Message: harmonize with the rest of MD limits files. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/include/limits.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/powerpc/include/limits.h diff -u src/sys/arch/powerpc/include/limits.h:1.20 src/sys/arch/powerpc/include/limits.h:1.21 --- src/sys/arch/powerpc/include/limits.h:1.20 Mon Jan 21 15:28:18 2019 +++ src/sys/arch/powerpc/include/limits.h Tue Apr 2 10:21:29 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: limits.h,v 1.20 2019/01/21 20:28:18 dholland Exp $ */ +/* $NetBSD: limits.h,v 1.21 2024/04/02 14:21:29 christos Exp $ */ /* * Copyright (c) 1988, 1993 @@ -94,18 +94,9 @@ #define SIZE_T_MAX UINT_MAX /* max value for a size_t */ #endif -#ifdef _LP64 -/* Quads and longs are the same on LP64. */ -#define UQUAD_MAX (ULONG_MAX) -#define QUAD_MAX (LONG_MAX) -#define QUAD_MIN (LONG_MIN) -#else -/* GCC requires that quad constants be written as expressions. */ -#define UQUAD_MAX ((u_quad_t)0-1) /* max value for a uquad_t */ - /* max value for a quad_t */ -#define QUAD_MAX ((quad_t)(UQUAD_MAX >> 1)) -#define QUAD_MIN (-QUAD_MAX-1) /* min value for a quad_t */ -#endif +#define UQUAD_MAX 0xULL /* max unsigned quad */ +#define QUAD_MAX 0x7fffLL /* max signed quad */ +#define QUAD_MIN (-0x7fffLL-1) /* min signed quad */ #endif /* _NETBSD_SOURCE */ #endif /* _POSIX_C_SOURCE || _XOPEN_SOURCE || _NETBSD_SOURCE */
CVS commit: src/external/bsd/ntp/lib/libntp
Module Name:src
Committed By: christos
Date: Tue Apr 2 14:19:02 UTC 2024
Modified Files:
src/external/bsd/ntp/lib/libntp: Makefile
Log Message:
use ${MKREPRO_TIMESTAMP} for baking in the date and time.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/ntp/lib/libntp/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/ntp/lib/libntp
Module Name:src
Committed By: christos
Date: Tue Apr 2 14:19:02 UTC 2024
Modified Files:
src/external/bsd/ntp/lib/libntp: Makefile
Log Message:
use ${MKREPRO_TIMESTAMP} for baking in the date and time.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/ntp/lib/libntp/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/ntp/lib/libntp/Makefile
diff -u src/external/bsd/ntp/lib/libntp/Makefile:1.27 src/external/bsd/ntp/lib/libntp/Makefile:1.28
--- src/external/bsd/ntp/lib/libntp/Makefile:1.27 Sat Jun 3 05:09:04 2023
+++ src/external/bsd/ntp/lib/libntp/Makefile Tue Apr 2 10:19:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2023/06/03 09:09:04 lukem Exp $
+# $NetBSD: Makefile,v 1.28 2024/04/02 14:19:02 christos Exp $
LIBISPRIVATE=yes
@@ -86,17 +86,11 @@ ymd2yd.c
CPPFLAGS+= -I${IDIST}/sntp/libopts
# For MKREPRO, avoid using __DATE__ and __TIME__.
-# Instead, use the date and time from ${IMPORTDATE_FILE}.
-#
-# The file should contain one line, like this:
-# Fri Dec 27 19:28:17 EST 2013 (import)
-#
+# Instead, use the date and time from ${MKREPRO_TIMESTAMP}
.if ${MKREPRO:Uno} == "yes"
IMPORTDATE_FILE := ${.PARSEDIR}/../../importdate
-MKREPRO_DATE != ${TOOL_AWK} '{printf "%3s %2d %4d", $$2, $$3, $$6}' \
- <${IMPORTDATE_FILE} # "Mmm DD "
-MKREPRO_TIME != ${TOOL_AWK} '{print $$4}' \
- <${IMPORTDATE_FILE} # "HH:MM:SS"
+MKREPRO_DATE != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "%F"
+MKREPRO_TIME != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "%T"
CPPFLAGS.ntp_calendar.c += -DMKREPRO_DATE=\"${MKREPRO_DATE:Q}\"
CPPFLAGS.ntp_calendar.c += -DMKREPRO_TIME=\"${MKREPRO_TIME:Q}\"
.endif
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Tue Apr 2 14:15:19 UTC 2024
Modified Files:
src/sys/conf: newvers_stand.sh
Log Message:
Use ${TOOL_DATE} (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/conf/newvers_stand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers_stand.sh
diff -u src/sys/conf/newvers_stand.sh:1.9 src/sys/conf/newvers_stand.sh:1.10
--- src/sys/conf/newvers_stand.sh:1.9 Sat Apr 8 15:53:54 2017
+++ src/sys/conf/newvers_stand.sh Tue Apr 2 10:15:19 2024
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: newvers_stand.sh,v 1.9 2017/04/08 19:53:54 christos Exp $
+# $NetBSD: newvers_stand.sh,v 1.10 2024/04/02 14:15:19 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,6 +35,8 @@
# Called as:
# sh ${S}/conf/newvers_stand.sh [-dkn] [-D ] [-m ] VERSION_TEMPLATE [EXTRA_MSG]
+DATE=${TOOL_DATE:-date}
+
cwd=$(dirname "$0")
add_name=true
@@ -45,8 +47,8 @@ dateargs=
# parse command args
while getopts "m:D:dknm:" OPT; do
- case $OPT in
- D) dateargs="-r $OPTARG";;
+ case ${OPT} in
+ D) dateargs="-r ${OPTARG}";;
d) add_date=false;;
k) add_kernrev=false;;
m) machine=${OPTARG};;
@@ -56,25 +58,25 @@ while getopts "m:D:dknm:" OPT; do
esac
done
-shift $(expr $OPTIND - 1)
+shift $(expr ${OPTIND} - 1)
r=$(awk -F: '$1 ~ /^[0-9.]*$/ { it = $1; } END { print it }' "$1")
shift
-t=$(LC_ALL=C TZ=UTC date $dateargs)
+t=$(LC_ALL=C TZ=UTC ${DATE} ${dateargs})
-if $add_date; then
+if ${add_date}; then
echo "const char bootprog_rev[] = \"${r} (${t})\";" > vers.c
else
echo "const char bootprog_rev[] = \"${r}\";" > vers.c
fi
-if $add_name; then
+if ${add_name}; then
extra=${1:+" $1"}
echo "const char bootprog_name[] = \"NetBSD/${machine}${extra}\";" >> vers.c
fi
-if $add_kernrev; then
+if ${add_kernrev}; then
osr=$(sh "${cwd}/osrelease.sh")
echo "const char bootprog_kernrev[] = \"${osr}\";" >> vers.c
fi
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Tue Apr 2 14:15:19 UTC 2024
Modified Files:
src/sys/conf: newvers_stand.sh
Log Message:
Use ${TOOL_DATE} (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/conf/newvers_stand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/usr.bin/gzip
Module Name:src Committed By: christos Date: Tue Apr 2 12:42:35 UTC 2024 Modified Files: src/usr.bin/gzip: gzip.c Log Message: oops the #endif was too far down. To generate a diff of this commit: cvs rdiff -u -r1.124 -r1.125 src/usr.bin/gzip/gzip.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
