Re: CVS commit: src/etc

2022-11-28 Thread Christos Zoulas
In article <20221128024658.71caaf...@cvs.netbsd.org>,
Jan Schaumann  wrote:
>-=-=-=-=-=-
>
>Module Name:   src
>Committed By:  jschauma
>Date:  Mon Nov 28 02:46:58 UTC 2022
>
>Modified Files:
>   src/etc: protocols
>
>Log Message:
>regen from IANA 2022-09-28
>
>
>To generate a diff of this commit:
>cvs rdiff -u -r1.31 -r1.32 src/etc/protocols
>
>Please note that diffs are not public domain; they are subject to the
>copyright notices on the relevant files.
>
>
>-=-=-=-=-=-
>
>Modified files:
>
>Index: src/etc/protocols
>diff -u src/etc/protocols:1.31 src/etc/protocols:1.32
>--- src/etc/protocols:1.31 Thu Apr  8 19:03:43 2021
>+++ src/etc/protocols  Mon Nov 28 02:46:58 2022
>@@ -1,8 +1,10 @@
>-# $NetBSD: protocols,v 1.31 2021/04/08 19:03:43 christos Exp $
>-# See also: protocols(5), http://www.sethwklein.net/projects/iana-etc/
>+# $NetBSD: protocols,v 1.32 2022/11/28 02:46:58 jschauma Exp $
>+# See also: protocols(5), https://www.iana.org/assignments/protocol-numbers/
> #
>+#   
>Protocol Numbers
>+# 
> #Last Updated
>-#2021-02-26
>+#2022-09-28
> # 
> #Available Formats
> #[IMG]
>@@ -50,7 +52,7 @@ igmp   2 IGMP # Internet
> ggp3 GGP  # Gateway-to-Gateway 
>[RFC823]
> ipv4   4 IPv4 # IPv4 encapsulation 
>[RFC2003]
> st 5 ST   # Stream 
>[RFC1190][RFC1819]
>-tcp6 TCP  # Transmission Control   
>[RFC793]
>+tcp6 TCP  # Transmission Control   
>[RFC9293]
> cbt7 CBT  # CBT
>[Tony_Ballardie]
> egp8 EGP  # Exterior Gateway Protocol  
>[RFC888][David_Mills]
> #   any private interior gateway
>@@ -162,9 +164,9 @@ iso-ip80 ISO-IP   # ISO Inte
> vmtp  81 VMTP # VMTP   
>[Dave_Cheriton]
> secure-vmtp   82 SECURE-VMTP  # SECURE-VMTP
>[Dave_Cheriton]
> vines 83 VINES# VINES  
>[Brian Horn]
>-ttp   84 TTP iptm IPTM # Transaction Transport 
>[Jim_Stevens]
>+ttp   84 TTP  # Transaction Transport  
>[Jim_Stevens]
> #   Protocol
>-#iptm  84 IPTM # Internet Protocol Traffic 
>[Jim_Stevens]
>+iptm  84 IPTM # Internet Protocol Traffic  

This will probably make the test fail. It was manually handled before
[the alias to the same number]

>[Jim_Stevens]
> #   Manager
> nsfnet-igp85 NSFNET-IGP   # NSFNET-IGP 
>[Hans_Werner_Braun]
> dgp   86 DGP  # Dissimilar Gateway Protocol
>[M/A-COM Government Systems, "Dissimilar Gateway Protocol
>Specification,
>@@ -205,7 +207,7 @@ ipcomp   108 IPComp   # IP Paylo
> snp  109 SNP  # Sitara Networks Protocol   
>[Manickam_R_Sridhar]
> compaq-peer  110 Compaq-Peer  # Compaq Peer Protocol   
>[Victor_Volpe]
> ipx-in-ip111 IPX-in-IP# IPX in IP  
>[CJ_Lee]
>-vrrp 112 VRRP carp# Virtual Router Redundancy  
>[RFC5798]
>+vrrp 112 VRRP # Virtual Router Redundancy  
>[RFC5798]
> #   Protocol
> pgm  113 PGM  # PGM Reliable Transport 
>[Tony_Speakman]
> #   Protocol
>@@ -238,16 +240,16 @@ rsvp-e2e-ignore 134 RSVP-E2E-IGNORE # [R
> mobility 135 Mobility # Header 
>Y[RFC6275]
> udplite  136 UDPLite  # [RFC3828]
> mpls-in-ip   137 MPLS-in-IP   # [RFC4023]
>-manet138 MANET# MANET Protocols
>[RFC5498]
>+manet138 manet# MANET Protocols

This will also probably make the test fail (alias to the same name)

>[RFC5498]
> hip  139 HIP  # Host Identity Protocol Y   
>[RFC7401]
> shim6140 Shim6# Shim6 Protocol Y   
>[RFC5533]
> wesp 141 WESP # Wrapped Encapsulating  
>[RFC5840]
> #   Security Payload
> rohc 142 ROHC # Robust Header Compression  
>[RFC5858]
> ethernet 143 Ethernet # Ethernet   
>[RFC8986]
>-#144-252Unassigned 
>[Internet_Assigned_Numbers_Authority]
>-pfsync   240 PFSYNC   # PF Synchronization

I would put this back, it is unofficial, but used.

christos



CVS commit: src/share/man/man3lua

2022-11-23 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Nov 23 19:20:34 UTC 2022

Modified Files:
src/share/man/man3lua: intro.3lua

Log Message:
Add links to libm (Phil Rulon)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/man/man3lua/intro.3lua

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/man3lua/intro.3lua
diff -u src/share/man/man3lua/intro.3lua:1.9 src/share/man/man3lua/intro.3lua:1.10
--- src/share/man/man3lua/intro.3lua:1.9	Sat May  5 09:49:24 2018
+++ src/share/man/man3lua/intro.3lua	Wed Nov 23 14:20:34 2022
@@ -1,4 +1,4 @@
-.\"	$NetBSD: intro.3lua,v 1.9 2018/05/05 13:49:24 sevan Exp $
+.\"	$NetBSD: intro.3lua,v 1.10 2022/11/23 19:20:34 christos Exp $
 .\"
 .\" Copyright (c) 2013, 2016 Marc Balmer .
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd May 5, 2018
+.Dd November 23, 2022
 .Dt INTRO 3lua
 .Os
 .Sh NAME
@@ -51,6 +51,10 @@ functionality.
 Access
 .Xr gpio 4
 pins.
+.It Em libm
+Access
+.Xr math 3
+functionality.
 .It Em netpgp
 Access
 .Xr libnetpgp 3
@@ -69,6 +73,7 @@ functionality.
 .Xr luac 1 ,
 .Xr bozohttpd 3lua ,
 .Xr gpio 3lua ,
+.Xr libm 3lua ,
 .Xr netpgp 3lua ,
 .Xr sqlite 3lua ,
 .Xr syslog 3lua ,



CVS commit: src/share/man/man3lua

2022-11-23 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Nov 23 19:20:34 UTC 2022

Modified Files:
src/share/man/man3lua: intro.3lua

Log Message:
Add links to libm (Phil Rulon)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/man/man3lua/intro.3lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/tests/lib/lua/libm

2022-11-23 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Nov 23 18:18:57 UTC 2022

Modified Files:
src/tests/lib/lua/libm: h_lualibm.c lualibm.lua

Log Message:
fix vax


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/lua/libm/h_lualibm.c \
src/tests/lib/lua/libm/lualibm.lua

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/lua/libm/h_lualibm.c
diff -u src/tests/lib/lua/libm/h_lualibm.c:1.2 src/tests/lib/lua/libm/h_lualibm.c:1.3
--- src/tests/lib/lua/libm/h_lualibm.c:1.2	Tue Nov 22 10:57:03 2022
+++ src/tests/lib/lua/libm/h_lualibm.c	Wed Nov 23 13:18:57 2022
@@ -68,7 +68,10 @@ main(void)
 	TEST(log10(100.0));
 	TEST(log1p(M_PI));
 	TEST(nan(""));
+#ifdef notyet
+	// XXX: vax
 	TEST(nextafter(1.0e-14, 1.0));
+#endif
 	TEST(pow(M_SQRT2, 2.0));
 	TEST(remainder(M_PI, M_E));
 	TEST(rint(M_PI));
Index: src/tests/lib/lua/libm/lualibm.lua
diff -u src/tests/lib/lua/libm/lualibm.lua:1.2 src/tests/lib/lua/libm/lualibm.lua:1.3
--- src/tests/lib/lua/libm/lualibm.lua:1.2	Tue Nov 22 10:57:03 2022
+++ src/tests/lib/lua/libm/lualibm.lua	Wed Nov 23 13:18:57 2022
@@ -74,7 +74,7 @@ test("log(M_E)", lm.log(lm.M_E))
 test("log10(100.0)", lm.log10(100.0))
 test("log1p(M_PI)", lm.log1p(lm.M_PI))
 test("nan(\"\")", lm.nan(""))
-test("nextafter(1.0e-14, 1.0)", lm.nextafter(1.0e-14, 1.0))
+-- XXX vax test("nextafter(1.0e-14, 1.0)", lm.nextafter(1.0e-14, 1.0))
 test("pow(M_SQRT2, 2.0)", lm.pow(lm.M_SQRT2, 2.0))
 test("remainder(M_PI, M_E)", lm.remainder(lm.M_PI, lm.M_E))
 test("rint(M_PI)", lm.rint(lm.M_PI))



CVS commit: src/tests/lib/lua/libm

2022-11-23 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Nov 23 18:18:57 UTC 2022

Modified Files:
src/tests/lib/lua/libm: h_lualibm.c lualibm.lua

Log Message:
fix vax


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/lua/libm/h_lualibm.c \
src/tests/lib/lua/libm/lualibm.lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/lib/lua/libm

2022-11-23 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Nov 23 18:15:43 UTC 2022

Modified Files:
src/lib/lua/libm: libm.c

Log Message:
fix vax build


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/lua/libm/libm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/lib/lua/libm

2022-11-23 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Nov 23 18:15:43 UTC 2022

Modified Files:
src/lib/lua/libm: libm.c

Log Message:
fix vax build


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/lua/libm/libm.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/lua/libm/libm.c
diff -u src/lib/lua/libm/libm.c:1.1 src/lib/lua/libm/libm.c:1.2
--- src/lib/lua/libm/libm.c:1.1	Mon Nov 21 17:01:33 2022
+++ src/lib/lua/libm/libm.c	Wed Nov 23 13:15:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: libm.c,v 1.1 2022/11/21 22:01:33 christos Exp $	*/
+/* $NetBSD: libm.c,v 1.2 2022/11/23 18:15:43 christos Exp $	*/
 
 /*-
  * Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__RCSID("$NetBSD: libm.c,v 1.1 2022/11/21 22:01:33 christos Exp $");
+__RCSID("$NetBSD: libm.c,v 1.2 2022/11/23 18:15:43 christos Exp $");
 
 #include 
 #include 
@@ -140,7 +140,9 @@ DFUNC_DBL(lgamma)
 DFUNC_DBL(log)
 DFUNC_DBL(log10)
 DFUNC_DBL(log1p)
+#ifndef __vax__
 DFUNC_DBL_DBL(nextafter)
+#endif
 DFUNC_DBL_DBL(pow)
 DFUNC_DBL_DBL(remainder)
 DFUNC_DBL(rint)
@@ -277,7 +279,9 @@ static const struct luaL_Reg lualibm[] =
 	{ "log10", libm_log10 },
 	{ "log1p", libm_log1p },
 	{ "nan", libm_nan },
+#ifndef __vax__
 	{ "nextafter", libm_nextafter },
+#endif
 	{ "pow", libm_pow },
 	{ "remainder", libm_remainder },
 	{ "rint", libm_rint },



CVS commit: src

2022-11-21 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Nov 21 22:01:34 UTC 2022

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/lib/lua: Makefile
src/share/man/man3lua: Makefile
src/tests/lib: Makefile
Added Files:
src/lib/lua/libm: Makefile libm.c
src/share/man/man3lua: libm.3lua
src/tests/lib/lua: Makefile Makefile.inc
src/tests/lib/lua/libm: Makefile h_lualibm.c lualibm.lua t_lualibm.sh

Log Message:
lua libm API from Phil Rulon


To generate a diff of this commit:
cvs rdiff -u -r1.941 -r1.942 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.391 -r1.392 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1756 -r1.1757 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.1233 -r1.1234 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.196 -r1.197 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.7 -r1.8 src/lib/lua/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/lua/libm/Makefile src/lib/lua/libm/libm.c
cvs rdiff -u -r1.7 -r1.8 src/share/man/man3lua/Makefile
cvs rdiff -u -r0 -r1.1 src/share/man/man3lua/libm.3lua
cvs rdiff -u -r1.34 -r1.35 src/tests/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/lua/Makefile \
src/tests/lib/lua/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/tests/lib/lua/libm/Makefile \
src/tests/lib/lua/libm/h_lualibm.c src/tests/lib/lua/libm/lualibm.lua \
src/tests/lib/lua/libm/t_lualibm.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.941 src/distrib/sets/lists/base/shl.mi:1.942
--- src/distrib/sets/lists/base/shl.mi:1.941	Wed Oct  5 18:40:12 2022
+++ src/distrib/sets/lists/base/shl.mi	Mon Nov 21 17:01:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.941 2022/10/05 22:40:12 christos Exp $
+# $NetBSD: shl.mi,v 1.942 2022/11/21 22:01:32 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -966,6 +966,7 @@
 ./usr/lib/lua/5.1/syslog.so	base-obsolete		obsolete
 ./usr/lib/lua/5.3/bozohttpd.so			base-sys-shlib		compatfile
 ./usr/lib/lua/5.3/gpio.so	base-sys-shlib		compatfile
+./usr/lib/lua/5.3/libm.so 			base-sys-shlib		compatfile
 ./usr/lib/lua/5.3/netpgp.so 			base-sys-shlib		compatfile
 ./usr/lib/lua/5.3/sqlite.so	base-sys-shlib		compatfile
 ./usr/lib/lua/5.3/syslog.so	base-sys-shlib		compatfile

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.391 src/distrib/sets/lists/debug/mi:1.392
--- src/distrib/sets/lists/debug/mi:1.391	Thu Nov 17 03:45:35 2022
+++ src/distrib/sets/lists/debug/mi	Mon Nov 21 17:01:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.391 2022/11/17 08:45:35 ozaki-r Exp $
+# $NetBSD: mi,v 1.392 2022/11/21 22:01:32 christos Exp $
 ./etc/mtree/set.debug   comp-sys-root
 ./usr/lib	comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -2400,6 +2400,10 @@
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_dlvsym.debug		tests-libexec-debug	debug,atf,pic,compattestfile
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_rtld_r_debug.debug	tests-libexec-debug	debug,atf,pic,compattestfile
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_ifunc.debug	tests-libexec-debug	debug,atf,pic,compattestfile
+./usr/libdata/debug/usr/tests/libtests-libexec-debug	debug,atf,pic,compattestfile
+./usr/libdata/debug/usr/tests/lib/luatests-libexec-debug	debug,atf,pic,compattestfile
+./usr/libdata/debug/usr/tests/lib/lua/libm			tests-libexec-debug	debug,atf,pic,compattestfile
+./usr/libdata/debug/usr/tests/lib/lua/libm/h_lualibm.debug	tests-libexec-debug	debug,atf,pic,compattestfile
 ./usr/libdata/debug/usr/tests/net/bpf/t_bpf.debug		tests-net-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/net/bpf/t_div-by-zero.debug		tests-net-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/net/bpf/t_mbuf.debug		tests-net-debug		debug,atf,rump

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1756 src/distrib/sets/lists/man/mi:1.1757
--- src/distrib/sets/lists/man/mi:1.1756	Mon Nov 21 16:24:01 2022
+++ src/distrib/sets/lists/man/mi	Mon Nov 21 17:01:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1756 2022/11/21 21:24:01 brad Exp $
+# $NetBSD: mi,v 1.1757 2022/11/21 22:01:32 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -695,6 +695,7 @@
 ./usr/share/man/cat3lua/gpio.unset.0		man-sys-catman		.cat
 ./usr/share/man/cat3lua/gpio.write.0		man-sys-catman		.cat
 ./usr/share/man/cat3lua/intro.0			man-sys-catman		.cat
+./usr/share/man/cat3lua/libm.0			man-sys-catman		.cat
 

CVS commit: src

2022-11-21 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Nov 21 22:01:34 UTC 2022

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/lib/lua: Makefile
src/share/man/man3lua: Makefile
src/tests/lib: Makefile
Added Files:
src/lib/lua/libm: Makefile libm.c
src/share/man/man3lua: libm.3lua
src/tests/lib/lua: Makefile Makefile.inc
src/tests/lib/lua/libm: Makefile h_lualibm.c lualibm.lua t_lualibm.sh

Log Message:
lua libm API from Phil Rulon


To generate a diff of this commit:
cvs rdiff -u -r1.941 -r1.942 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.391 -r1.392 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1756 -r1.1757 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.1233 -r1.1234 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.196 -r1.197 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.7 -r1.8 src/lib/lua/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/lua/libm/Makefile src/lib/lua/libm/libm.c
cvs rdiff -u -r1.7 -r1.8 src/share/man/man3lua/Makefile
cvs rdiff -u -r0 -r1.1 src/share/man/man3lua/libm.3lua
cvs rdiff -u -r1.34 -r1.35 src/tests/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/lua/Makefile \
src/tests/lib/lua/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/tests/lib/lua/libm/Makefile \
src/tests/lib/lua/libm/h_lualibm.c src/tests/lib/lua/libm/lualibm.lua \
src/tests/lib/lua/libm/t_lualibm.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/blocklist/bin

2022-11-18 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Nov 18 16:01:01 UTC 2022

Modified Files:
src/external/bsd/blocklist/bin: conf.c

Log Message:
Allow configuration of addresses without a mask/prefix (Jose Luis Duran)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/blocklist/bin/conf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/blocklist/bin/conf.c
diff -u src/external/bsd/blocklist/bin/conf.c:1.2 src/external/bsd/blocklist/bin/conf.c:1.3
--- src/external/bsd/blocklist/bin/conf.c:1.2	Mon Jun 13 11:00:20 2022
+++ src/external/bsd/blocklist/bin/conf.c	Fri Nov 18 11:01:00 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.2 2022/06/13 15:00:20 christos Exp $	*/
+/*	$NetBSD: conf.c,v 1.3 2022/11/18 16:01:00 christos Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: conf.c,v 1.2 2022/06/13 15:00:20 christos Exp $");
+__RCSID("$NetBSD: conf.c,v 1.3 2022/11/18 16:01:00 christos Exp $");
 
 #include 
 #ifdef HAVE_LIBUTIL_H
@@ -471,7 +471,6 @@ conf_amask_eq(const void *v1, const void
 	uint32_t m;
 	int omask = mask;
 
-	len >>= 2;
 	switch (mask) {
 	case FSTAR:
 		if (memcmp(v1, v2, len) == 0)
@@ -485,7 +484,7 @@ conf_amask_eq(const void *v1, const void
 		break;
 	}
 
-	for (size_t i = 0; i < len; i++) {
+	for (size_t i = 0; i < (len >> 2); i++) {
 		if (mask > 32) {
 			m = htonl((uint32_t)~0);
 			mask -= 32;
@@ -501,7 +500,6 @@ conf_amask_eq(const void *v1, const void
 out:
 	if (debug > 1) {
 		char b1[256], b2[256];
-		len <<= 2;
 		blhexdump(b1, sizeof(b1), "a1", v1, len);
 		blhexdump(b2, sizeof(b2), "a2", v2, len);
 		(*lfun)(LOG_DEBUG, "%s: %s != %s [0x%x]", __func__,



CVS commit: src/external/bsd/blocklist/bin

2022-11-18 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Nov 18 16:01:01 UTC 2022

Modified Files:
src/external/bsd/blocklist/bin: conf.c

Log Message:
Allow configuration of addresses without a mask/prefix (Jose Luis Duran)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/blocklist/bin/conf.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/time

2022-11-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Nov 16 19:38:08 UTC 2022

Modified Files:
src/lib/libc/time: private.h

Log Message:
PR/57083: Jiaxun Yang: Fix build on MacOS/X which has  but no
getrandom(3).


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/lib/libc/time/private.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/time/private.h
diff -u src/lib/libc/time/private.h:1.61 src/lib/libc/time/private.h:1.62
--- src/lib/libc/time/private.h:1.61	Sat Oct 29 09:55:50 2022
+++ src/lib/libc/time/private.h	Wed Nov 16 14:38:08 2022
@@ -1,6 +1,6 @@
 /* Private header for tzdb code.  */
 
-/*	$NetBSD: private.h,v 1.61 2022/10/29 13:55:50 christos Exp $	*/
+/*	$NetBSD: private.h,v 1.62 2022/11/16 19:38:08 christos Exp $	*/
 
 #ifndef PRIVATE_H
 #define PRIVATE_H
@@ -75,7 +75,7 @@
 # define HAVE_GENERIC (201112 <= __STDC_VERSION__)
 #endif
 
-#if !defined HAVE_GETRANDOM && defined __has_include
+#if !defined HAVE_GETRANDOM && !defined __APPLE__ && defined __has_include
 # if __has_include()
 #  define HAVE_GETRANDOM true
 # else



CVS commit: src/lib/libc/time

2022-11-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Nov 16 19:38:08 UTC 2022

Modified Files:
src/lib/libc/time: private.h

Log Message:
PR/57083: Jiaxun Yang: Fix build on MacOS/X which has  but no
getrandom(3).


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/lib/libc/time/private.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/blocklist/libexec

2022-11-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Nov 15 21:05:00 UTC 2022

Modified Files:
src/external/bsd/blocklist/libexec: blocklistd-helper

Log Message:
More ipfilter fixes (Jose Luis Duran)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/blocklist/libexec/blocklistd-helper

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/blocklist/libexec

2022-11-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Nov 15 21:05:00 UTC 2022

Modified Files:
src/external/bsd/blocklist/libexec: blocklistd-helper

Log Message:
More ipfilter fixes (Jose Luis Duran)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/blocklist/libexec/blocklistd-helper

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/blocklist/libexec/blocklistd-helper
diff -u src/external/bsd/blocklist/libexec/blocklistd-helper:1.6 src/external/bsd/blocklist/libexec/blocklistd-helper:1.7
--- src/external/bsd/blocklist/libexec/blocklistd-helper:1.6	Tue Nov 15 15:58:50 2022
+++ src/external/bsd/blocklist/libexec/blocklistd-helper	Tue Nov 15 16:05:00 2022
@@ -14,10 +14,18 @@ if [ -f "/etc/ipfw-blocklist.rc" ]; then
 	pf="ipfw"
 	. /etc/ipfw-blocklist.rc
 	ipfw_offset=${ipfw_offset:-2000}
-elif [ -f "/etc/ipfilter.conf" ]; then
-	pf="ipf"
 else
-	for f in npf pf ipf; do
+	# ipfilter NetBSD, FreeBSD, Linux
+	for f in /etc/ipf.conf /etc/ipf.rules /etc/netscript/ipfilter.conf; do
+		if [ -f "$f" ]; then
+			pf="ipf"
+			break
+		fi
+	done
+fi
+
+if [ -z "$pf" ]; then
+	for f in npf pf; do
 		if [ -f "/etc/$f.conf" ]; then
 			pf="$f"
 			break



CVS commit: src/external/bsd/blocklist/libexec

2022-11-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Nov 15 20:58:50 UTC 2022

Modified Files:
src/external/bsd/blocklist/libexec: blocklistd-helper

Log Message:
NetBSD uses ipf.conf for ipfilter not ipfilter.conf (Hose Luis Duran)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/blocklist/libexec/blocklistd-helper

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/blocklist/libexec/blocklistd-helper
diff -u src/external/bsd/blocklist/libexec/blocklistd-helper:1.5 src/external/bsd/blocklist/libexec/blocklistd-helper:1.6
--- src/external/bsd/blocklist/libexec/blocklistd-helper:1.5	Wed Oct 12 15:50:29 2022
+++ src/external/bsd/blocklist/libexec/blocklistd-helper	Tue Nov 15 15:58:50 2022
@@ -14,10 +14,10 @@ if [ -f "/etc/ipfw-blocklist.rc" ]; then
 	pf="ipfw"
 	. /etc/ipfw-blocklist.rc
 	ipfw_offset=${ipfw_offset:-2000}
-fi
-
-if [ -z "$pf" ]; then
-	for f in npf pf ipfilter; do
+elif [ -f "/etc/ipfilter.conf" ]; then
+	pf="ipf"
+else
+	for f in npf pf ipf; do
 		if [ -f "/etc/$f.conf" ]; then
 			pf="$f"
 			break



CVS commit: src/external/bsd/blocklist/libexec

2022-11-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Nov 15 20:58:50 UTC 2022

Modified Files:
src/external/bsd/blocklist/libexec: blocklistd-helper

Log Message:
NetBSD uses ipf.conf for ipfilter not ipfilter.conf (Hose Luis Duran)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/blocklist/libexec/blocklistd-helper

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/lib/libc/time

2022-11-02 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Nov  2 12:49:10 UTC 2022

Modified Files:
src/lib/libc/time: zic.c

Log Message:
Cleaner to use if/then/else rather than a ton of casts in the ternary operator.


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/lib/libc/time/zic.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/time/zic.c
diff -u src/lib/libc/time/zic.c:1.84 src/lib/libc/time/zic.c:1.85
--- src/lib/libc/time/zic.c:1.84	Sat Oct 29 09:55:50 2022
+++ src/lib/libc/time/zic.c	Wed Nov  2 08:49:10 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: zic.c,v 1.84 2022/10/29 13:55:50 christos Exp $	*/
+/*	$NetBSD: zic.c,v 1.85 2022/11/02 12:49:10 christos Exp $	*/
 /*
 ** This file is in the public domain, so clarified as of
 ** 2006-07-17 by Arthur David Olson.
@@ -11,7 +11,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: zic.c,v 1.84 2022/10/29 13:55:50 christos Exp $");
+__RCSID("$NetBSD: zic.c,v 1.85 2022/11/02 12:49:10 christos Exp $");
 #endif /* !defined lint */
 
 /* Use the system 'time' function, instead of any private replacement.
@@ -1204,7 +1204,10 @@ get_rand_u64(void)
   s = getrandom(entropy_buffer, sizeof entropy_buffer, 0);
 while (s < 0 && errno == EINTR);
 
-nwords = s < 0 ? (size_t)-1 : s / sizeof *entropy_buffer;
+if (s < 0)
+  nwords = -1;
+else
+  nwords = s / sizeof *entropy_buffer;
   }
   if (0 < nwords)
 return entropy_buffer[--nwords];



CVS commit: src/lib/libc/time

2022-11-02 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Nov  2 12:49:10 UTC 2022

Modified Files:
src/lib/libc/time: zic.c

Log Message:
Cleaner to use if/then/else rather than a ton of casts in the ternary operator.


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/lib/libc/time/zic.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

2022-10-30 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Oct 30 19:11:31 UTC 2022

Modified Files:
src/lib/libedit: chared.c chartype.c el.c filecomplete.c map.c read.c
read.h readline.c terminal.c

Log Message:
improvements in malloc/free handling.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/lib/libedit/chared.c
cvs rdiff -u -r1.35 -r1.36 src/lib/libedit/chartype.c
cvs rdiff -u -r1.100 -r1.101 src/lib/libedit/el.c
cvs rdiff -u -r1.70 -r1.71 src/lib/libedit/filecomplete.c
cvs rdiff -u -r1.54 -r1.55 src/lib/libedit/map.c
cvs rdiff -u -r1.107 -r1.108 src/lib/libedit/read.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libedit/read.h
cvs rdiff -u -r1.176 -r1.177 src/lib/libedit/readline.c
cvs rdiff -u -r1.44 -r1.45 src/lib/libedit/terminal.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

2022-10-30 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Oct 30 19:11:31 UTC 2022

Modified Files:
src/lib/libedit: chared.c chartype.c el.c filecomplete.c map.c read.c
read.h readline.c terminal.c

Log Message:
improvements in malloc/free handling.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/lib/libedit/chared.c
cvs rdiff -u -r1.35 -r1.36 src/lib/libedit/chartype.c
cvs rdiff -u -r1.100 -r1.101 src/lib/libedit/el.c
cvs rdiff -u -r1.70 -r1.71 src/lib/libedit/filecomplete.c
cvs rdiff -u -r1.54 -r1.55 src/lib/libedit/map.c
cvs rdiff -u -r1.107 -r1.108 src/lib/libedit/read.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libedit/read.h
cvs rdiff -u -r1.176 -r1.177 src/lib/libedit/readline.c
cvs rdiff -u -r1.44 -r1.45 src/lib/libedit/terminal.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libedit/chared.c
diff -u src/lib/libedit/chared.c:1.62 src/lib/libedit/chared.c:1.63
--- src/lib/libedit/chared.c:1.62	Tue Feb  8 16:13:22 2022
+++ src/lib/libedit/chared.c	Sun Oct 30 15:11:31 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: chared.c,v 1.62 2022/02/08 21:13:22 rillig Exp $	*/
+/*	$NetBSD: chared.c,v 1.63 2022/10/30 19:11:31 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)chared.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: chared.c,v 1.62 2022/02/08 21:13:22 rillig Exp $");
+__RCSID("$NetBSD: chared.c,v 1.63 2022/10/30 19:11:31 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -414,7 +414,7 @@ ch_init(EditLine *el)
 	el->el_chared.c_redo.buf	= el_calloc(EL_BUFSIZ,
 	sizeof(*el->el_chared.c_redo.buf));
 	if (el->el_chared.c_redo.buf == NULL)
-		return -1;
+		goto out;
 	el->el_chared.c_redo.pos	= el->el_chared.c_redo.buf;
 	el->el_chared.c_redo.lim	= el->el_chared.c_redo.buf + EL_BUFSIZ;
 	el->el_chared.c_redo.cmd	= ED_UNASSIGNED;
@@ -425,7 +425,7 @@ ch_init(EditLine *el)
 	el->el_chared.c_kill.buf	= el_calloc(EL_BUFSIZ,
 	sizeof(*el->el_chared.c_kill.buf));
 	if (el->el_chared.c_kill.buf == NULL)
-		return -1;
+		goto out;
 	el->el_chared.c_kill.mark	= el->el_line.buffer;
 	el->el_chared.c_kill.last	= el->el_chared.c_kill.buf;
 	el->el_chared.c_resizefun	= NULL;
@@ -442,6 +442,9 @@ ch_init(EditLine *el)
 	el->el_state.lastcmd		= ED_UNASSIGNED;
 
 	return 0;
+out:
+	ch_end(el);
+	return -1;
 }
 
 /* ch_reset():

Index: src/lib/libedit/chartype.c
diff -u src/lib/libedit/chartype.c:1.35 src/lib/libedit/chartype.c:1.36
--- src/lib/libedit/chartype.c:1.35	Tue Jul 23 06:18:52 2019
+++ src/lib/libedit/chartype.c	Sun Oct 30 15:11:31 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: chartype.c,v 1.35 2019/07/23 10:18:52 christos Exp $	*/
+/*	$NetBSD: chartype.c,v 1.36 2022/10/30 19:11:31 christos Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: chartype.c,v 1.35 2019/07/23 10:18:52 christos Exp $");
+__RCSID("$NetBSD: chartype.c,v 1.36 2022/10/30 19:11:31 christos Exp $");
 #endif /* not lint && not SCCSID */
 
 #include 
@@ -158,6 +158,8 @@ ct_decode_argv(int argc, const char *arg
 			return NULL;
 
 	wargv = el_calloc((size_t)(argc + 1), sizeof(*wargv));
+	if (wargv == NULL)
+		return NULL;
 
 	for (i = 0, p = conv->wbuff; i < argc; ++i) {
 		if (!argv[i]) {   /* don't pass null pointers to mbstowcs */

Index: src/lib/libedit/el.c
diff -u src/lib/libedit/el.c:1.100 src/lib/libedit/el.c:1.101
--- src/lib/libedit/el.c:1.100	Sun Aug 15 06:08:41 2021
+++ src/lib/libedit/el.c	Sun Oct 30 15:11:31 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: el.c,v 1.100 2021/08/15 10:08:41 christos Exp $	*/
+/*	$NetBSD: el.c,v 1.101 2022/10/30 19:11:31 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)el.c	8.2 (Berkeley) 1/3/94";
 #else
-__RCSID("$NetBSD: el.c,v 1.100 2021/08/15 10:08:41 christos Exp $");
+__RCSID("$NetBSD: el.c,v 1.101 2022/10/30 19:11:31 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -142,7 +142,7 @@ el_end(EditLine *el)
 	if (!(el->el_flags & NO_TTY))
 		tty_end(el, TCSAFLUSH);
 	ch_end(el);
-	read_end(el->el_read);
+	read_end(el);
 	search_end(el);
 	hist_end(el);
 	prompt_end(el);

Index: src/lib/libedit/filecomplete.c
diff -u src/lib/libedit/filecomplete.c:1.70 src/lib/libedit/filecomplete.c:1.71
--- src/lib/libedit/filecomplete.c:1.70	Sat Mar 12 10:29:17 2022
+++ src/lib/libedit/filecomplete.c	Sun Oct 30 15:11:31 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: filecomplete.c,v 1.70 2022/03/12 15:29:17 christos Exp $	*/
+/*	$NetBSD: filecomplete.c,v 1.71 2022/10/30 19:11:31 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: filecomplete.c,v 1.70 2022/03/12 15:29:17 christos Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.71 

CVS commit: src/doc

2022-10-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 29 13:57:38 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new tzcode 2022f


To generate a diff of this commit:
cvs rdiff -u -r1.1896 -r1.1897 src/doc/3RDPARTY
cvs rdiff -u -r1.2926 -r1.2927 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1896 src/doc/3RDPARTY:1.1897
--- src/doc/3RDPARTY:1.1896	Wed Oct 26 06:38:48 2022
+++ src/doc/3RDPARTY	Sat Oct 29 09:57:38 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1896 2022/10/26 10:38:48 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1897 2022/10/29 13:57:38 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1424,14 +1424,14 @@ Location:	external/bsd/tradcpp
 Notes:
 
 Package:	tz
-Version:	tzcode2022e / tzdata2022egtz
-Current Vers:	tzcode2022e / tzdata2022e
+Version:	tzcode2022f / tzdata2022egtz
+Current Vers:	tzcode2022f / tzdata2022f
 Maintainer:	Paul Eggert 
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/
 Old Archive Site:	ftp://elsie.nci.nih.gov/pub/
 Home Page:	http://www.iana.org/time-zones
-Date:		2022-10-15
+Date:		2022-10-29
 Mailing List:	t...@iana.org
 Responsible:	kleink, christos, kre
 License:	Public domain

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2926 src/doc/CHANGES:1.2927
--- src/doc/CHANGES:1.2926	Fri Oct 28 16:39:23 2022
+++ src/doc/CHANGES	Sat Oct 29 09:57:38 2022
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2926 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2927 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -709,6 +709,7 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 		recent. [mrg 20221015]
 	evbarm: Add support for Oracle Cloud virtual machines.
 		[jmcneill 20221015]
-	libc: put reallocarray(3) in the public namespace
+	libc: put reallocarray(3) in the public namespace [wiz 20221028]
 	evbarm: Update Xilinx Zynq-7000 SoC support to use FDT based
 		configuration. [jmcneill 20221028]
+	tzcode: Updated to 2022f. [christos 20221029]



CVS commit: src/doc

2022-10-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 29 13:57:38 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new tzcode 2022f


To generate a diff of this commit:
cvs rdiff -u -r1.1896 -r1.1897 src/doc/3RDPARTY
cvs rdiff -u -r1.2926 -r1.2927 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/lib/libc/time

2022-10-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 29 13:55:50 UTC 2022

Modified Files:
src/lib/libc/time: Makefile NEWS localtime.c private.h theory.html
version zdump.c zic.8 zic.c

Log Message:
Update to tzcode2022f

  Changes to code

zic now supports links to links regardless of input line order.
For example, if Australia/Sydney is a Zone, the lines
  Link Australia/Canberra Australia/ACT
  Link Australia/Sydney Australia/Canberra
now work correctly, even though the shell commands
  ln Australia/Canberra Australia/ACT
  ln Australia/Sydney Australia/Canberra
would fail because the first command attempts to use a link
Australia/Canberra that does not exist until after the second
command is executed.  Previously, zic had unspecified behavior if
a Link line's target was another link, and zic often misbehaved if
a Link line's target was a later Link line.

Fix line number in zic's diagnostic for a link to a link.

Fix a bug that caused localtime to mishandle timestamps starting
in the year 2438 when reading data generated by 'zic -b fat' when
distant-future DST transitions occur at times given in standard
time or in UT, not the usual case of local time.  This occurs when
the corresponding .zi Rule lines specify DST transitions with TO
columns of 'max' and AT columns that end in 's' or 'u'.  The
number 2438 comes from the 32-bit limit in the year 2038, plus the
400-year Gregorian cycle.  (Problem reported by Bradley White.)

On glibc 2.34 and later, which optionally supports 64-bit time_t
on platforms like x86 where time_t was traditionally 32 bits,
default time_t to 64 instead of 32 bits.  This lets functions like
localtime support timestamps after the year 2038, and fixes
year-2038 problems in zic when accessing files dated after 2038.
To continue to limit time_t to 32 bits on these platforms, use
"make CFLAGS='-D_TIME_BITS=32'".

In C code, do not enable large-file support on platforms like AIX
and macOS that no longer need it now that tzcode does not use
off_t or related functions like 'stat'.  Large-file support is
still enabled by default on GNU/Linux, as it is needed for 64-bit
time_t support.

In C code, prefer C23 keywords to pre-C23 macros for alignof,
bool, false, and true.  Also, use the following C23 features if
available: __has_include, unreachable.

zic no longer works around Qt bug 53071, as the relevant Qt
releases have been out of support since 2019.  This change affects
only fat TZif files, as thin files never had the workaround.

zdump no longer modifies the environ vector when compiled on
platforms lacking tm_zone or when compiled with -DUSE_LTZ=0.
This avoid undefined behavior on POSIX platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/lib/libc/time/Makefile
cvs rdiff -u -r1.38 -r1.39 src/lib/libc/time/NEWS
cvs rdiff -u -r1.134 -r1.135 src/lib/libc/time/localtime.c
cvs rdiff -u -r1.60 -r1.61 src/lib/libc/time/private.h
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/time/theory.html
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/time/version
cvs rdiff -u -r1.57 -r1.58 src/lib/libc/time/zdump.c
cvs rdiff -u -r1.39 -r1.40 src/lib/libc/time/zic.8
cvs rdiff -u -r1.83 -r1.84 src/lib/libc/time/zic.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/time/Makefile
diff -u src/lib/libc/time/Makefile:1.52 src/lib/libc/time/Makefile:1.53
--- src/lib/libc/time/Makefile:1.52	Tue Aug 16 07:07:40 2022
+++ src/lib/libc/time/Makefile	Sat Oct 29 09:55:50 2022
@@ -210,7 +210,8 @@ LDLIBS=
 #  -DHAVE_DECL_ENVIRON if  declares 'environ'
 #  -DHAVE_DIRECT_H if mkdir needs  (MS-Windows)
 #  -DHAVE_GENERIC=0 if _Generic does not work
-#  -DHAVE_GETTEXT if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris)
+#  -DHAVE_GETRANDOM if getgrandom works (e.g., GNU/Linux)*
+#  -DHAVE_GETTEXT if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris)*
 #  -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares
 #	ctime_r and asctime_r incompatibly with the POSIX standard
 #	(Solaris when _POSIX_PTHREAD_SEMANTICS is not defined).
@@ -222,16 +223,17 @@ LDLIBS=
 #  -DHAVE_MALLOC_ERRNO=0 if malloc etc. do not set errno on failure.
 #  -DHAVE_POSIX_DECLS=0 if your system's include files do not declare
 #	functions like 'link' or variables like 'tzname' required by POSIX
+#  -DHAVE_SETENV=0 if your system lacks the setenv function
 #  -DHAVE_SNPRINTF=0 if your system lacks the snprintf function
-#  -DHAVE_STDBOOL_H if you have a non-C99 compiler with 
-#  -DHAVE_STDINT_H if you have a non-C99 compiler with 
+#  -DHAVE_STDINT_H if you have a non-C99 compiler with *
 #  -DHAVE_STRFTIME_L if  declares locale_t and strftime_l
 #  -DHAVE_STRDUP=0 if your system lacks the strdup function
 #  -DHAVE_STRTOLL=0 if 

CVS commit: src/lib/libc/time

2022-10-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 29 13:55:50 UTC 2022

Modified Files:
src/lib/libc/time: Makefile NEWS localtime.c private.h theory.html
version zdump.c zic.8 zic.c

Log Message:
Update to tzcode2022f

  Changes to code

zic now supports links to links regardless of input line order.
For example, if Australia/Sydney is a Zone, the lines
  Link Australia/Canberra Australia/ACT
  Link Australia/Sydney Australia/Canberra
now work correctly, even though the shell commands
  ln Australia/Canberra Australia/ACT
  ln Australia/Sydney Australia/Canberra
would fail because the first command attempts to use a link
Australia/Canberra that does not exist until after the second
command is executed.  Previously, zic had unspecified behavior if
a Link line's target was another link, and zic often misbehaved if
a Link line's target was a later Link line.

Fix line number in zic's diagnostic for a link to a link.

Fix a bug that caused localtime to mishandle timestamps starting
in the year 2438 when reading data generated by 'zic -b fat' when
distant-future DST transitions occur at times given in standard
time or in UT, not the usual case of local time.  This occurs when
the corresponding .zi Rule lines specify DST transitions with TO
columns of 'max' and AT columns that end in 's' or 'u'.  The
number 2438 comes from the 32-bit limit in the year 2038, plus the
400-year Gregorian cycle.  (Problem reported by Bradley White.)

On glibc 2.34 and later, which optionally supports 64-bit time_t
on platforms like x86 where time_t was traditionally 32 bits,
default time_t to 64 instead of 32 bits.  This lets functions like
localtime support timestamps after the year 2038, and fixes
year-2038 problems in zic when accessing files dated after 2038.
To continue to limit time_t to 32 bits on these platforms, use
"make CFLAGS='-D_TIME_BITS=32'".

In C code, do not enable large-file support on platforms like AIX
and macOS that no longer need it now that tzcode does not use
off_t or related functions like 'stat'.  Large-file support is
still enabled by default on GNU/Linux, as it is needed for 64-bit
time_t support.

In C code, prefer C23 keywords to pre-C23 macros for alignof,
bool, false, and true.  Also, use the following C23 features if
available: __has_include, unreachable.

zic no longer works around Qt bug 53071, as the relevant Qt
releases have been out of support since 2019.  This change affects
only fat TZif files, as thin files never had the workaround.

zdump no longer modifies the environ vector when compiled on
platforms lacking tm_zone or when compiled with -DUSE_LTZ=0.
This avoid undefined behavior on POSIX platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/lib/libc/time/Makefile
cvs rdiff -u -r1.38 -r1.39 src/lib/libc/time/NEWS
cvs rdiff -u -r1.134 -r1.135 src/lib/libc/time/localtime.c
cvs rdiff -u -r1.60 -r1.61 src/lib/libc/time/private.h
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/time/theory.html
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/time/version
cvs rdiff -u -r1.57 -r1.58 src/lib/libc/time/zdump.c
cvs rdiff -u -r1.39 -r1.40 src/lib/libc/time/zic.8
cvs rdiff -u -r1.83 -r1.84 src/lib/libc/time/zic.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/tools/zic

2022-10-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 29 13:53:35 UTC 2022

Modified Files:
src/tools/zic: Makefile

Log Message:
don't require gettext


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tools/zic/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/zic/Makefile
diff -u src/tools/zic/Makefile:1.6 src/tools/zic/Makefile:1.7
--- src/tools/zic/Makefile:1.6	Thu Mar  3 09:53:01 2011
+++ src/tools/zic/Makefile	Sat Oct 29 09:53:35 2022
@@ -1,10 +1,11 @@
-#	$NetBSD: Makefile,v 1.6 2011/03/03 14:53:01 nakayama Exp $
+#	$NetBSD: Makefile,v 1.7 2022/10/29 13:53:35 christos Exp $
 
 HOSTPROGNAME=	${_TOOL_PREFIX}zic
 HOST_SRCDIR=	usr.sbin/zic
 
 .if !empty(HOST_OSTYPE:MSunOS-5.1[01]-*)
-HOST_CPPFLAGS=	-D_POSIX_PTHREAD_SEMANTICS
+HOST_CPPFLAGS+=	-D_POSIX_PTHREAD_SEMANTICS
 .endif
+HOST_CPPFLAGS+= -DHAVE_GETTEXT=0
 
 .include "${.CURDIR}/../Makefile.host"



CVS commit: src/tools/zic

2022-10-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 29 13:53:35 UTC 2022

Modified Files:
src/tools/zic: Makefile

Log Message:
don't require gettext


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tools/zic/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/usr.sbin

2022-10-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 29 13:53:20 UTC 2022

Modified Files:
src/usr.sbin/zdump: Makefile
src/usr.sbin/zic: Makefile

Log Message:
need gettext now


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/zdump/Makefile
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/zic/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/usr.sbin

2022-10-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 29 13:53:20 UTC 2022

Modified Files:
src/usr.sbin/zdump: Makefile
src/usr.sbin/zic: Makefile

Log Message:
need gettext now


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/zdump/Makefile
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/zic/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/zdump/Makefile
diff -u src/usr.sbin/zdump/Makefile:1.13 src/usr.sbin/zdump/Makefile:1.14
--- src/usr.sbin/zdump/Makefile:1.13	Mon Nov 11 17:45:32 2019
+++ src/usr.sbin/zdump/Makefile	Sat Oct 29 09:53:19 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2019/11/11 22:45:32 joerg Exp $
+#	$NetBSD: Makefile,v 1.14 2022/10/29 13:53:19 christos Exp $
 
 .include "${.PARSEDIR}/../zic/Makefile.inc"
 .include 
@@ -7,6 +7,9 @@ PROG=	zdump
 SRCS=	zdump.c
 MAN=	zdump.8
 
+LDADD+= -lintl
+DPADD+= ${LIBINTL}
+
 TZVERSION!= ${TOOL_CAT} ${NETBSDSRCDIR}/lib/libc/time/version
 CPPFLAGS+=-DPKGVERSION='"(tzcode) "' -DTZVERSION='"${TZVERSION}"'
 

Index: src/usr.sbin/zic/Makefile
diff -u src/usr.sbin/zic/Makefile:1.21 src/usr.sbin/zic/Makefile:1.22
--- src/usr.sbin/zic/Makefile:1.21	Wed Jul  3 11:50:40 2019
+++ src/usr.sbin/zic/Makefile	Sat Oct 29 09:53:19 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.21 2019/07/03 15:50:40 christos Exp $
+#	$NetBSD: Makefile,v 1.22 2022/10/29 13:53:19 christos Exp $
 
 .include "Makefile.inc"
 .include 
@@ -19,8 +19,8 @@ CPPFLAGS+=-DZIC_BLOAT_DEFAULT='"slim"'
 .PATH: ${NETBSDSRCDIR}/lib/libc/time
 
 .if !defined(HOSTPROG)
-LDADD+=-lutil
-DPADD+=${LIBUTIL}
+LDADD+=-lintl -lutil
+DPADD+=${LIBINTL} ${LIBUTIL}
 .endif
 
 foo:



CVS commit: src/crypto/external/bsd/openssl/dist/ssl

2022-10-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Oct 27 16:20:23 UTC 2022

Modified Files:
src/crypto/external/bsd/openssl/dist/ssl: ssl_ciph.c

Log Message:
merge upstream commit 9b3219ba544db82cdad3058b9872058739559944:

If rule_str ended in a "-", "l" was incremented one byte past the
end of the buffer.  This resulted in an out-of-bounds read when "l"
is dereferenced at the end of the loop.  It is safest to just return
early in this case since the condition occurs inside a nested loop.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/crypto/external/bsd/openssl/dist/ssl

2022-10-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Oct 27 16:20:23 UTC 2022

Modified Files:
src/crypto/external/bsd/openssl/dist/ssl: ssl_ciph.c

Log Message:
merge upstream commit 9b3219ba544db82cdad3058b9872058739559944:

If rule_str ended in a "-", "l" was incremented one byte past the
end of the buffer.  This resulted in an out-of-bounds read when "l"
is dereferenced at the end of the loop.  It is safest to just return
early in this case since the condition occurs inside a nested loop.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c
diff -u src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c:1.21 src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c:1.22
--- src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c:1.21	Fri Jan  7 10:50:11 2022
+++ src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c	Thu Oct 27 12:20:23 2022
@@ -1026,9 +1026,7 @@ static int ssl_cipher_process_rulestr(co
  * alphanumeric, so we call this an error.
  */
 SSLerr(SSL_F_SSL_CIPHER_PROCESS_RULESTR, SSL_R_INVALID_COMMAND);
-retval = found = 0;
-l++;
-break;
+		return 0;
 }
 
 if (rule == CIPHER_SPECIAL) {



CVS commit: src/bin/date

2022-10-22 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 22 20:11:43 UTC 2022

Modified Files:
src/bin/date: date.1 date.c

Log Message:
Add -f option to set the time. From FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/bin/date/date.1
cvs rdiff -u -r1.62 -r1.63 src/bin/date/date.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/bin/date

2022-10-22 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 22 20:11:43 UTC 2022

Modified Files:
src/bin/date: date.1 date.c

Log Message:
Add -f option to set the time. From FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/bin/date/date.1
cvs rdiff -u -r1.62 -r1.63 src/bin/date/date.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/date/date.1
diff -u src/bin/date/date.1:1.50 src/bin/date/date.1:1.51
--- src/bin/date/date.1:1.50	Tue May 10 05:07:57 2022
+++ src/bin/date/date.1	Sat Oct 22 16:11:43 2022
@@ -1,4 +1,4 @@
-.\"	$NetBSD: date.1,v 1.50 2022/05/10 09:07:57 uwe Exp $
+.\"	$NetBSD: date.1,v 1.51 2022/10/22 20:11:43 christos Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" @(#)date.1	8.3 (Berkeley) 4/28/95
 .\"
-.Dd May 10, 2022
+.Dd October 22, 2022
 .Dt DATE 1
 .Os
 .Sh NAME
@@ -53,6 +53,11 @@
 .Ar HH Oc Ar MM Oo
 .Li \&. Ar SS Oc Oc
 .Sm on
+.Nm
+.Op Fl ajnu
+.Fl f Ar input_format
+new_date
+.Op Cm + Ns Ar format
 .Sh DESCRIPTION
 .Nm
 displays the current date and time when invoked without arguments.
@@ -76,6 +81,24 @@ actually changing the system clock.
 (See
 .Xr parsedate 3
 for examples.)
+.It Fl f Ar input_fmt
+Use
+.Ar input_fmt
+as the format string to parse the
+.Ar new_date
+provided rather than using the default
+.Sm off
+.Oo Oo Oo Oo Oo
+.Ar cc Oc
+.Ar yy Oc
+.Ar mm Oc
+.Ar dd Oc
+.Ar HH
+.Oc Ar MM Op Cm \&. Ar SS
+.Sm on
+format.
+Parsing is done using
+.Xr strptime 3 .
 .It Fl j
 Parse the provided canonical representation of date and time (described below)
 and display the result without actually changing the system clock.

Index: src/bin/date/date.c
diff -u src/bin/date/date.c:1.62 src/bin/date/date.c:1.63
--- src/bin/date/date.c:1.62	Wed May 26 16:19:51 2021
+++ src/bin/date/date.c	Sat Oct 22 16:11:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: date.c,v 1.62 2021/05/26 20:19:51 christos Exp $ */
+/* $NetBSD: date.c,v 1.63 2022/10/22 20:11:43 christos Exp $ */
 
 /*
  * Copyright (c) 1985, 1987, 1988, 1993
@@ -44,7 +44,7 @@ __COPYRIGHT(
 #if 0
 static char sccsid[] = "@(#)date.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: date.c,v 1.62 2021/05/26 20:19:51 christos Exp $");
+__RCSID("$NetBSD: date.c,v 1.63 2022/10/22 20:11:43 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -64,11 +64,15 @@ __RCSID("$NetBSD: date.c,v 1.62 2021/05/
 #include 
 #include 
 #include 
+#if !HAVE_NBTOOL_CONFIG_H
+#include 
+#endif
 
 #include "extern.h"
 
 static time_t tval;
 static int aflag, jflag, rflag, nflag;
+static char *fmt;
 
 __dead static void badcanotime(const char *, const char *, size_t);
 static void setthetime(const char *);
@@ -87,7 +91,7 @@ main(int argc, char *argv[])
 	setprogname(argv[0]);
 	(void)setlocale(LC_ALL, "");
 
-	while ((ch = getopt(argc, argv, "ad:jnr:u")) != -1) {
+	while ((ch = getopt(argc, argv, "ad:f:jnr:u")) != -1) {
 		switch (ch) {
 		case 'a':		/* adjust time slowly */
 			aflag = 1;
@@ -106,6 +110,9 @@ main(int argc, char *argv[])
 			errx(EXIT_FAILURE,
 			"-d not supported in the tool version");
 #endif
+		case 'f':
+			fmt = optarg;
+			break;
 		case 'j':		/* don't set time */
 			jflag = 1;
 			break;
@@ -152,7 +159,8 @@ main(int argc, char *argv[])
 	if (*argv) {
 		setthetime(*argv);
 		++argv;
-	}
+	} else if (fmt)
+		usage();
 
 	if (*argv && **argv == '+')
 		format = *argv;
@@ -195,6 +203,22 @@ setthetime(const char *p)
 	size_t len;
 	int yearset;
 
+	if ((lt = localtime()) == NULL)
+		err(EXIT_FAILURE, "%lld: localtime", (long long)tval);
+
+	lt->tm_isdst = -1;			/* Divine correct DST */
+
+	if (fmt) {
+		t = strptime(p, fmt, lt);
+		if (t == NULL) {
+			warnx("Failed conversion of ``%s''"
+			" using format ``%s''\n", p, fmt);
+		} else if (*t != '\0')
+			warnx("Ignoring %zu extraneous"
+" characters in date string (%s)",
+strlen(t), t);
+		goto setit;
+	}
 	for (t = p, dot = NULL; *t; ++t) {
 		if (*t == '.') {
 			if (dot == NULL) {
@@ -207,10 +231,6 @@ setthetime(const char *p)
 		}
 	}
 
-	if ((lt = localtime()) == NULL)
-		err(EXIT_FAILURE, "%lld: localtime", (long long)tval);
-
-	lt->tm_isdst = -1;			/* Divine correct DST */
 
 	if (dot != NULL) {			/* .ss */
 		len = strlen(dot);
@@ -325,11 +345,11 @@ setthetime(const char *p)
 		badcanotime("Not enough digits", p, strlen(p) - len);
 	}
 	}
-
+setit:
 	/* convert broken-down time to UTC clock time */
 	if ((new_time = mktime(lt)) == -1) {
 		/* Can this actually happen? */
-		err(EXIT_FAILURE, "%s: mktime", op);
+		err(EXIT_FAILURE, "mktime");
 	}
 
 	/* if jflag is set, don't actually change the time, just return */
@@ -340,6 +360,12 @@ setthetime(const char *p)
 
 	/* set the time */
 #ifndef HAVE_NBTOOL_CONFIG_H
+	struct utmpx utx;
+	memset(, 0, sizeof(utx));
+	utx.ut_type = OLD_TIME;
+	(void)gettimeofday(_tv, NULL);
+	

CVS commit: src/share/man/man5

2022-10-21 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Oct 21 18:21:56 UTC 2022

Modified Files:
src/share/man/man5: printcap.5

Log Message:
Explain when the filters are used.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/share/man/man5/printcap.5

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/man5/printcap.5
diff -u src/share/man/man5/printcap.5:1.27 src/share/man/man5/printcap.5:1.28
--- src/share/man/man5/printcap.5:1.27	Sun Apr 22 06:18:47 2012
+++ src/share/man/man5/printcap.5	Fri Oct 21 14:21:56 2022
@@ -1,4 +1,4 @@
-.\"	$NetBSD: printcap.5,v 1.27 2012/04/22 10:18:47 wiz Exp $
+.\"	$NetBSD: printcap.5,v 1.28 2022/10/21 18:21:56 christos Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\" @(#)printcap.5	8.2 (Berkeley) 12/11/93
 .\"
-.Dd April 5, 2012
+.Dd October 21, 2022
 .Dt PRINTCAP 5
 .Os
 .Sh NAME
@@ -148,7 +148,11 @@ to process files for various printer typ
 The pipeline is not set up for remote printers specified via
 .Sy rm
 unless the local host is the same as the remote printer host
-given.
+given or
+.Xr lpd 8
+is run with the
+.Fl r
+flag.
 The filters selected depend on the flags passed to
 .Xr lpr 1 .
 The pipeline set up is:



CVS commit: src/share/man/man5

2022-10-21 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Oct 21 18:21:56 UTC 2022

Modified Files:
src/share/man/man5: printcap.5

Log Message:
Explain when the filters are used.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/share/man/man5/printcap.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/netipsec

2022-10-19 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 19 21:28:03 UTC 2022

Modified Files:
src/sys/netipsec: key.c xform_ipcomp.c

Log Message:
PR/56836: Andrew Cagney: IPv6 ESN tunneling IPcomp has corrupt header

Always always send / expect CPI in IPcomp header

Fixes kern/56836 where an IPsec interop combining compression and
ESP|AH would fail.

Since fast ipsec, the outgoing IPcomp header has contained the
compression algorithm instead of the CPI.  Adding the
SADB_X_EXT_RAWCPI flag worked around this but ...

The IPcomp's SADB was unconditionally hashed using the compression
algorithm instead of the CPI.  This meant that an incoming packet with
a valid CPI could never match its SADB.


To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/sys/netipsec/key.c
cvs rdiff -u -r1.74 -r1.75 src/sys/netipsec/xform_ipcomp.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.277 src/sys/netipsec/key.c:1.278
--- src/sys/netipsec/key.c:1.277	Tue Oct 11 05:51:47 2022
+++ src/sys/netipsec/key.c	Wed Oct 19 17:28:02 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: key.c,v 1.277 2022/10/11 09:51:47 knakahara Exp $	*/
+/*	$NetBSD: key.c,v 1.278 2022/10/19 21:28:02 christos Exp $	*/
 /*	$FreeBSD: key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.277 2022/10/11 09:51:47 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.278 2022/10/19 21:28:02 christos Exp $");
 
 /*
  * This code is referred to RFC 2367
@@ -8765,10 +8765,7 @@ key_savlut_writer_insert_head(struct sec
 	KASSERT(mutex_owned(_sad.lock));
 	KASSERT(!sav->savlut_added);
 
-	if (sav->sah->saidx.proto == IPPROTO_IPCOMP)
-		hash_key = sav->alg_comp;
-	else
-		hash_key = sav->spi;
+	hash_key = sav->spi;
 
 	hash = key_savluthash(>sah->saidx.dst.sa,
 	sav->sah->saidx.proto, hash_key, key_sad.savlutmask);

Index: src/sys/netipsec/xform_ipcomp.c
diff -u src/sys/netipsec/xform_ipcomp.c:1.74 src/sys/netipsec/xform_ipcomp.c:1.75
--- src/sys/netipsec/xform_ipcomp.c:1.74	Sun May 22 07:40:29 2022
+++ src/sys/netipsec/xform_ipcomp.c	Wed Oct 19 17:28:02 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: xform_ipcomp.c,v 1.74 2022/05/22 11:40:29 riastradh Exp $	*/
+/*	$NetBSD: xform_ipcomp.c,v 1.75 2022/10/19 21:28:02 christos Exp $	*/
 /*	$FreeBSD: xform_ipcomp.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $	*/
 /* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
 
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.74 2022/05/22 11:40:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.75 2022/10/19 21:28:02 christos Exp $");
 
 /* IP payload compression protocol (IPComp), see RFC 2393 */
 #if defined(_KERNEL_OPT)
@@ -573,10 +573,7 @@ ipcomp_output_cb(struct cryptop *crp)
 		}
 		ipcomp->comp_flags = 0;
 
-		if ((sav->flags & SADB_X_EXT_RAWCPI) == 0)
-			cpi = sav->alg_enc;
-		else
-			cpi = ntohl(sav->spi) & 0x;
+		cpi = ntohl(sav->spi) & 0x;
 		ipcomp->comp_cpi = htons(cpi);
 
 		/* Fix Next Protocol in IPv4/IPv6 header */



CVS commit: src/sys/netipsec

2022-10-19 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 19 21:28:03 UTC 2022

Modified Files:
src/sys/netipsec: key.c xform_ipcomp.c

Log Message:
PR/56836: Andrew Cagney: IPv6 ESN tunneling IPcomp has corrupt header

Always always send / expect CPI in IPcomp header

Fixes kern/56836 where an IPsec interop combining compression and
ESP|AH would fail.

Since fast ipsec, the outgoing IPcomp header has contained the
compression algorithm instead of the CPI.  Adding the
SADB_X_EXT_RAWCPI flag worked around this but ...

The IPcomp's SADB was unconditionally hashed using the compression
algorithm instead of the CPI.  This meant that an incoming packet with
a valid CPI could never match its SADB.


To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/sys/netipsec/key.c
cvs rdiff -u -r1.74 -r1.75 src/sys/netipsec/xform_ipcomp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/crypto/external/bsd/openssl/dist/apps

2022-10-19 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 19 14:23:00 UTC 2022

Modified Files:
src/crypto/external/bsd/openssl/dist/apps: openssl.cnf

Log Message:
PR/57065: sergio lenzi: remove the default_md override, since 1.1 it is sha256


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/apps/openssl.cnf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/dist/apps/openssl.cnf
diff -u src/crypto/external/bsd/openssl/dist/apps/openssl.cnf:1.8 src/crypto/external/bsd/openssl/dist/apps/openssl.cnf:1.9
--- src/crypto/external/bsd/openssl/dist/apps/openssl.cnf:1.8	Tue Mar 12 12:58:12 2019
+++ src/crypto/external/bsd/openssl/dist/apps/openssl.cnf	Wed Oct 19 10:23:00 2022
@@ -107,7 +107,6 @@ emailAddress		= optional
 [ req ]
 default_bits		= 2048
 default_keyfile 	= privkey.pem
-default_md		= sha2
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
 x509_extensions	= v3_ca	# The extensions to add to the self signed cert



CVS commit: src/crypto/external/bsd/openssl/dist/apps

2022-10-19 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 19 14:23:00 UTC 2022

Modified Files:
src/crypto/external/bsd/openssl/dist/apps: openssl.cnf

Log Message:
PR/57065: sergio lenzi: remove the default_md override, since 1.1 it is sha256


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/apps/openssl.cnf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/doc

2022-10-19 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 19 13:00:54 UTC 2022

Modified Files:
src/doc: 3RDPARTY

Log Message:
document more changes for openssh


To generate a diff of this commit:
cvs rdiff -u -r1.1894 -r1.1895 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/doc

2022-10-19 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 19 13:00:54 UTC 2022

Modified Files:
src/doc: 3RDPARTY

Log Message:
document more changes for openssh


To generate a diff of this commit:
cvs rdiff -u -r1.1894 -r1.1895 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1894 src/doc/3RDPARTY:1.1895
--- src/doc/3RDPARTY:1.1894	Wed Oct 19 07:54:35 2022
+++ src/doc/3RDPARTY	Wed Oct 19 09:00:53 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1894 2022/10/19 11:54:35 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1895 2022/10/19 13:00:53 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1096,6 +1096,7 @@ markus is very cooperative about it):
 - added USE_PAM patches and auth_pam.[ch] from portable openssh
   (see if there is any difference between the current version of opensshX.Yp1
and the new opensshZ.Wp1) and apply them.
+- added LDAP from portable openssh.
 - conditionalize login_cap
 - conditionalize bsd_auth
 - restore krb5, krb4, afs, skey
@@ -1112,6 +1113,7 @@ markus is very cooperative about it):
 - always bump major when importing to avoid api problems.
 - make compile with gcc-4.5; const fixes, fileno() checks, shadow fixes.
 - adjust the DEFAULT_PKCS11_WHITELIST for ssh-agent
+- blocklistd additions
 
 Package:	OpenSSL
 Version:	1.0.2o/1.1.1n



CVS commit: src/doc

2022-10-19 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 19 11:54:35 UTC 2022

Modified Files:
src/doc: 3RDPARTY

Log Message:
update zlib


To generate a diff of this commit:
cvs rdiff -u -r1.1893 -r1.1894 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1893 src/doc/3RDPARTY:1.1894
--- src/doc/3RDPARTY:1.1893	Sat Oct 15 14:59:31 2022
+++ src/doc/3RDPARTY	Wed Oct 19 07:54:35 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1893 2022/10/15 18:59:31 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1894 2022/10/19 11:54:35 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1457,12 +1457,12 @@ Notes:
 See /usr/src/external/bsd/wpa/NetBSD-upgrade for update instructions.
 
 Package:	zlib
-Version:	1.2.10
+Version:	1.2.13
 Current Vers:	1.2.13
 Maintainer:	Jean-loup Gailly and Mark Adler 
 Archive Site:	http://www.zlib.net/
 Home Page:	http://www.zlib.net/
-Date: 		2019-10-09
+Date: 		2022-10-15
 Mailing List:
 Responsible:	gwr, christos
 License:	BSD (3-clause)



CVS commit: src/doc

2022-10-19 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 19 11:54:35 UTC 2022

Modified Files:
src/doc: 3RDPARTY

Log Message:
update zlib


To generate a diff of this commit:
cvs rdiff -u -r1.1893 -r1.1894 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/crypto/external/bsd/openssh/dist

2022-10-19 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 19 11:54:02 UTC 2022

Modified Files:
src/crypto/external/bsd/openssh/dist: ssherr.c

Log Message:
remove debugging sleep. Pointed out by rillig.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/ssherr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/crypto/external/bsd/openssh/dist

2022-10-19 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 19 11:54:02 UTC 2022

Modified Files:
src/crypto/external/bsd/openssh/dist: ssherr.c

Log Message:
remove debugging sleep. Pointed out by rillig.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/ssherr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssh/dist/ssherr.c
diff -u src/crypto/external/bsd/openssh/dist/ssherr.c:1.9 src/crypto/external/bsd/openssh/dist/ssherr.c:1.10
--- src/crypto/external/bsd/openssh/dist/ssherr.c:1.9	Wed Feb 26 19:24:40 2020
+++ src/crypto/external/bsd/openssh/dist/ssherr.c	Wed Oct 19 07:54:02 2022
@@ -15,7 +15,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "includes.h"
-__RCSID("$NetBSD: ssherr.c,v 1.9 2020/02/27 00:24:40 christos Exp $");
+__RCSID("$NetBSD: ssherr.c,v 1.10 2022/10/19 11:54:02 christos Exp $");
 
 #include 
 #include 
@@ -154,7 +154,6 @@ ssh_err(int n)
 		{
 			static char buf[1024];
 			snprintf(buf, sizeof(buf), "unknown error %d", n);
-			sleep(1000);
 			return buf;
 		}
 	}



CVS commit: src/lib/libc/sys

2022-10-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Oct 16 20:37:03 UTC 2022

Modified Files:
src/lib/libc/sys: gettimeofday.2

Log Message:
Add EINVAL doc from Jan Schaumann


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/sys/gettimeofday.2

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/sys/gettimeofday.2
diff -u src/lib/libc/sys/gettimeofday.2:1.29 src/lib/libc/sys/gettimeofday.2:1.30
--- src/lib/libc/sys/gettimeofday.2:1.29	Wed Dec  9 03:30:03 2015
+++ src/lib/libc/sys/gettimeofday.2	Sun Oct 16 16:37:03 2022
@@ -1,4 +1,4 @@
-.\"	$NetBSD: gettimeofday.2,v 1.29 2015/12/09 08:30:03 wiz Exp $
+.\"	$NetBSD: gettimeofday.2,v 1.30 2022/10/16 20:37:03 christos Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\" @(#)gettimeofday.2	8.2 (Berkeley) 5/26/95
 .\"
-.Dd December 8, 2015
+.Dd October 16, 2022
 .Dt GETTIMEOFDAY 2
 .Os
 .Sh NAME
@@ -133,6 +133,12 @@ The following error codes may be set in
 .Bl -tag -width Er
 .It Bq Er EFAULT
 An argument address referenced invalid memory.
+.It Bq Er EINVAL
+.Fn settimeofday :
+.Ar tp.tv_sec
+is outside the range [0..2^36] or
+.Ar tp.tv_usec
+is outside the range [0..999,999].
 .It Bq Er EPERM
 A user other than the super user attempted to set the time, or the specified
 time was less than the current time, which was not permitted at the current



CVS commit: src/lib/libc/sys

2022-10-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Oct 16 20:37:03 UTC 2022

Modified Files:
src/lib/libc/sys: gettimeofday.2

Log Message:
Add EINVAL doc from Jan Schaumann


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/sys/gettimeofday.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/common/dist/zlib

2022-10-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 15 23:21:34 UTC 2022

Modified Files:
src/common/dist/zlib: zlib.h zutil.h

Log Message:
Handle standalone code.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/common/dist/zlib/zlib.h \
src/common/dist/zlib/zutil.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/common/dist/zlib/zlib.h
diff -u src/common/dist/zlib/zlib.h:1.6 src/common/dist/zlib/zlib.h:1.7
--- src/common/dist/zlib/zlib.h:1.6	Sat Oct 15 15:49:32 2022
+++ src/common/dist/zlib/zlib.h	Sat Oct 15 19:21:34 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: zlib.h,v 1.6 2022/10/15 19:49:32 christos Exp $	*/
+/*	$NetBSD: zlib.h,v 1.7 2022/10/15 23:21:34 christos Exp $	*/
 
 /* zlib.h -- interface of the 'zlib' general purpose compression library
   version 1.2.13, October 13th, 2022
@@ -1726,7 +1726,9 @@ ZEXTERN uLong ZEXPORT adler32_combine OF
negative, the result has no meaning or utility.
 */
 
+#if !defined(_KERNEL) && !defined(_STANDALONE)
 ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
+#endif
 /*
  Update a running CRC-32 with the bytes buf[0..len-1] and return the
updated CRC-32. A CRC-32 value is in the range of a 32-bit unsigned integer.
Index: src/common/dist/zlib/zutil.h
diff -u src/common/dist/zlib/zutil.h:1.6 src/common/dist/zlib/zutil.h:1.7
--- src/common/dist/zlib/zutil.h:1.6	Sat Oct 15 15:49:32 2022
+++ src/common/dist/zlib/zutil.h	Sat Oct 15 19:21:34 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: zutil.h,v 1.6 2022/10/15 19:49:32 christos Exp $	*/
+/*	$NetBSD: zutil.h,v 1.7 2022/10/15 23:21:34 christos Exp $	*/
 
 /* zutil.h -- internal interface and configuration of the compression library
  * Copyright (C) 1995-2022 Jean-loup Gailly, Mark Adler
@@ -49,6 +49,13 @@ typedef ush FAR ushf;
 typedef unsigned long  ulg;
 
 #if !defined(Z_U8) && !defined(Z_SOLO) && defined(STDC)
+# if defined(_KERNEL) || defined(_STANDALONE)
+#  ifdef _LP64
+#   define Z_U8 unsigned long
+#  else
+#   define Z_U8 unsigned long long
+#  endif
+# else
 #  include 
 #  if (ULONG_MAX == 0x)
 #define Z_U8 unsigned long
@@ -57,6 +64,7 @@ typedef unsigned long  ulg;
 #  elif (UINT_MAX == 0x)
 #define Z_U8 unsigned
 #  endif
+# endif
 #endif
 
 extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */



CVS commit: src/common/dist/zlib

2022-10-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 15 23:21:34 UTC 2022

Modified Files:
src/common/dist/zlib: zlib.h zutil.h

Log Message:
Handle standalone code.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/common/dist/zlib/zlib.h \
src/common/dist/zlib/zutil.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/doc

2022-10-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 15 19:51:04 UTC 2022

Modified Files:
src/doc: CHANGES

Log Message:
new zlib


To generate a diff of this commit:
cvs rdiff -u -r1.2920 -r1.2921 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/doc

2022-10-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 15 19:51:04 UTC 2022

Modified Files:
src/doc: CHANGES

Log Message:
new zlib


To generate a diff of this commit:
cvs rdiff -u -r1.2920 -r1.2921 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2920 src/doc/CHANGES:1.2921
--- src/doc/CHANGES:1.2920	Sat Oct 15 14:59:31 2022
+++ src/doc/CHANGES	Sat Oct 15 15:51:04 2022
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2920 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2921 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -700,3 +700,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 	ntp: Import ntp 4.2.8p15. [christos 20221009]
 	tzdata: updated to 2022e (using the 2022egtz fork) [kre 20221013]
 	tzcode: Updated to 2022e. [christos 20221015]
+	zlib(3): Import 1.2.13 [christos 20221015]



CVS commit: src/common/dist/zlib

2022-10-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 15 19:49:34 UTC 2022

Modified Files:
src/common/dist/zlib: compress.c crc32.c deflate.c deflate.h gzguts.h
gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c
uncompr.c zconf.h zlib.h zutil.c zutil.h
Removed Files:
src/common/dist/zlib/contrib/amd64: amd64-match.S
src/common/dist/zlib/contrib/asm686: README.686 match.S
src/common/dist/zlib/contrib/inflate86: inffas86.c inffast.S
src/common/dist/zlib/contrib/masmx64: bld_ml64.bat gvmat64.asm
inffas8664.c inffasx64.asm readme.txt
src/common/dist/zlib/contrib/masmx86: bld_ml32.bat inffas32.asm
match686.asm readme.txt
src/common/dist/zlib/contrib/vstudio/vc14: miniunz.vcxproj.user
minizip.vcxproj.user testzlib.vcxproj.user testzlibdll.vcxproj.user
zlibstat.vcxproj.user zlibvc.vcxproj.user

Log Message:
merge conflicts between 1.2.10 and 1.2.13


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/common/dist/zlib/compress.c \
src/common/dist/zlib/infback.c src/common/dist/zlib/inftrees.c \
src/common/dist/zlib/uncompr.c src/common/dist/zlib/zconf.h \
src/common/dist/zlib/zutil.c
cvs rdiff -u -r1.5 -r1.6 src/common/dist/zlib/crc32.c \
src/common/dist/zlib/deflate.c src/common/dist/zlib/trees.c \
src/common/dist/zlib/zlib.h src/common/dist/zlib/zutil.h
cvs rdiff -u -r1.4 -r1.5 src/common/dist/zlib/deflate.h \
src/common/dist/zlib/inffast.c
cvs rdiff -u -r1.2 -r1.3 src/common/dist/zlib/gzguts.h \
src/common/dist/zlib/gzwrite.c
cvs rdiff -u -r1.6 -r1.7 src/common/dist/zlib/inflate.c
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/contrib/amd64/amd64-match.S
cvs rdiff -u -r1.1.1.2 -r0 src/common/dist/zlib/contrib/asm686/README.686 \
src/common/dist/zlib/contrib/asm686/match.S
cvs rdiff -u -r1.1.1.2 -r0 src/common/dist/zlib/contrib/inflate86/inffas86.c
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/contrib/inflate86/inffast.S
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/contrib/masmx64/bld_ml64.bat
cvs rdiff -u -r1.1.1.2 -r0 src/common/dist/zlib/contrib/masmx64/gvmat64.asm \
src/common/dist/zlib/contrib/masmx64/inffas8664.c \
src/common/dist/zlib/contrib/masmx64/inffasx64.asm \
src/common/dist/zlib/contrib/masmx64/readme.txt
cvs rdiff -u -r1.1.1.2 -r0 src/common/dist/zlib/contrib/masmx86/bld_ml32.bat \
src/common/dist/zlib/contrib/masmx86/inffas32.asm \
src/common/dist/zlib/contrib/masmx86/readme.txt
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/contrib/masmx86/match686.asm
cvs rdiff -u -r1.1.1.1 -r0 \
src/common/dist/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user \
src/common/dist/zlib/contrib/vstudio/vc14/minizip.vcxproj.user \
src/common/dist/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user \
src/common/dist/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user \
src/common/dist/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user \
src/common/dist/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS import: src/common/dist/zlib

2022-10-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 15 19:41:20 UTC 2022

Update of /cvsroot/src/common/dist/zlib
In directory ivanova.netbsd.org:/tmp/cvs-serv15394

Log Message:
Import zlib-1.2.13, previous was 1.2.10

Changes in 1.2.13 (13 Oct 2022)
- Fix configure issue that discarded provided CC definition
- Correct incorrect inputs provided to the CRC functions
- Repair prototypes and exporting of new CRC functions
- Fix inflateBack to detect invalid input with distances too far
- Have infback() deliver all of the available output up to any error
- Fix a bug when getting a gzip header extra field with inflate()
- Fix bug in block type selection when Z_FIXED used
- Tighten deflateBound bounds
- Remove deleted assembler code references
- Various portability and appearance improvements

Changes in 1.2.12 (27 Mar 2022)
- Cygwin does not have _wopen(), so do not create gzopen_w() there
- Permit a deflateParams() parameter change as soon as possible
- Limit hash table inserts after switch from stored deflate
- Fix bug when window full in deflate_stored()
- Fix CLEAR_HASH macro to be usable as a single statement
- Avoid a conversion error in gzseek when off_t type too small
- Have Makefile return non-zero error code on test failure
- Avoid some conversion warnings in gzread.c and gzwrite.c
- Update use of errno for newer Windows CE versions
- Small speedup to inflate [psumbera]
- Return an error if the gzputs string length can't fit in an int
- Add address checking in clang to -w option of configure
- Don't compute check value for raw inflate if asked to validate
- Handle case where inflateSync used when header never processed
- Avoid the use of ptrdiff_t
- Avoid an undefined behavior of memcpy() in gzappend()
- Avoid undefined behaviors of memcpy() in gz*printf()
- Avoid an undefined behavior of memcpy() in _tr_stored_block()
- Make the names in functions declarations identical to definitions
- Remove old assembler code in which bugs have manifested
- Fix deflateEnd() to not report an error at start of raw deflate
- Add legal disclaimer to README
- Emphasize the need to continue decompressing gzip members
- Correct the initialization requirements for deflateInit2()
- Fix a bug that can crash deflate on some input when using Z_FIXED
- Assure that the number of bits for deflatePrime() is valid
- Use a structure to make globals in enough.c evident
- Use a macro for the printf format of big_t in enough.c
- Clean up code style in enough.c, update version
- Use inline function instead of macro for index in enough.c
- Clarify that prefix codes are counted in enough.c
- Show all the codes for the maximum tables size in enough.c
- Add gznorm.c example, which normalizes gzip files
- Fix the zran.c example to work on a multiple-member gzip file
- Add tables for crc32_combine(), to speed it up by a factor of 200
- Add crc32_combine_gen() and crc32_combine_op() for fast combines
- Speed up software CRC-32 computation by a factor of 1.5 to 3
- Use atomic test and set, if available, for dynamic CRC tables
- Don't bother computing check value after successful inflateSync()
- Correct comment in crc32.c
- Add use of the ARMv8 crc32 instructions when requested
- Use ARM crc32 instructions if the ARM architecture has them
- Explicitly note that the 32-bit check values are 32 bits
- Avoid adding empty gzip member after gzflush with Z_FINISH
- Fix memory leak on error in gzlog.c
- Fix error in comment on the polynomial representation of a byte
- Clarify gz* function interfaces, referring to parameter names
- Change macro name in inflate.c to avoid collision in VxWorks
- Correct typo in blast.c
- Improve portability of contrib/minizip
- Fix indentation in minizip's zip.c
- Replace black/white with allow/block. (theresa-m)
- minizip warning fix if MAXU32 already defined. (gvollant)
- Fix unztell64() in minizip to work past 4GB. (Daniël Hörchner)
- Clean up minizip to reduce warnings for testing
- Add fallthrough comments for gcc
- Eliminate use of ULL constants
- Separate out address sanitizing from warnings in configure
- Remove destructive aspects of make distclean
- Check for cc masquerading as gcc or clang in configure
- Fix crc32.c to compile local functions only if used

Changes in 1.2.11 (15 Jan 2017)
- Fix deflate stored bug when pulling last block from window
- Permit immediate deflateParams changes before any deflate input

Status:

Vendor Tag: ZLIB
Release Tags:   zlib-1-2-13

C src/common/dist/zlib/zutil.h
U src/common/dist/zlib/inftrees.h
U src/common/dist/zlib/inflate.c
U src/common/dist/zlib/CMakeLists.txt
U src/common/dist/zlib/zlib.map
U src/common/dist/zlib/zlib.pc.cmakein
U src/common/dist/zlib/LICENSE
U src/common/dist/zlib/zlib.3.pdf
U src/common/dist/zlib/configure
C src/common/dist/zlib/compress.c
U src/common/dist/zlib/zlib.3
U src/common/dist/zlib/ChangeLog
C src/common/dist/zlib/deflate.c
U src/common/dist/zlib/inffixed.h
U src/common/dist/zlib/Makefile
U 

CVS import: src/common/dist/zlib

2022-10-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 15 19:41:20 UTC 2022

Update of /cvsroot/src/common/dist/zlib
In directory ivanova.netbsd.org:/tmp/cvs-serv15394

Log Message:
Import zlib-1.2.13, previous was 1.2.10

Changes in 1.2.13 (13 Oct 2022)
- Fix configure issue that discarded provided CC definition
- Correct incorrect inputs provided to the CRC functions
- Repair prototypes and exporting of new CRC functions
- Fix inflateBack to detect invalid input with distances too far
- Have infback() deliver all of the available output up to any error
- Fix a bug when getting a gzip header extra field with inflate()
- Fix bug in block type selection when Z_FIXED used
- Tighten deflateBound bounds
- Remove deleted assembler code references
- Various portability and appearance improvements

Changes in 1.2.12 (27 Mar 2022)
- Cygwin does not have _wopen(), so do not create gzopen_w() there
- Permit a deflateParams() parameter change as soon as possible
- Limit hash table inserts after switch from stored deflate
- Fix bug when window full in deflate_stored()
- Fix CLEAR_HASH macro to be usable as a single statement
- Avoid a conversion error in gzseek when off_t type too small
- Have Makefile return non-zero error code on test failure
- Avoid some conversion warnings in gzread.c and gzwrite.c
- Update use of errno for newer Windows CE versions
- Small speedup to inflate [psumbera]
- Return an error if the gzputs string length can't fit in an int
- Add address checking in clang to -w option of configure
- Don't compute check value for raw inflate if asked to validate
- Handle case where inflateSync used when header never processed
- Avoid the use of ptrdiff_t
- Avoid an undefined behavior of memcpy() in gzappend()
- Avoid undefined behaviors of memcpy() in gz*printf()
- Avoid an undefined behavior of memcpy() in _tr_stored_block()
- Make the names in functions declarations identical to definitions
- Remove old assembler code in which bugs have manifested
- Fix deflateEnd() to not report an error at start of raw deflate
- Add legal disclaimer to README
- Emphasize the need to continue decompressing gzip members
- Correct the initialization requirements for deflateInit2()
- Fix a bug that can crash deflate on some input when using Z_FIXED
- Assure that the number of bits for deflatePrime() is valid
- Use a structure to make globals in enough.c evident
- Use a macro for the printf format of big_t in enough.c
- Clean up code style in enough.c, update version
- Use inline function instead of macro for index in enough.c
- Clarify that prefix codes are counted in enough.c
- Show all the codes for the maximum tables size in enough.c
- Add gznorm.c example, which normalizes gzip files
- Fix the zran.c example to work on a multiple-member gzip file
- Add tables for crc32_combine(), to speed it up by a factor of 200
- Add crc32_combine_gen() and crc32_combine_op() for fast combines
- Speed up software CRC-32 computation by a factor of 1.5 to 3
- Use atomic test and set, if available, for dynamic CRC tables
- Don't bother computing check value after successful inflateSync()
- Correct comment in crc32.c
- Add use of the ARMv8 crc32 instructions when requested
- Use ARM crc32 instructions if the ARM architecture has them
- Explicitly note that the 32-bit check values are 32 bits
- Avoid adding empty gzip member after gzflush with Z_FINISH
- Fix memory leak on error in gzlog.c
- Fix error in comment on the polynomial representation of a byte
- Clarify gz* function interfaces, referring to parameter names
- Change macro name in inflate.c to avoid collision in VxWorks
- Correct typo in blast.c
- Improve portability of contrib/minizip
- Fix indentation in minizip's zip.c
- Replace black/white with allow/block. (theresa-m)
- minizip warning fix if MAXU32 already defined. (gvollant)
- Fix unztell64() in minizip to work past 4GB. (Daniël Hörchner)
- Clean up minizip to reduce warnings for testing
- Add fallthrough comments for gcc
- Eliminate use of ULL constants
- Separate out address sanitizing from warnings in configure
- Remove destructive aspects of make distclean
- Check for cc masquerading as gcc or clang in configure
- Fix crc32.c to compile local functions only if used

Changes in 1.2.11 (15 Jan 2017)
- Fix deflate stored bug when pulling last block from window
- Permit immediate deflateParams changes before any deflate input

Status:

Vendor Tag: ZLIB
Release Tags:   zlib-1-2-13

C src/common/dist/zlib/zutil.h
U src/common/dist/zlib/inftrees.h
U src/common/dist/zlib/inflate.c
U src/common/dist/zlib/CMakeLists.txt
U src/common/dist/zlib/zlib.map
U src/common/dist/zlib/zlib.pc.cmakein
U src/common/dist/zlib/LICENSE
U src/common/dist/zlib/zlib.3.pdf
U src/common/dist/zlib/configure
C src/common/dist/zlib/compress.c
U src/common/dist/zlib/zlib.3
U src/common/dist/zlib/ChangeLog
C src/common/dist/zlib/deflate.c
U src/common/dist/zlib/inffixed.h
U src/common/dist/zlib/Makefile
U 

CVS import: src/common/dist/zlib

2022-10-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 15 19:38:41 UTC 2022

Update of /cvsroot/src/common/dist/zlib
In directory ivanova.netbsd.org:/tmp/cvs-serv2001

Log Message:
Import zlib-1.2.13, previous was 1.2.10

Changes in 1.2.13 (13 Oct 2022)
- Fix configure issue that discarded provided CC definition
- Correct incorrect inputs provided to the CRC functions
- Repair prototypes and exporting of new CRC functions
- Fix inflateBack to detect invalid input with distances too far
- Have infback() deliver all of the available output up to any error
- Fix a bug when getting a gzip header extra field with inflate()
- Fix bug in block type selection when Z_FIXED used
- Tighten deflateBound bounds
- Remove deleted assembler code references
- Various portability and appearance improvements

Changes in 1.2.12 (27 Mar 2022)
- Cygwin does not have _wopen(), so do not create gzopen_w() there
- Permit a deflateParams() parameter change as soon as possible
- Limit hash table inserts after switch from stored deflate
- Fix bug when window full in deflate_stored()
- Fix CLEAR_HASH macro to be usable as a single statement
- Avoid a conversion error in gzseek when off_t type too small
- Have Makefile return non-zero error code on test failure
- Avoid some conversion warnings in gzread.c and gzwrite.c
- Update use of errno for newer Windows CE versions
- Small speedup to inflate [psumbera]
- Return an error if the gzputs string length can't fit in an int
- Add address checking in clang to -w option of configure
- Don't compute check value for raw inflate if asked to validate
- Handle case where inflateSync used when header never processed
- Avoid the use of ptrdiff_t
- Avoid an undefined behavior of memcpy() in gzappend()
- Avoid undefined behaviors of memcpy() in gz*printf()
- Avoid an undefined behavior of memcpy() in _tr_stored_block()
- Make the names in functions declarations identical to definitions
- Remove old assembler code in which bugs have manifested
- Fix deflateEnd() to not report an error at start of raw deflate
- Add legal disclaimer to README
- Emphasize the need to continue decompressing gzip members
- Correct the initialization requirements for deflateInit2()
- Fix a bug that can crash deflate on some input when using Z_FIXED
- Assure that the number of bits for deflatePrime() is valid
- Use a structure to make globals in enough.c evident
- Use a macro for the printf format of big_t in enough.c
- Clean up code style in enough.c, update version
- Use inline function instead of macro for index in enough.c
- Clarify that prefix codes are counted in enough.c
- Show all the codes for the maximum tables size in enough.c
- Add gznorm.c example, which normalizes gzip files
- Fix the zran.c example to work on a multiple-member gzip file
- Add tables for crc32_combine(), to speed it up by a factor of 200
- Add crc32_combine_gen() and crc32_combine_op() for fast combines
- Speed up software CRC-32 computation by a factor of 1.5 to 3
- Use atomic test and set, if available, for dynamic CRC tables
- Don't bother computing check value after successful inflateSync()
- Correct comment in crc32.c
- Add use of the ARMv8 crc32 instructions when requested
- Use ARM crc32 instructions if the ARM architecture has them
- Explicitly note that the 32-bit check values are 32 bits
- Avoid adding empty gzip member after gzflush with Z_FINISH
- Fix memory leak on error in gzlog.c
- Fix error in comment on the polynomial representation of a byte
- Clarify gz* function interfaces, referring to parameter names
- Change macro name in inflate.c to avoid collision in VxWorks
- Correct typo in blast.c
- Improve portability of contrib/minizip
- Fix indentation in minizip's zip.c
- Replace black/white with allow/block. (theresa-m)
- minizip warning fix if MAXU32 already defined. (gvollant)
- Fix unztell64() in minizip to work past 4GB. (Daniël Hörchner)
- Clean up minizip to reduce warnings for testing
- Add fallthrough comments for gcc
- Eliminate use of ULL constants
- Separate out address sanitizing from warnings in configure
- Remove destructive aspects of make distclean
- Check for cc masquerading as gcc or clang in configure
- Fix crc32.c to compile local functions only if used

Changes in 1.2.11 (15 Jan 2017)
- Fix deflate stored bug when pulling last block from window
- Permit immediate deflateParams changes before any deflate input

Status:

Vendor Tag: ZLIB
Release Tags:   zlib-1-2-13

C src/common/dist/zlib/zutil.h
U src/common/dist/zlib/inftrees.h
C src/common/dist/zlib/inflate.c
U src/common/dist/zlib/CMakeLists.txt
U src/common/dist/zlib/zlib.map
U src/common/dist/zlib/zlib.pc.cmakein
N src/common/dist/zlib/LICENSE
U src/common/dist/zlib/zlib.3.pdf
U src/common/dist/zlib/configure
C src/common/dist/zlib/compress.c
U src/common/dist/zlib/zlib.3
U src/common/dist/zlib/ChangeLog
C src/common/dist/zlib/deflate.c
U src/common/dist/zlib/inffixed.h
U src/common/dist/zlib/Makefile
U 

CVS import: src/common/dist/zlib

2022-10-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 15 19:38:41 UTC 2022

Update of /cvsroot/src/common/dist/zlib
In directory ivanova.netbsd.org:/tmp/cvs-serv2001

Log Message:
Import zlib-1.2.13, previous was 1.2.10

Changes in 1.2.13 (13 Oct 2022)
- Fix configure issue that discarded provided CC definition
- Correct incorrect inputs provided to the CRC functions
- Repair prototypes and exporting of new CRC functions
- Fix inflateBack to detect invalid input with distances too far
- Have infback() deliver all of the available output up to any error
- Fix a bug when getting a gzip header extra field with inflate()
- Fix bug in block type selection when Z_FIXED used
- Tighten deflateBound bounds
- Remove deleted assembler code references
- Various portability and appearance improvements

Changes in 1.2.12 (27 Mar 2022)
- Cygwin does not have _wopen(), so do not create gzopen_w() there
- Permit a deflateParams() parameter change as soon as possible
- Limit hash table inserts after switch from stored deflate
- Fix bug when window full in deflate_stored()
- Fix CLEAR_HASH macro to be usable as a single statement
- Avoid a conversion error in gzseek when off_t type too small
- Have Makefile return non-zero error code on test failure
- Avoid some conversion warnings in gzread.c and gzwrite.c
- Update use of errno for newer Windows CE versions
- Small speedup to inflate [psumbera]
- Return an error if the gzputs string length can't fit in an int
- Add address checking in clang to -w option of configure
- Don't compute check value for raw inflate if asked to validate
- Handle case where inflateSync used when header never processed
- Avoid the use of ptrdiff_t
- Avoid an undefined behavior of memcpy() in gzappend()
- Avoid undefined behaviors of memcpy() in gz*printf()
- Avoid an undefined behavior of memcpy() in _tr_stored_block()
- Make the names in functions declarations identical to definitions
- Remove old assembler code in which bugs have manifested
- Fix deflateEnd() to not report an error at start of raw deflate
- Add legal disclaimer to README
- Emphasize the need to continue decompressing gzip members
- Correct the initialization requirements for deflateInit2()
- Fix a bug that can crash deflate on some input when using Z_FIXED
- Assure that the number of bits for deflatePrime() is valid
- Use a structure to make globals in enough.c evident
- Use a macro for the printf format of big_t in enough.c
- Clean up code style in enough.c, update version
- Use inline function instead of macro for index in enough.c
- Clarify that prefix codes are counted in enough.c
- Show all the codes for the maximum tables size in enough.c
- Add gznorm.c example, which normalizes gzip files
- Fix the zran.c example to work on a multiple-member gzip file
- Add tables for crc32_combine(), to speed it up by a factor of 200
- Add crc32_combine_gen() and crc32_combine_op() for fast combines
- Speed up software CRC-32 computation by a factor of 1.5 to 3
- Use atomic test and set, if available, for dynamic CRC tables
- Don't bother computing check value after successful inflateSync()
- Correct comment in crc32.c
- Add use of the ARMv8 crc32 instructions when requested
- Use ARM crc32 instructions if the ARM architecture has them
- Explicitly note that the 32-bit check values are 32 bits
- Avoid adding empty gzip member after gzflush with Z_FINISH
- Fix memory leak on error in gzlog.c
- Fix error in comment on the polynomial representation of a byte
- Clarify gz* function interfaces, referring to parameter names
- Change macro name in inflate.c to avoid collision in VxWorks
- Correct typo in blast.c
- Improve portability of contrib/minizip
- Fix indentation in minizip's zip.c
- Replace black/white with allow/block. (theresa-m)
- minizip warning fix if MAXU32 already defined. (gvollant)
- Fix unztell64() in minizip to work past 4GB. (Daniël Hörchner)
- Clean up minizip to reduce warnings for testing
- Add fallthrough comments for gcc
- Eliminate use of ULL constants
- Separate out address sanitizing from warnings in configure
- Remove destructive aspects of make distclean
- Check for cc masquerading as gcc or clang in configure
- Fix crc32.c to compile local functions only if used

Changes in 1.2.11 (15 Jan 2017)
- Fix deflate stored bug when pulling last block from window
- Permit immediate deflateParams changes before any deflate input

Status:

Vendor Tag: ZLIB
Release Tags:   zlib-1-2-13

C src/common/dist/zlib/zutil.h
U src/common/dist/zlib/inftrees.h
C src/common/dist/zlib/inflate.c
U src/common/dist/zlib/CMakeLists.txt
U src/common/dist/zlib/zlib.map
U src/common/dist/zlib/zlib.pc.cmakein
N src/common/dist/zlib/LICENSE
U src/common/dist/zlib/zlib.3.pdf
U src/common/dist/zlib/configure
C src/common/dist/zlib/compress.c
U src/common/dist/zlib/zlib.3
U src/common/dist/zlib/ChangeLog
C src/common/dist/zlib/deflate.c
U src/common/dist/zlib/inffixed.h
U src/common/dist/zlib/Makefile
U 

CVS commit: src/doc

2022-10-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 15 18:59:31 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new tzcode


To generate a diff of this commit:
cvs rdiff -u -r1.1892 -r1.1893 src/doc/3RDPARTY
cvs rdiff -u -r1.2919 -r1.2920 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1892 src/doc/3RDPARTY:1.1893
--- src/doc/3RDPARTY:1.1892	Fri Oct 14 03:44:28 2022
+++ src/doc/3RDPARTY	Sat Oct 15 14:59:31 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1892 2022/10/14 07:44:28 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1893 2022/10/15 18:59:31 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1422,14 +1422,14 @@ Location:	external/bsd/tradcpp
 Notes:
 
 Package:	tz
-Version:	tzcode2022c / tzdata2022egtz
+Version:	tzcode2022e / tzdata2022egtz
 Current Vers:	tzcode2022e / tzdata2022e
 Maintainer:	Paul Eggert 
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/
 Old Archive Site:	ftp://elsie.nci.nih.gov/pub/
 Home Page:	http://www.iana.org/time-zones
-Date:		2022-08-16
+Date:		2022-10-15
 Mailing List:	t...@iana.org
 Responsible:	kleink, christos, kre
 License:	Public domain

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2919 src/doc/CHANGES:1.2920
--- src/doc/CHANGES:1.2919	Thu Oct 13 07:27:52 2022
+++ src/doc/CHANGES	Sat Oct 15 14:59:31 2022
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2919 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2920 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -699,3 +699,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 	postfix(1): Import version 3.7.3. [christos 20221008]
 	ntp: Import ntp 4.2.8p15. [christos 20221009]
 	tzdata: updated to 2022e (using the 2022egtz fork) [kre 20221013]
+	tzcode: Updated to 2022e. [christos 20221015]



CVS commit: src/doc

2022-10-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 15 18:59:31 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new tzcode


To generate a diff of this commit:
cvs rdiff -u -r1.1892 -r1.1893 src/doc/3RDPARTY
cvs rdiff -u -r1.2919 -r1.2920 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/lib/libc/time

2022-10-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 15 18:57:37 UTC 2022

Modified Files:
src/lib/libc/time: NEWS tzselect.ksh version

Log Message:
update to 2022e; no real changes


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/lib/libc/time/NEWS
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/time/tzselect.ksh \
src/lib/libc/time/version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/time/NEWS
diff -u src/lib/libc/time/NEWS:1.37 src/lib/libc/time/NEWS:1.38
--- src/lib/libc/time/NEWS:1.37	Tue Aug 16 07:07:40 2022
+++ src/lib/libc/time/NEWS	Sat Oct 15 14:57:37 2022
@@ -1,5 +1,48 @@
 News for the tz database
 
+Release 2022e - 2022-10-11 11:13:02 -0700
+
+  Briefly:
+Jordan and Syria switch from +02/+03 with DST to year-round +03.
+
+  Changes to future timestamps
+
+Jordan and Syria are abandoning the DST regime and are changing to
+permanent +03, so they will not fall back from +03 to +02 on
+2022-10-28.  (Thanks to Steffen Thorsen and Issam Al-Zuwairi.)
+
+  Changes to past timestamps
+
+On 1922-01-01 Tijuana adopted standard time at 00:00, not 01:00.
+
+  Changes to past time zone abbreviations and DST flags
+
+The temporary advancement of clocks in central Mexico in summer
+1931 is now treated as daylight saving time, instead of as two
+changes to standard time.
+
+
+Release 2022d - 2022-09-23 12:02:57 -0700
+
+  Briefly:
+Palestine transitions are now Saturdays at 02:00.
+Simplify three Ukraine zones into one.
+
+  Changes to future timestamps
+
+Palestine now springs forward and falls back at 02:00 on the
+first Saturday on or after March 24 and October 24, respectively.
+This means 2022 falls back 10-29 at 02:00, not 10-28 at 01:00.
+(Thanks to Heba Hamad.)
+
+  Changes to past timestamps
+
+Simplify three Ukraine zones to one, since the post-1970
+differences seem to have been imaginary.  Move Europe/Uzhgorod and
+Europe/Zaporozhye to 'backzone'; backward-compatibility links
+still work, albeit with different timestamps before October 1991.
+
+
 Release 2022c - 2022-08-15 17:47:18 -0700
 
   Briefly:

Index: src/lib/libc/time/tzselect.ksh
diff -u src/lib/libc/time/tzselect.ksh:1.20 src/lib/libc/time/tzselect.ksh:1.21
--- src/lib/libc/time/tzselect.ksh:1.20	Tue Aug 16 07:07:40 2022
+++ src/lib/libc/time/tzselect.ksh	Sat Oct 15 14:57:37 2022
@@ -3,7 +3,7 @@
 # Ask the user about the time zone, and output the resulting TZ value to stdout.
 # Interact with the user via stderr and stdin.
 #
-#	$NetBSD: tzselect.ksh,v 1.20 2022/08/16 11:07:40 christos Exp $
+#	$NetBSD: tzselect.ksh,v 1.21 2022/10/15 18:57:37 christos Exp $
 #
 PKGVERSION='(tzcode) '
 TZVERSION=see_Makefile
@@ -35,6 +35,7 @@ REPORT_BUGS_TO=t...@iana.org
 #
 #	Gawk (GNU awk) 
 #	mawk 
+#	nawk 
 
 
 # Specify default values for environment variables if they are unset.
Index: src/lib/libc/time/version
diff -u src/lib/libc/time/version:1.20 src/lib/libc/time/version:1.21
--- src/lib/libc/time/version:1.20	Tue Aug 16 07:07:40 2022
+++ src/lib/libc/time/version	Sat Oct 15 14:57:37 2022
@@ -1 +1 @@
-2022c
+2022e



CVS commit: src/lib/libc/time

2022-10-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct 15 18:57:37 UTC 2022

Modified Files:
src/lib/libc/time: NEWS tzselect.ksh version

Log Message:
update to 2022e; no real changes


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/lib/libc/time/NEWS
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/time/tzselect.ksh \
src/lib/libc/time/version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/blocklist/libexec

2022-10-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 12 19:50:29 UTC 2022

Modified Files:
src/external/bsd/blocklist/libexec: blocklistd-helper

Log Message:
fix typo (jlduran)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/blocklist/libexec/blocklistd-helper

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/blocklist/libexec/blocklistd-helper
diff -u src/external/bsd/blocklist/libexec/blocklistd-helper:1.4 src/external/bsd/blocklist/libexec/blocklistd-helper:1.5
--- src/external/bsd/blocklist/libexec/blocklistd-helper:1.4	Wed Oct 12 14:34:43 2022
+++ src/external/bsd/blocklist/libexec/blocklistd-helper	Wed Oct 12 15:50:29 2022
@@ -152,7 +152,7 @@ add)
 		/sbin/pfctl -a "$2/$6" -f -
 		# insert $ip/$mask into per-protocol/port anchored table
 		/sbin/pfctl -qa "$2/$6" -t "port$6" -T add "$addr/$mask" && \
-		/sbin/pcftl -qk "$addr" && echo OK
+		/sbin/pfctl -qk "$addr" && echo OK
 		;;
 
 	esac



CVS commit: src/external/bsd/blocklist/libexec

2022-10-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 12 19:50:29 UTC 2022

Modified Files:
src/external/bsd/blocklist/libexec: blocklistd-helper

Log Message:
fix typo (jlduran)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/blocklist/libexec/blocklistd-helper

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



Re: CVS commit: src/sys

2022-10-12 Thread Christos Zoulas
In article <20221011220338.17a48f...@cvs.netbsd.org>,
Andrius Varanavicius  wrote:
>-=-=-=-=-=-
>
>Module Name:   src
>Committed By:  andvar
>Date:  Tue Oct 11 22:03:37 UTC 2022
>
>Modified Files:
>   src/sys/arch/arm/arm32: bus_dma.c
>   src/sys/arch/hppa/hppa: mainbus.c
>   src/sys/arch/vax/vax: bus_dma.c
>   src/sys/dev/pci: if_bge.c vioscsi.c
>
>Log Message:
>fix typos in log messages s/bus_dmamem_create/bus_dmamap_create/ and
>s/bus_dmamem_load/bus_dmamap_load/.
>Inspired by recent similar fixes in OpenBSD.

Yes, but we have __func__ now :-)

christos



CVS commit: src/external/bsd/blocklist/bin

2022-10-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 12 18:36:02 UTC 2022

Modified Files:
src/external/bsd/blocklist/bin: blocklistd.c

Log Message:
fix logging function which should have used function pointer (jlduran at github)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/blocklist/bin/blocklistd.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/blocklist/bin/blocklistd.c
diff -u src/external/bsd/blocklist/bin/blocklistd.c:1.2 src/external/bsd/blocklist/bin/blocklistd.c:1.3
--- src/external/bsd/blocklist/bin/blocklistd.c:1.2	Sat Jun 11 15:15:58 2022
+++ src/external/bsd/blocklist/bin/blocklistd.c	Wed Oct 12 14:36:02 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: blocklistd.c,v 1.2 2022/06/11 19:15:58 christos Exp $	*/
+/*	$NetBSD: blocklistd.c,v 1.3 2022/10/12 18:36:02 christos Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "config.h"
 #endif
 #include 
-__RCSID("$NetBSD: blocklistd.c,v 1.2 2022/06/11 19:15:58 christos Exp $");
+__RCSID("$NetBSD: blocklistd.c,v 1.3 2022/10/12 18:36:02 christos Exp $");
 
 #include 
 #include 
@@ -322,7 +322,7 @@ again:
 		if (dbi.id[0]) {
 			run_change("rem", , dbi.id, 0);
 			sockaddr_snprintf(buf, sizeof(buf), "%a", ss);
-			syslog(LOG_INFO, "released %s/%d:%d after %d seconds",
+			(*lfun)(LOG_INFO, "released %s/%d:%d after %d seconds",
 			buf, c.c_lmask, c.c_port, c.c_duration);
 		}
 		state_del(state, );



CVS commit: src/external/bsd/blocklist/bin

2022-10-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 12 18:36:02 UTC 2022

Modified Files:
src/external/bsd/blocklist/bin: blocklistd.c

Log Message:
fix logging function which should have used function pointer (jlduran at github)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/blocklist/bin/blocklistd.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/blocklist/libexec

2022-10-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 12 18:34:43 UTC 2022

Modified Files:
src/external/bsd/blocklist/libexec: blocklistd-helper

Log Message:
>From pjuran at github:
- Be quiet
- Kill active tcp connections from the blocked address
- Fix purge operation for pf, which must dynamically determine which filters
  have been created, so the filters can be flushed by name.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/blocklist/libexec/blocklistd-helper

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/blocklist/libexec/blocklistd-helper
diff -u src/external/bsd/blocklist/libexec/blocklistd-helper:1.3 src/external/bsd/blocklist/libexec/blocklistd-helper:1.4
--- src/external/bsd/blocklist/libexec/blocklistd-helper:1.3	Mon Mar  8 16:48:22 2021
+++ src/external/bsd/blocklist/libexec/blocklistd-helper	Wed Oct 12 14:34:43 2022
@@ -151,8 +151,8 @@ add)
 		echo "block in quick $proto from  to any $port" | \
 		/sbin/pfctl -a "$2/$6" -f -
 		# insert $ip/$mask into per-protocol/port anchored table
-		/sbin/pfctl -a "$2/$6" -t "port$6" -T add "$addr/$mask" && \
-		echo OK
+		/sbin/pfctl -qa "$2/$6" -t "port$6" -T add "$addr/$mask" && \
+		/sbin/pcftl -qk "$addr" && echo OK
 		;;
 
 	esac
@@ -184,7 +184,7 @@ rem)
 		;;
 
 	pf)
-		/sbin/pfctl -a "$2/$6" -t "port$6" -T delete "$addr/$mask" && \
+		/sbin/pfctl -qa "$2/$6" -t "port$6" -T delete "$addr/$mask" && \
 		echo OK
 		;;
 
@@ -224,7 +224,12 @@ flush)
 		;;
 
 	pf)
-		/sbin/pfctl -a "$2/$6" -t "port$6" -T flush && echo OK
+		# dynamically determine which anchors exist
+		for anchor in $(/sbin/pfctl -a "$2" -s Anchors); do
+		   /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush
+		   /sbin/pfctl -a "$anchor" -F rules
+		done
+		echo OK
 		;;
 	esac
 	;;



CVS commit: src/external/bsd/blocklist/libexec

2022-10-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 12 18:34:43 UTC 2022

Modified Files:
src/external/bsd/blocklist/libexec: blocklistd-helper

Log Message:
>From pjuran at github:
- Be quiet
- Kill active tcp connections from the blocked address
- Fix purge operation for pf, which must dynamically determine which filters
  have been created, so the filters can be flushed by name.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/blocklist/libexec/blocklistd-helper

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/doc

2022-10-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Oct  9 21:43:46 UTC 2022

Modified Files:
src/doc: 3RDPARTY

Log Message:
new ntp


To generate a diff of this commit:
cvs rdiff -u -r1.1886 -r1.1887 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1886 src/doc/3RDPARTY:1.1887
--- src/doc/3RDPARTY:1.1886	Sat Oct  8 12:31:30 2022
+++ src/doc/3RDPARTY	Sun Oct  9 17:43:46 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1886 2022/10/08 16:31:30 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1887 2022/10/09 21:43:46 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -990,12 +990,12 @@ and ndbootd-raw.c.  Restore saved config
 HAVE_STRICT_ALIGNMENT.  Fix RCS IDs, import.
 
 Package:	ntp
-Version:	4.2.8p14
-Current Vers:	4.2.8p14
+Version:	4.2.8p15
+Current Vers:	4.2.8p15
 Maintainer:	David L. Mills 
 Archive Site:	http://www.ntp.org/
 Home Page:	http://www.ntp.org/, http://support.ntp.org/
-Date:		2021-03-01
+Date:		2022-10-09
 Mailing List:
 Responsible:	simonb, jonathan, kardel
 License:	BSD-like



CVS commit: src/doc

2022-10-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Oct  9 21:43:46 UTC 2022

Modified Files:
src/doc: 3RDPARTY

Log Message:
new ntp


To generate a diff of this commit:
cvs rdiff -u -r1.1886 -r1.1887 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/doc

2022-10-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Oct  9 21:43:38 UTC 2022

Modified Files:
src/doc: CHANGES

Log Message:
new ntp


To generate a diff of this commit:
cvs rdiff -u -r1.2916 -r1.2917 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/doc

2022-10-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Oct  9 21:43:38 UTC 2022

Modified Files:
src/doc: CHANGES

Log Message:
new ntp


To generate a diff of this commit:
cvs rdiff -u -r1.2916 -r1.2917 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2916 src/doc/CHANGES:1.2917
--- src/doc/CHANGES:1.2916	Sat Oct  8 12:31:30 2022
+++ src/doc/CHANGES	Sun Oct  9 17:43:38 2022
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2916 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2917 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -696,3 +696,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 	dhcp: Patch to version 4.4.3-P1. [christos 20221005]
 	OpenSSH: Import 9.1. [christos 20221005]
 	postfix(1): Import version 3.7.3. [christos 20221008]
+	ntp: Import ntp 4.2.8p15. [christos 20221009]



CVS commit: src/external/bsd/ntp

2022-10-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Oct  9 21:41:05 UTC 2022

Modified Files:
src/external/bsd/ntp: importdate ntp2netbsd
src/external/bsd/ntp/dist: configure.ac
src/external/bsd/ntp/dist/include: l_stdlib.h ntp.h ntp_config.h
recvbuff.h
src/external/bsd/ntp/dist/lib/isc/win32/include/isc: int.h
src/external/bsd/ntp/dist/libntp: a_md5encrypt.c decodenetnum.c
recvbuff.c strdup.c timexsup.c
src/external/bsd/ntp/dist/ntpd: ntp_config.c ntp_io.c ntp_proto.c
ntp_refclock.c ntp_request.c ntp_timer.c ntpd-opts.c ntpd-opts.h
refclock_jjy.c refclock_nmea.c refclock_palisade.c refclock_parse.c
src/external/bsd/ntp/dist/ntpdate: ntpdate.c
src/external/bsd/ntp/dist/ntpdc: ntpdc-opts.c ntpdc-opts.h
src/external/bsd/ntp/dist/ntpq: ntpq-opts.c ntpq-opts.h
src/external/bsd/ntp/dist/ntpsnmpd: ntpsnmpd-opts.c ntpsnmpd-opts.h
src/external/bsd/ntp/dist/sntp: crypto.c sntp-opts.c sntp-opts.h
version.c
src/external/bsd/ntp/dist/tests/libntp: decodenetnum.c netof.c
recvbuff.c run-decodenetnum.c sockaddrtest.c
src/external/bsd/ntp/dist/util: ntp-keygen-opts.c ntp-keygen-opts.h
src/external/bsd/ntp/include: config.h
src/external/bsd/ntp/scripts: mkver

Log Message:
merge conflicts between ntp-4.2.8p1{4,5}


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/importdate
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/ntp2netbsd
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/configure.ac
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/include/l_stdlib.h
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/include/ntp.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/include/ntp_config.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/include/recvbuff.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/ntp/dist/lib/isc/win32/include/isc/int.h
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/libntp/a_md5encrypt.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/libntp/decodenetnum.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/libntp/recvbuff.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/libntp/strdup.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/libntp/timexsup.c
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/ntp/dist/ntpd/ntp_config.c
cvs rdiff -u -r1.31 -r1.32 src/external/bsd/ntp/dist/ntpd/ntp_io.c
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/ntp/dist/ntpd/ntp_proto.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpd/ntp_refclock.c \
src/external/bsd/ntp/dist/ntpd/ntpd-opts.c \
src/external/bsd/ntp/dist/ntpd/refclock_nmea.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/ntp/dist/ntpd/ntp_request.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/ntpd/ntp_timer.c
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/ntp/dist/ntpd/ntpd-opts.h
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/dist/ntpd/refclock_jjy.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/ntpd/refclock_palisade.c
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/ntp/dist/ntpd/refclock_parse.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/dist/ntpdate/ntpdate.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c \
src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpq/ntpq-opts.c \
src/external/bsd/ntp/dist/ntpq/ntpq-opts.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c \
src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/ntp/dist/sntp/crypto.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/dist/sntp/sntp-opts.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/sntp/sntp-opts.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/sntp/version.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/ntp/dist/tests/libntp/decodenetnum.c \
src/external/bsd/ntp/dist/tests/libntp/netof.c \
src/external/bsd/ntp/dist/tests/libntp/recvbuff.c \
src/external/bsd/ntp/dist/tests/libntp/sockaddrtest.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/ntp/dist/tests/libntp/run-decodenetnum.c
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/ntp/dist/util/ntp-keygen-opts.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/util/ntp-keygen-opts.h
cvs rdiff -u -r1.26 -r1.27 src/external/bsd/ntp/include/config.h
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/scripts/mkver

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/importdate
diff -u src/external/bsd/ntp/importdate:1.15 src/external/bsd/ntp/importdate:1.16
--- src/external/bsd/ntp/importdate:1.15	Mon May 25 16:47:18 2020
+++ src/external/bsd/ntp/importdate	Sun Oct  9 17:41:03 2022
@@ -1 +1 @@
-Mon May 25 15:53:34 EDT 2020 (import)
+Sun Oct  9 17:37:20 EDT 2022 (import)

Index: 

CVS commit: src/external/bsd/ntp

2022-10-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Oct  9 21:41:05 UTC 2022

Modified Files:
src/external/bsd/ntp: importdate ntp2netbsd
src/external/bsd/ntp/dist: configure.ac
src/external/bsd/ntp/dist/include: l_stdlib.h ntp.h ntp_config.h
recvbuff.h
src/external/bsd/ntp/dist/lib/isc/win32/include/isc: int.h
src/external/bsd/ntp/dist/libntp: a_md5encrypt.c decodenetnum.c
recvbuff.c strdup.c timexsup.c
src/external/bsd/ntp/dist/ntpd: ntp_config.c ntp_io.c ntp_proto.c
ntp_refclock.c ntp_request.c ntp_timer.c ntpd-opts.c ntpd-opts.h
refclock_jjy.c refclock_nmea.c refclock_palisade.c refclock_parse.c
src/external/bsd/ntp/dist/ntpdate: ntpdate.c
src/external/bsd/ntp/dist/ntpdc: ntpdc-opts.c ntpdc-opts.h
src/external/bsd/ntp/dist/ntpq: ntpq-opts.c ntpq-opts.h
src/external/bsd/ntp/dist/ntpsnmpd: ntpsnmpd-opts.c ntpsnmpd-opts.h
src/external/bsd/ntp/dist/sntp: crypto.c sntp-opts.c sntp-opts.h
version.c
src/external/bsd/ntp/dist/tests/libntp: decodenetnum.c netof.c
recvbuff.c run-decodenetnum.c sockaddrtest.c
src/external/bsd/ntp/dist/util: ntp-keygen-opts.c ntp-keygen-opts.h
src/external/bsd/ntp/include: config.h
src/external/bsd/ntp/scripts: mkver

Log Message:
merge conflicts between ntp-4.2.8p1{4,5}


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/importdate
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/ntp2netbsd
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/configure.ac
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/include/l_stdlib.h
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/include/ntp.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/include/ntp_config.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/include/recvbuff.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/ntp/dist/lib/isc/win32/include/isc/int.h
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/libntp/a_md5encrypt.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/libntp/decodenetnum.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/libntp/recvbuff.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/libntp/strdup.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/libntp/timexsup.c
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/ntp/dist/ntpd/ntp_config.c
cvs rdiff -u -r1.31 -r1.32 src/external/bsd/ntp/dist/ntpd/ntp_io.c
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/ntp/dist/ntpd/ntp_proto.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpd/ntp_refclock.c \
src/external/bsd/ntp/dist/ntpd/ntpd-opts.c \
src/external/bsd/ntp/dist/ntpd/refclock_nmea.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/ntp/dist/ntpd/ntp_request.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/ntpd/ntp_timer.c
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/ntp/dist/ntpd/ntpd-opts.h
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/dist/ntpd/refclock_jjy.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/ntpd/refclock_palisade.c
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/ntp/dist/ntpd/refclock_parse.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/dist/ntpdate/ntpdate.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c \
src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpq/ntpq-opts.c \
src/external/bsd/ntp/dist/ntpq/ntpq-opts.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c \
src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/ntp/dist/sntp/crypto.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/dist/sntp/sntp-opts.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/sntp/sntp-opts.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/sntp/version.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/ntp/dist/tests/libntp/decodenetnum.c \
src/external/bsd/ntp/dist/tests/libntp/netof.c \
src/external/bsd/ntp/dist/tests/libntp/recvbuff.c \
src/external/bsd/ntp/dist/tests/libntp/sockaddrtest.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/ntp/dist/tests/libntp/run-decodenetnum.c
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/ntp/dist/util/ntp-keygen-opts.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/util/ntp-keygen-opts.h
cvs rdiff -u -r1.26 -r1.27 src/external/bsd/ntp/include/config.h
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/scripts/mkver

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS import: src/external/bsd/ntp/dist

2022-10-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Oct  9 21:00:46 UTC 2022

Update of /cvsroot/src/external/bsd/ntp/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv1675

Log Message:
(4.2.8p15) 2020/06/23 Released by Harlan Stenn 

* [Sec 3661] memory leak with AES128CMAC keys 
* [Bug 3670] Regression from bad merge of 3592 and 3596 
  - fixed a bad merge that happened before 4.2.8-p14. Thanks to
Sylar Tao for noticing this!
* [Bug 3667] decodenetnum fails with numeric port 
  - rewrite 'decodenetnum()' in terms of inet_pton
* [Bug 3666] avoid unlimited receive buffer allocation 
  - limit number of receive buffers, with an iron reserve for refclocks
* [Bug 3664] Enable openSSL CMAC support on Windows 
* [Bug 3662] Fix build errors on Windows with VS2008 
* [Bug 3660] Manycast orphan mode startup discovery problem. 
  - integrated patch from Charles Claggett
* [Bug 3659] Move definition of psl[] from ntp_config.h to
  ntp_config.h 
* [Bug 3657] Wrong "Autokey group mismatch" debug message 
* [Bug 3655] ntpdc memstats hash counts 
  - fix by Gerry garvey
* [Bug 3653] Refclock jitter RMS calculation 
  - thanks to Gerry Garvey
* [Bug 3646] Avoid sync with unsync orphan 
  - patch by Gerry Garvey
* [Bug 3644] Unsynchronized server [...] selected as candidate 

* [Bug 3639] refclock_jjy: TS-JJY0x can skip time sync depending on the STUS 
reply. 
  - applied patch by Takao Abe

Status:

Vendor Tag: UDEL
Release Tags:   ntp-4-2-8p15

U src/external/bsd/ntp/dist/CommitLog-4.1.0
U src/external/bsd/ntp/dist/COPYRIGHT
U src/external/bsd/ntp/dist/ChangeLog
U src/external/bsd/ntp/dist/CommitLog
U src/external/bsd/ntp/dist/Makefile.am
U src/external/bsd/ntp/dist/INSTALL
U src/external/bsd/ntp/dist/NOTES.y2kfixes
U src/external/bsd/ntp/dist/Makefile.in
U src/external/bsd/ntp/dist/NEWS
U src/external/bsd/ntp/dist/README.bk
U src/external/bsd/ntp/dist/README
U src/external/bsd/ntp/dist/README.pullrequests
U src/external/bsd/ntp/dist/README.hackers
U src/external/bsd/ntp/dist/README.leapsmear
U src/external/bsd/ntp/dist/README.patches
U src/external/bsd/ntp/dist/README.refclocks
U src/external/bsd/ntp/dist/README.versions
U src/external/bsd/ntp/dist/TODO
U src/external/bsd/ntp/dist/WHERE-TO-START
U src/external/bsd/ntp/dist/aclocal.m4
U src/external/bsd/ntp/dist/bincheck.mf
U src/external/bsd/ntp/dist/bootstrap
U src/external/bsd/ntp/dist/build
U src/external/bsd/ntp/dist/check-libopts.mf
U src/external/bsd/ntp/dist/config.h.in
U src/external/bsd/ntp/dist/configure
C src/external/bsd/ntp/dist/configure.ac
U src/external/bsd/ntp/dist/deps-ver
U src/external/bsd/ntp/dist/depsver.mf
U src/external/bsd/ntp/dist/dot.emacs
U src/external/bsd/ntp/dist/flock-build
U src/external/bsd/ntp/dist/packageinfo.sh
U src/external/bsd/ntp/dist/includes.mf
U src/external/bsd/ntp/dist/readme.y2kfixes
U src/external/bsd/ntp/dist/results.y2kfixes
U src/external/bsd/ntp/dist/adjtimed/adjtimed.c
U src/external/bsd/ntp/dist/adjtimed/Makefile.am
U src/external/bsd/ntp/dist/adjtimed/Makefile.in
U src/external/bsd/ntp/dist/adjtimed/README
U src/external/bsd/ntp/dist/clockstuff/chutest.c
U src/external/bsd/ntp/dist/clockstuff/Makefile.am
U src/external/bsd/ntp/dist/clockstuff/Makefile.in
U src/external/bsd/ntp/dist/clockstuff/README
U src/external/bsd/ntp/dist/clockstuff/propdelay.c
U src/external/bsd/ntp/dist/lib/isc/app_api.c
U src/external/bsd/ntp/dist/lib/isc/Atffile
U src/external/bsd/ntp/dist/lib/isc/api
U src/external/bsd/ntp/dist/lib/isc/assertions.c
U src/external/bsd/ntp/dist/lib/isc/backtrace-emptytbl.c
U src/external/bsd/ntp/dist/lib/isc/backtrace.c
U src/external/bsd/ntp/dist/lib/isc/base32.c
U src/external/bsd/ntp/dist/lib/isc/base64.c
U src/external/bsd/ntp/dist/lib/isc/bitstring.c
U src/external/bsd/ntp/dist/lib/isc/buffer.c
U src/external/bsd/ntp/dist/lib/isc/bufferlist.c
U src/external/bsd/ntp/dist/lib/isc/commandline.c
U src/external/bsd/ntp/dist/lib/isc/entropy.c
U src/external/bsd/ntp/dist/lib/isc/error.c
U src/external/bsd/ntp/dist/lib/isc/event.c
U src/external/bsd/ntp/dist/lib/isc/fsaccess.c
U src/external/bsd/ntp/dist/lib/isc/hash.c
U src/external/bsd/ntp/dist/lib/isc/heap.c
U src/external/bsd/ntp/dist/lib/isc/hex.c
U src/external/bsd/ntp/dist/lib/isc/hmacmd5.c
U src/external/bsd/ntp/dist/lib/isc/hmacsha.c
U src/external/bsd/ntp/dist/lib/isc/httpd.c
U src/external/bsd/ntp/dist/lib/isc/inet_aton.c
U src/external/bsd/ntp/dist/lib/isc/inet_ntop.c
U src/external/bsd/ntp/dist/lib/isc/inet_pton.c
U src/external/bsd/ntp/dist/lib/isc/iterated_hash.c
U src/external/bsd/ntp/dist/lib/isc/lex.c
U src/external/bsd/ntp/dist/lib/isc/lfsr.c
U src/external/bsd/ntp/dist/lib/isc/lib.c
U src/external/bsd/ntp/dist/lib/isc/log.c
U src/external/bsd/ntp/dist/lib/isc/md5.c
U src/external/bsd/ntp/dist/lib/isc/mem.c
U src/external/bsd/ntp/dist/lib/isc/mem_api.c
U src/external/bsd/ntp/dist/lib/isc/mutexblock.c
U src/external/bsd/ntp/dist/lib/isc/netaddr.c
U src/external/bsd/ntp/dist/lib/isc/netscope.c
U 

CVS import: src/external/bsd/ntp/dist

2022-10-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Oct  9 21:00:46 UTC 2022

Update of /cvsroot/src/external/bsd/ntp/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv1675

Log Message:
(4.2.8p15) 2020/06/23 Released by Harlan Stenn 

* [Sec 3661] memory leak with AES128CMAC keys 
* [Bug 3670] Regression from bad merge of 3592 and 3596 
  - fixed a bad merge that happened before 4.2.8-p14. Thanks to
Sylar Tao for noticing this!
* [Bug 3667] decodenetnum fails with numeric port 
  - rewrite 'decodenetnum()' in terms of inet_pton
* [Bug 3666] avoid unlimited receive buffer allocation 
  - limit number of receive buffers, with an iron reserve for refclocks
* [Bug 3664] Enable openSSL CMAC support on Windows 
* [Bug 3662] Fix build errors on Windows with VS2008 
* [Bug 3660] Manycast orphan mode startup discovery problem. 
  - integrated patch from Charles Claggett
* [Bug 3659] Move definition of psl[] from ntp_config.h to
  ntp_config.h 
* [Bug 3657] Wrong "Autokey group mismatch" debug message 
* [Bug 3655] ntpdc memstats hash counts 
  - fix by Gerry garvey
* [Bug 3653] Refclock jitter RMS calculation 
  - thanks to Gerry Garvey
* [Bug 3646] Avoid sync with unsync orphan 
  - patch by Gerry Garvey
* [Bug 3644] Unsynchronized server [...] selected as candidate 

* [Bug 3639] refclock_jjy: TS-JJY0x can skip time sync depending on the STUS 
reply. 
  - applied patch by Takao Abe

Status:

Vendor Tag: UDEL
Release Tags:   ntp-4-2-8p15

U src/external/bsd/ntp/dist/CommitLog-4.1.0
U src/external/bsd/ntp/dist/COPYRIGHT
U src/external/bsd/ntp/dist/ChangeLog
U src/external/bsd/ntp/dist/CommitLog
U src/external/bsd/ntp/dist/Makefile.am
U src/external/bsd/ntp/dist/INSTALL
U src/external/bsd/ntp/dist/NOTES.y2kfixes
U src/external/bsd/ntp/dist/Makefile.in
U src/external/bsd/ntp/dist/NEWS
U src/external/bsd/ntp/dist/README.bk
U src/external/bsd/ntp/dist/README
U src/external/bsd/ntp/dist/README.pullrequests
U src/external/bsd/ntp/dist/README.hackers
U src/external/bsd/ntp/dist/README.leapsmear
U src/external/bsd/ntp/dist/README.patches
U src/external/bsd/ntp/dist/README.refclocks
U src/external/bsd/ntp/dist/README.versions
U src/external/bsd/ntp/dist/TODO
U src/external/bsd/ntp/dist/WHERE-TO-START
U src/external/bsd/ntp/dist/aclocal.m4
U src/external/bsd/ntp/dist/bincheck.mf
U src/external/bsd/ntp/dist/bootstrap
U src/external/bsd/ntp/dist/build
U src/external/bsd/ntp/dist/check-libopts.mf
U src/external/bsd/ntp/dist/config.h.in
U src/external/bsd/ntp/dist/configure
C src/external/bsd/ntp/dist/configure.ac
U src/external/bsd/ntp/dist/deps-ver
U src/external/bsd/ntp/dist/depsver.mf
U src/external/bsd/ntp/dist/dot.emacs
U src/external/bsd/ntp/dist/flock-build
U src/external/bsd/ntp/dist/packageinfo.sh
U src/external/bsd/ntp/dist/includes.mf
U src/external/bsd/ntp/dist/readme.y2kfixes
U src/external/bsd/ntp/dist/results.y2kfixes
U src/external/bsd/ntp/dist/adjtimed/adjtimed.c
U src/external/bsd/ntp/dist/adjtimed/Makefile.am
U src/external/bsd/ntp/dist/adjtimed/Makefile.in
U src/external/bsd/ntp/dist/adjtimed/README
U src/external/bsd/ntp/dist/clockstuff/chutest.c
U src/external/bsd/ntp/dist/clockstuff/Makefile.am
U src/external/bsd/ntp/dist/clockstuff/Makefile.in
U src/external/bsd/ntp/dist/clockstuff/README
U src/external/bsd/ntp/dist/clockstuff/propdelay.c
U src/external/bsd/ntp/dist/lib/isc/app_api.c
U src/external/bsd/ntp/dist/lib/isc/Atffile
U src/external/bsd/ntp/dist/lib/isc/api
U src/external/bsd/ntp/dist/lib/isc/assertions.c
U src/external/bsd/ntp/dist/lib/isc/backtrace-emptytbl.c
U src/external/bsd/ntp/dist/lib/isc/backtrace.c
U src/external/bsd/ntp/dist/lib/isc/base32.c
U src/external/bsd/ntp/dist/lib/isc/base64.c
U src/external/bsd/ntp/dist/lib/isc/bitstring.c
U src/external/bsd/ntp/dist/lib/isc/buffer.c
U src/external/bsd/ntp/dist/lib/isc/bufferlist.c
U src/external/bsd/ntp/dist/lib/isc/commandline.c
U src/external/bsd/ntp/dist/lib/isc/entropy.c
U src/external/bsd/ntp/dist/lib/isc/error.c
U src/external/bsd/ntp/dist/lib/isc/event.c
U src/external/bsd/ntp/dist/lib/isc/fsaccess.c
U src/external/bsd/ntp/dist/lib/isc/hash.c
U src/external/bsd/ntp/dist/lib/isc/heap.c
U src/external/bsd/ntp/dist/lib/isc/hex.c
U src/external/bsd/ntp/dist/lib/isc/hmacmd5.c
U src/external/bsd/ntp/dist/lib/isc/hmacsha.c
U src/external/bsd/ntp/dist/lib/isc/httpd.c
U src/external/bsd/ntp/dist/lib/isc/inet_aton.c
U src/external/bsd/ntp/dist/lib/isc/inet_ntop.c
U src/external/bsd/ntp/dist/lib/isc/inet_pton.c
U src/external/bsd/ntp/dist/lib/isc/iterated_hash.c
U src/external/bsd/ntp/dist/lib/isc/lex.c
U src/external/bsd/ntp/dist/lib/isc/lfsr.c
U src/external/bsd/ntp/dist/lib/isc/lib.c
U src/external/bsd/ntp/dist/lib/isc/log.c
U src/external/bsd/ntp/dist/lib/isc/md5.c
U src/external/bsd/ntp/dist/lib/isc/mem.c
U src/external/bsd/ntp/dist/lib/isc/mem_api.c
U src/external/bsd/ntp/dist/lib/isc/mutexblock.c
U src/external/bsd/ntp/dist/lib/isc/netaddr.c
U src/external/bsd/ntp/dist/lib/isc/netscope.c
U 

CVS commit: src/doc

2022-10-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct  8 16:31:30 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new postfix


To generate a diff of this commit:
cvs rdiff -u -r1.1885 -r1.1886 src/doc/3RDPARTY
cvs rdiff -u -r1.2915 -r1.2916 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1885 src/doc/3RDPARTY:1.1886
--- src/doc/3RDPARTY:1.1885	Wed Oct  5 18:51:37 2022
+++ src/doc/3RDPARTY	Sat Oct  8 12:31:30 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1885 2022/10/05 22:51:37 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1886 2022/10/08 16:31:30 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1222,12 +1222,12 @@ and more. Vern's ping is gone. We are to
 now to do a new import.
 
 Package:	Postfix
-Version:	3.5.9
-Current Vers:	3.6.4
+Version:	3.7.3
+Current Vers:	3.7.3
 Maintainer:	Wietse Venema 
 Archive Site:
 Home Page:	http://www.postfix.org/
-Date: 		2021-03-01
+Date: 		2022-10-08
 Mailing List:	postfix-us...@postfix.org
 Responsible:	christos
 License:	IBM Public License. See also src/external/ibm-public/postfix/dist.

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2915 src/doc/CHANGES:1.2916
--- src/doc/CHANGES:1.2915	Wed Oct  5 18:51:37 2022
+++ src/doc/CHANGES	Sat Oct  8 12:31:30 2022
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2915 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2916 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -695,3 +695,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 	tzdata: updated to 2022d (using the 2022dgtz fork) [kre 20220928]
 	dhcp: Patch to version 4.4.3-P1. [christos 20221005]
 	OpenSSH: Import 9.1. [christos 20221005]
+	postfix(1): Import version 3.7.3. [christos 20221008]



CVS commit: src/doc

2022-10-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct  8 16:31:30 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new postfix


To generate a diff of this commit:
cvs rdiff -u -r1.1885 -r1.1886 src/doc/3RDPARTY
cvs rdiff -u -r1.2915 -r1.2916 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/ibm-public/postfix

2022-10-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct  8 16:12:51 UTC 2022

Modified Files:
src/external/ibm-public/postfix/dist: makedefs postfix-install
src/external/ibm-public/postfix/dist/README_FILES:
ADDRESS_VERIFICATION_README INSTALL TLS_README
src/external/ibm-public/postfix/dist/conf: main.cf master.cf
post-install postfix-files postfix-tls-script postmulti-script
src/external/ibm-public/postfix/dist/html:
ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html
postconf.5.html
src/external/ibm-public/postfix/dist/man/man1: makedefs.1 postalias.1
postcat.1 postconf.1 postdrop.1 postfix.1 postlog.1 postmap.1
postmulti.1 postqueue.1 postsuper.1 posttls-finger.1 sendmail.1
smtp-sink.1
src/external/ibm-public/postfix/dist/man/man5: access.5 aliases.5
canonical.5 cidr_table.5 generic.5 ldap_table.5 lmdb_table.5
master.5 mysql_table.5 pcre_table.5 pgsql_table.5 postconf.5
regexp_table.5 relocated.5 sqlite_table.5 transport.5 virtual.5
src/external/ibm-public/postfix/dist/man/man8: bounce.8 cleanup.8
dnsblog.8 local.8 master.8 pipe.8 postlogd.8 postscreen.8 qmqpd.8
smtp.8 smtpd.8 spawn.8 tlsproxy.8 trivial-rewrite.8 verify.8
virtual.8
src/external/ibm-public/postfix/dist/mantools: comment.c
src/external/ibm-public/postfix/dist/proto:
ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html
postconf.proto
src/external/ibm-public/postfix/dist/src/anvil: anvil.c
src/external/ibm-public/postfix/dist/src/bounce: bounce.c
bounce_notify_util.c bounce_notify_util_tester.c bounce_service.h
bounce_template.c bounce_template.h bounce_templates.c
src/external/ibm-public/postfix/dist/src/cleanup: cleanup.c cleanup.h
cleanup_api.c cleanup_body_edit.c cleanup_init.c cleanup_message.c
cleanup_milter.c cleanup_out.c cleanup_out_recipient.c
cleanup_state.c
src/external/ibm-public/postfix/dist/src/dns: dns.h dns_lookup.c
dns_sec.c test_dns_lookup.c
src/external/ibm-public/postfix/dist/src/dnsblog: dnsblog.c
src/external/ibm-public/postfix/dist/src/flush: flush.c
src/external/ibm-public/postfix/dist/src/global: abounce.c anvil_clnt.c
been_here.c been_here.h bounce.c cleanup_strerror.c cleanup_user.h
clnt_stream.c clnt_stream.h compat_level.c compat_level.h
config_known_tcp_ports.c config_known_tcp_ports.h db_common.c
debug_peer.c defer.c deliver_pass.c deliver_request.c
delivered_hdr.c dict_ldap.c dict_proxy.c dict_sqlite.c dsb_scan.c
dsb_scan.h dsn_print.c dsn_print.h dynamicmaps.c flush_clnt.c
haproxy_srvr.c hfrom_format.c hfrom_format.h login_sender_match.c
login_sender_match.h mail_addr_find.c mail_command_client.c
mail_conf_time.c mail_copy.c mail_params.c mail_params.h
mail_proto.h mail_stream.c mail_task.c mail_version.h
maillog_client.c map_search.c memcache_proto.c msg_stats.h
msg_stats_print.c msg_stats_scan.c normalize_mailhost_addr.c
post_mail.c quote_822_local.c rcpt_buf.c rcpt_buf.h rcpt_print.c
rcpt_print.h record.c resolve_clnt.c rewrite_clnt.c
sasl_mech_filter.c sasl_mech_filter.h scache_clnt.c server_acl.c
smtp_stream.c smtp_stream.h strip_addr.c test_main.c test_main.h
trace.c verify.c verify_clnt.c verify_sender_addr.c
src/external/ibm-public/postfix/dist/src/local: forward.c local.c
mailbox.c unknown.c
src/external/ibm-public/postfix/dist/src/master: dgram_server.c
event_server.c mail_server.h master.c master_ent.c master_monitor.c
master_vars.c multi_server.c single_server.c trigger_server.c
src/external/ibm-public/postfix/dist/src/milter: milter.c milter.h
milter8.c milter_macros.c
src/external/ibm-public/postfix/dist/src/oqmgr: qmgr_deliver.c
qmgr_entry.c qmgr_feedback.c qmgr_message.c
src/external/ibm-public/postfix/dist/src/pickup: pickup.c
src/external/ibm-public/postfix/dist/src/pipe: pipe.c
src/external/ibm-public/postfix/dist/src/postalias: postalias.c
src/external/ibm-public/postfix/dist/src/postcat: postcat.c
src/external/ibm-public/postfix/dist/src/postconf: install_vars.h
postconf.c postconf_builtin.c postconf_dbms.c postconf_lookup.c
postconf_main.c postconf_master.c postconf_user.c
src/external/ibm-public/postfix/dist/src/postdrop: postdrop.c
src/external/ibm-public/postfix/dist/src/postfix: postfix.c
src/external/ibm-public/postfix/dist/src/postkick: postkick.c

CVS commit: src/external/ibm-public/postfix

2022-10-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct  8 16:12:51 UTC 2022

Modified Files:
src/external/ibm-public/postfix/dist: makedefs postfix-install
src/external/ibm-public/postfix/dist/README_FILES:
ADDRESS_VERIFICATION_README INSTALL TLS_README
src/external/ibm-public/postfix/dist/conf: main.cf master.cf
post-install postfix-files postfix-tls-script postmulti-script
src/external/ibm-public/postfix/dist/html:
ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html
postconf.5.html
src/external/ibm-public/postfix/dist/man/man1: makedefs.1 postalias.1
postcat.1 postconf.1 postdrop.1 postfix.1 postlog.1 postmap.1
postmulti.1 postqueue.1 postsuper.1 posttls-finger.1 sendmail.1
smtp-sink.1
src/external/ibm-public/postfix/dist/man/man5: access.5 aliases.5
canonical.5 cidr_table.5 generic.5 ldap_table.5 lmdb_table.5
master.5 mysql_table.5 pcre_table.5 pgsql_table.5 postconf.5
regexp_table.5 relocated.5 sqlite_table.5 transport.5 virtual.5
src/external/ibm-public/postfix/dist/man/man8: bounce.8 cleanup.8
dnsblog.8 local.8 master.8 pipe.8 postlogd.8 postscreen.8 qmqpd.8
smtp.8 smtpd.8 spawn.8 tlsproxy.8 trivial-rewrite.8 verify.8
virtual.8
src/external/ibm-public/postfix/dist/mantools: comment.c
src/external/ibm-public/postfix/dist/proto:
ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html
postconf.proto
src/external/ibm-public/postfix/dist/src/anvil: anvil.c
src/external/ibm-public/postfix/dist/src/bounce: bounce.c
bounce_notify_util.c bounce_notify_util_tester.c bounce_service.h
bounce_template.c bounce_template.h bounce_templates.c
src/external/ibm-public/postfix/dist/src/cleanup: cleanup.c cleanup.h
cleanup_api.c cleanup_body_edit.c cleanup_init.c cleanup_message.c
cleanup_milter.c cleanup_out.c cleanup_out_recipient.c
cleanup_state.c
src/external/ibm-public/postfix/dist/src/dns: dns.h dns_lookup.c
dns_sec.c test_dns_lookup.c
src/external/ibm-public/postfix/dist/src/dnsblog: dnsblog.c
src/external/ibm-public/postfix/dist/src/flush: flush.c
src/external/ibm-public/postfix/dist/src/global: abounce.c anvil_clnt.c
been_here.c been_here.h bounce.c cleanup_strerror.c cleanup_user.h
clnt_stream.c clnt_stream.h compat_level.c compat_level.h
config_known_tcp_ports.c config_known_tcp_ports.h db_common.c
debug_peer.c defer.c deliver_pass.c deliver_request.c
delivered_hdr.c dict_ldap.c dict_proxy.c dict_sqlite.c dsb_scan.c
dsb_scan.h dsn_print.c dsn_print.h dynamicmaps.c flush_clnt.c
haproxy_srvr.c hfrom_format.c hfrom_format.h login_sender_match.c
login_sender_match.h mail_addr_find.c mail_command_client.c
mail_conf_time.c mail_copy.c mail_params.c mail_params.h
mail_proto.h mail_stream.c mail_task.c mail_version.h
maillog_client.c map_search.c memcache_proto.c msg_stats.h
msg_stats_print.c msg_stats_scan.c normalize_mailhost_addr.c
post_mail.c quote_822_local.c rcpt_buf.c rcpt_buf.h rcpt_print.c
rcpt_print.h record.c resolve_clnt.c rewrite_clnt.c
sasl_mech_filter.c sasl_mech_filter.h scache_clnt.c server_acl.c
smtp_stream.c smtp_stream.h strip_addr.c test_main.c test_main.h
trace.c verify.c verify_clnt.c verify_sender_addr.c
src/external/ibm-public/postfix/dist/src/local: forward.c local.c
mailbox.c unknown.c
src/external/ibm-public/postfix/dist/src/master: dgram_server.c
event_server.c mail_server.h master.c master_ent.c master_monitor.c
master_vars.c multi_server.c single_server.c trigger_server.c
src/external/ibm-public/postfix/dist/src/milter: milter.c milter.h
milter8.c milter_macros.c
src/external/ibm-public/postfix/dist/src/oqmgr: qmgr_deliver.c
qmgr_entry.c qmgr_feedback.c qmgr_message.c
src/external/ibm-public/postfix/dist/src/pickup: pickup.c
src/external/ibm-public/postfix/dist/src/pipe: pipe.c
src/external/ibm-public/postfix/dist/src/postalias: postalias.c
src/external/ibm-public/postfix/dist/src/postcat: postcat.c
src/external/ibm-public/postfix/dist/src/postconf: install_vars.h
postconf.c postconf_builtin.c postconf_dbms.c postconf_lookup.c
postconf_main.c postconf_master.c postconf_user.c
src/external/ibm-public/postfix/dist/src/postdrop: postdrop.c
src/external/ibm-public/postfix/dist/src/postfix: postfix.c
src/external/ibm-public/postfix/dist/src/postkick: postkick.c

CVS commit: src/sys/sys

2022-10-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct  8 15:48:01 UTC 2022

Modified Files:
src/sys/sys: stdarg.h

Log Message:
va_end should be really __nothing.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/sys/stdarg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/sys/stdarg.h
diff -u src/sys/sys/stdarg.h:1.5 src/sys/sys/stdarg.h:1.6
--- src/sys/sys/stdarg.h:1.5	Thu Mar 19 21:06:11 2020
+++ src/sys/sys/stdarg.h	Sat Oct  8 11:48:01 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdarg.h,v 1.5 2020/03/20 01:06:11 joerg Exp $	*/
+/*	$NetBSD: stdarg.h,v 1.6 2022/10/08 15:48:01 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -42,7 +42,7 @@
 #define __builtin_next_arg(t)		((t) ? 0 : 0)
 #define	__builtin_va_start(a, l)	((a) = (va_list)(void *)&(l))
 #define	__builtin_va_arg(a, t)		((a) ? (t) 0 : (t) 0)
-#define	__builtin_va_end(a)		/* nothing */
+#define	__builtin_va_end(a)		__nothing
 #define	__builtin_va_copy(d, s)		((d) = (s))
 #elif !(__GNUC_PREREQ__(4, 5) || \
 (__GNUC_PREREQ__(4, 4) && __GNUC_PATCHLEVEL__ > 2) || defined(__clang__))



CVS commit: src/sys/sys

2022-10-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Oct  8 15:48:01 UTC 2022

Modified Files:
src/sys/sys: stdarg.h

Log Message:
va_end should be really __nothing.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/sys/stdarg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/doc

2022-10-05 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct  5 22:51:37 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new OpenSSH


To generate a diff of this commit:
cvs rdiff -u -r1.1884 -r1.1885 src/doc/3RDPARTY
cvs rdiff -u -r1.2914 -r1.2915 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1884 src/doc/3RDPARTY:1.1885
--- src/doc/3RDPARTY:1.1884	Wed Oct  5 18:21:19 2022
+++ src/doc/3RDPARTY	Wed Oct  5 18:51:37 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1884 2022/10/05 22:21:19 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1885 2022/10/05 22:51:37 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1071,7 +1071,7 @@ Notes:
 Patch applied after OpenSSH import.
 
 Package:	OpenSSH
-Version:	9.0
+Version:	9.1
 Current Vers:	9.1 / portable 9.1p1
 Maintainer:	OpenSSH
 Archive Site:	http://www.openssh.com/ftp.html

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2914 src/doc/CHANGES:1.2915
--- src/doc/CHANGES:1.2914	Wed Oct  5 18:21:19 2022
+++ src/doc/CHANGES	Wed Oct  5 18:51:37 2022
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2914 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2915 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -694,3 +694,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 	file(1): Upgraded to 5.43. [christos 20220924]
 	tzdata: updated to 2022d (using the 2022dgtz fork) [kre 20220928]
 	dhcp: Patch to version 4.4.3-P1. [christos 20221005]
+	OpenSSH: Import 9.1. [christos 20221005]



CVS commit: src/doc

2022-10-05 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct  5 22:51:37 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new OpenSSH


To generate a diff of this commit:
cvs rdiff -u -r1.1884 -r1.1885 src/doc/3RDPARTY
cvs rdiff -u -r1.2914 -r1.2915 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/sets/lists

2022-10-05 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct  5 22:40:12 UTC 2022

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: shl.mi

Log Message:
bump libssh for OpenSSH-9.1


To generate a diff of this commit:
cvs rdiff -u -r1.940 -r1.941 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.297 -r1.298 src/distrib/sets/lists/debug/shl.mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.940 src/distrib/sets/lists/base/shl.mi:1.941
--- src/distrib/sets/lists/base/shl.mi:1.940	Sat Sep 24 16:36:49 2022
+++ src/distrib/sets/lists/base/shl.mi	Wed Oct  5 18:40:12 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.940 2022/09/24 20:36:49 christos Exp $
+# $NetBSD: shl.mi,v 1.941 2022/10/05 22:40:12 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -888,8 +888,8 @@
 ./usr/lib/libsqlite3.so.1.4			base-sys-shlib		compatfile
 ./usr/lib/libss.sobase-obsolete		obsolete
 ./usr/lib/libssh.sobase-secsh-shlib	compatfile
-./usr/lib/libssh.so.43base-secsh-shlib	compatfile
-./usr/lib/libssh.so.43.0			base-secsh-shlib	compatfile
+./usr/lib/libssh.so.44base-secsh-shlib	compatfile
+./usr/lib/libssh.so.44.0			base-secsh-shlib	compatfile
 ./usr/lib/libssl.sobase-crypto-shlib	compatfile
 ./usr/lib/libssl.so.12base-crypto-shlib	compatfile,openssl=10
 ./usr/lib/libssl.so.12.0			base-crypto-shlib	compatfile,openssl=10

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.297 src/distrib/sets/lists/debug/shl.mi:1.298
--- src/distrib/sets/lists/debug/shl.mi:1.297	Sat Sep 24 16:36:49 2022
+++ src/distrib/sets/lists/debug/shl.mi	Wed Oct  5 18:40:12 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.297 2022/09/24 20:36:49 christos Exp $
+# $NetBSD: shl.mi,v 1.298 2022/10/05 22:40:12 christos Exp $
 ./usr/lib/libbfd_g.a		comp-c-debuglib	debuglib,compatfile,binutils
 ./usr/libdata/debug/lib		base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libavl.so.0.0.debug			comp-zfs-debug	debug,dynamicroot,zfs
@@ -310,7 +310,7 @@
 ./usr/libdata/debug/usr/lib/libskey.so.2.0.debug		comp-sys-debug	debug,compatfile,skey
 ./usr/libdata/debug/usr/lib/libsl.so.6.0.debug			comp-krb5-debug	debug,compatfile,kerberos
 ./usr/libdata/debug/usr/lib/libsqlite3.so.1.4.debug		comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libssh.so.43.0.debug		comp-secsh-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libssh.so.44.0.debug		comp-secsh-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libssl.so.12.0.debug		comp-crypto-debug	debug,compatfile,openssl=10
 ./usr/libdata/debug/usr/lib/libssl.so.14.0.debug		comp-crypto-debug	debug,compatfile,openssl=11
 ./usr/libdata/debug/usr/lib/libstdc++.so.9.0.debug		comp-sys-debug	debug,compatfile,gcc=9,cxx,libstdcxx



CVS commit: src/distrib/sets/lists

2022-10-05 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct  5 22:40:12 UTC 2022

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: shl.mi

Log Message:
bump libssh for OpenSSH-9.1


To generate a diff of this commit:
cvs rdiff -u -r1.940 -r1.941 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.297 -r1.298 src/distrib/sets/lists/debug/shl.mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/crypto/external/bsd/openssh

2022-10-05 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct  5 22:39:37 UTC 2022

Modified Files:
src/crypto/external/bsd/openssh/bin/sftp: Makefile
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.agent addr.c
auth.c auth.h auth2-hostbased.c auth2-passwd.c auth2-pubkey.c
auth2-pubkeyfile.c authfd.c authfile.c channels.c channels.h
clientloop.c compat.c compat.h krl.c misc.c misc.h moduli.c
monitor.c monitor_wrap.c monitor_wrap.h mux.c packet.c readconf.c
readconf.h readpass.c scp.1 scp.c servconf.c servconf.h
serverloop.c sftp-client.c sftp-client.h sftp-common.c
sftp-common.h sftp-server.c sftp-usergroup.c sftp.1 sftp.c
sk-usbhid.c ssh-add.c ssh-agent.c ssh-ed25519.c ssh-keygen.1
ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.c
ssh-pkcs11-helper.8 ssh-sk-helper.c ssh-sk.c ssh-xmss.c ssh.1 ssh.c
ssh_config.5 sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf.c
sshbuf.h sshconnect.c sshconnect2.c sshd.8 sshd.c sshd_config.5
sshkey.c sshkey.h sshsig.c version.h xmss_hash.c
src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.2048
moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192
src/crypto/external/bsd/openssh/lib: shlib_version

Log Message:
merge conflicts between 9.0 and 9.1


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/PROTOCOL
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \
src/crypto/external/bsd/openssh/dist/sftp-common.c \
src/crypto/external/bsd/openssh/dist/sshbuf.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/addr.c
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssh/dist/auth.c \
src/crypto/external/bsd/openssh/dist/serverloop.c \
src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/auth.h \
src/crypto/external/bsd/openssh/dist/channels.h \
src/crypto/external/bsd/openssh/dist/monitor_wrap.h
cvs rdiff -u -r1.21 -r1.22 \
src/crypto/external/bsd/openssh/dist/auth2-hostbased.c
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/openssh/dist/auth2-passwd.c \
src/crypto/external/bsd/openssh/dist/compat.h \
src/crypto/external/bsd/openssh/dist/moduli.c
cvs rdiff -u -r1.31 -r1.32 \
src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
src/crypto/external/bsd/openssh/dist/misc.c \
src/crypto/external/bsd/openssh/dist/mux.c \
src/crypto/external/bsd/openssh/dist/sftp-client.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssh/dist/auth2-pubkeyfile.c \
src/crypto/external/bsd/openssh/dist/sftp-usergroup.c
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/authfd.c \
src/crypto/external/bsd/openssh/dist/compat.c
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/authfile.c \
src/crypto/external/bsd/openssh/dist/sftp.1 \
src/crypto/external/bsd/openssh/dist/ssh-add.c
cvs rdiff -u -r1.37 -r1.38 src/crypto/external/bsd/openssh/dist/channels.c
cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/dist/clientloop.c \
src/crypto/external/bsd/openssh/dist/scp.c \
src/crypto/external/bsd/openssh/dist/sftp.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/krl.c
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/misc.h \
src/crypto/external/bsd/openssh/dist/ssh-keysign.c
cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/monitor.c \
src/crypto/external/bsd/openssh/dist/servconf.c \
src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.30 -r1.31 \
src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
src/crypto/external/bsd/openssh/dist/ssh-keygen.1
cvs rdiff -u -r1.46 -r1.47 src/crypto/external/bsd/openssh/dist/packet.c \
src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/readconf.c
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/readconf.h \
src/crypto/external/bsd/openssh/dist/ssh-keyscan.c
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/readpass.c \
src/crypto/external/bsd/openssh/dist/sshbuf.h
cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/scp.1 \
src/crypto/external/bsd/openssh/dist/servconf.h \
src/crypto/external/bsd/openssh/dist/sftp-server.c \
src/crypto/external/bsd/openssh/dist/sshd.8
cvs rdiff -u -r1.16 -r1.17 

CVS commit: src/crypto/external/bsd/openssh

2022-10-05 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct  5 22:39:37 UTC 2022

Modified Files:
src/crypto/external/bsd/openssh/bin/sftp: Makefile
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.agent addr.c
auth.c auth.h auth2-hostbased.c auth2-passwd.c auth2-pubkey.c
auth2-pubkeyfile.c authfd.c authfile.c channels.c channels.h
clientloop.c compat.c compat.h krl.c misc.c misc.h moduli.c
monitor.c monitor_wrap.c monitor_wrap.h mux.c packet.c readconf.c
readconf.h readpass.c scp.1 scp.c servconf.c servconf.h
serverloop.c sftp-client.c sftp-client.h sftp-common.c
sftp-common.h sftp-server.c sftp-usergroup.c sftp.1 sftp.c
sk-usbhid.c ssh-add.c ssh-agent.c ssh-ed25519.c ssh-keygen.1
ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.c
ssh-pkcs11-helper.8 ssh-sk-helper.c ssh-sk.c ssh-xmss.c ssh.1 ssh.c
ssh_config.5 sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf.c
sshbuf.h sshconnect.c sshconnect2.c sshd.8 sshd.c sshd_config.5
sshkey.c sshkey.h sshsig.c version.h xmss_hash.c
src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.2048
moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192
src/crypto/external/bsd/openssh/lib: shlib_version

Log Message:
merge conflicts between 9.0 and 9.1


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/PROTOCOL
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \
src/crypto/external/bsd/openssh/dist/sftp-common.c \
src/crypto/external/bsd/openssh/dist/sshbuf.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/addr.c
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssh/dist/auth.c \
src/crypto/external/bsd/openssh/dist/serverloop.c \
src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/auth.h \
src/crypto/external/bsd/openssh/dist/channels.h \
src/crypto/external/bsd/openssh/dist/monitor_wrap.h
cvs rdiff -u -r1.21 -r1.22 \
src/crypto/external/bsd/openssh/dist/auth2-hostbased.c
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/openssh/dist/auth2-passwd.c \
src/crypto/external/bsd/openssh/dist/compat.h \
src/crypto/external/bsd/openssh/dist/moduli.c
cvs rdiff -u -r1.31 -r1.32 \
src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
src/crypto/external/bsd/openssh/dist/misc.c \
src/crypto/external/bsd/openssh/dist/mux.c \
src/crypto/external/bsd/openssh/dist/sftp-client.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssh/dist/auth2-pubkeyfile.c \
src/crypto/external/bsd/openssh/dist/sftp-usergroup.c
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/authfd.c \
src/crypto/external/bsd/openssh/dist/compat.c
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/authfile.c \
src/crypto/external/bsd/openssh/dist/sftp.1 \
src/crypto/external/bsd/openssh/dist/ssh-add.c
cvs rdiff -u -r1.37 -r1.38 src/crypto/external/bsd/openssh/dist/channels.c
cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/dist/clientloop.c \
src/crypto/external/bsd/openssh/dist/scp.c \
src/crypto/external/bsd/openssh/dist/sftp.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/krl.c
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/misc.h \
src/crypto/external/bsd/openssh/dist/ssh-keysign.c
cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/monitor.c \
src/crypto/external/bsd/openssh/dist/servconf.c \
src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.30 -r1.31 \
src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
src/crypto/external/bsd/openssh/dist/ssh-keygen.1
cvs rdiff -u -r1.46 -r1.47 src/crypto/external/bsd/openssh/dist/packet.c \
src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/readconf.c
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/readconf.h \
src/crypto/external/bsd/openssh/dist/ssh-keyscan.c
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/readpass.c \
src/crypto/external/bsd/openssh/dist/sshbuf.h
cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/scp.1 \
src/crypto/external/bsd/openssh/dist/servconf.h \
src/crypto/external/bsd/openssh/dist/sftp-server.c \
src/crypto/external/bsd/openssh/dist/sshd.8
cvs rdiff -u -r1.16 -r1.17 

CVS import: src/crypto/external/bsd/openssh/dist

2022-10-05 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct  5 22:35:37 UTC 2022

Update of /cvsroot/src/crypto/external/bsd/openssh/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv7511

Log Message:
Import OpenSSH-9.1 (previously we were on OpenSSH-9.0)

This release is focused on bug fixing.

Security


This release contains fixes for three minor memory safety problems.
None are believed to be exploitable, but we report most memory safety
problems as potential security vulnerabilities out of caution.

 * ssh-keyscan(1): fix a one-byte overflow in SSH- banner processing.
   Reported by Qualys

 * ssh-keygen(1): double free() in error path of file hashing step in
   signing/verify code; GHPR333

 * ssh-keysign(8): double-free in error path introduced in openssh-8.9

Potentially-incompatible changes


 * The portable OpenSSH project now signs commits and release tags
   using git's recent SSH signature support. The list of developer
   signing keys is included in the repository as .git_allowed_signers
   and is cross-signed using the PGP key that is still used to sign
   release artifacts:
   https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/RELEASE_KEY.asc

 * ssh(1), sshd(8): SetEnv directives in ssh_config and sshd_config
   are now first-match-wins to match other directives. Previously
   if an environment variable was multiply specified the last set
   value would have been used. bz3438

 * ssh-keygen(8): ssh-keygen -A (generate all default host key types)
   will no longer generate DSA keys, as these are insecure and have
   not been used by default for some years.


New features


 * ssh(1), sshd(8): add a RequiredRSASize directive to set a minimum
   RSA key length. Keys below this length will be ignored for user
   authentication and for host authentication in sshd(8). 

   ssh(1) will terminate a connection if the server offers an RSA key
   that falls below this limit, as the SSH protocol does not include
   the ability to retry a failed key exchange.

 * sftp-server(8): add a "users-groups-by...@openssh.com" extension
   request that allows the client to obtain user/group names that
   correspond to a set of uids/gids.

 * sftp(1): use "users-groups-by...@openssh.com" sftp-server
   extension (when available) to fill in user/group names for
   directory listings.

 * sftp-server(8): support the "home-directory" extension request
   defined in draft-ietf-secsh-filexfer-extensions-00. This overlaps
   a bit with the existing "expand-p...@openssh.com", but some other
   clients support it.

 * ssh-keygen(1), sshd(8): allow certificate validity intervals,
   sshsig verification times and authorized_keys expiry-time options
   to accept dates in the UTC time zone in addition to the default
   of interpreting them in the system time zone. MMDD and
   YYMMDDHHMM[SS] dates/times will be interpreted as UTC if suffixed
   with a 'Z' character.

   Also allow certificate validity intervals to be specified in raw
   seconds-since-epoch as hex value, e.g. -V 0x1234:0x4567890. This
   is intended for use by regress tests and other tools that call
   ssh-keygen as part of a CA workflow. bz3468

 * sftp(1): allow arguments to the sftp -D option, e.g. sftp -D
   "/usr/libexec/sftp-server -el debug3"

 * ssh-keygen(1): allow the existing -U (use agent) flag to work
   with "-Y sign" operations, where it will be interpreted to require
   that the private keys is hosted in an agent; bz3429

Bugfixes


 * ssh-keygen(1): implement the "verify-required" certificate option.
   This was already documented when support for user-verified FIDO
   keys was added, but the ssh-keygen(1) code was missing.

 * ssh-agent(1): hook up the restrict_websafe command-line flag;
   previously the flag was accepted but never actually used.

 * sftp(1): improve filename tab completions: never try to complete
   names to non-existent commands, and better match the completion
   type (local or remote filename) against the argument position
   being completed.

 * ssh-keygen(1), ssh(1), ssh-agent(1): several fixes to FIDO key
   handling, especially relating to keys that request
   user-verification. These should reduce the number of unnecessary
   PIN prompts for keys that support intrinsic user verification.
   GHPR302, GHPR329

 * ssh-keygen(1): when enrolling a FIDO resident key, check if a
   credential with matching application and user ID strings already
   exists and, if so, prompt the user for confirmation before
   overwriting the credential. GHPR329

 * sshd(8): improve logging of errors when opening authorized_keys
   files. bz2042

 * ssh(1): avoid multiplexing operations that could cause SIGPIPE from
   causing the client to exit early. bz3454

 * ssh_config(5), sshd_config(5): clarify that the RekeyLimit
   directive applies to both transmitted and received data. GHPR328

 * ssh-keygen(1): avoid double fclose() in error path.

 * sshd(8): log an error if 

CVS import: src/crypto/external/bsd/openssh/dist

2022-10-05 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct  5 22:35:37 UTC 2022

Update of /cvsroot/src/crypto/external/bsd/openssh/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv7511

Log Message:
Import OpenSSH-9.1 (previously we were on OpenSSH-9.0)

This release is focused on bug fixing.

Security


This release contains fixes for three minor memory safety problems.
None are believed to be exploitable, but we report most memory safety
problems as potential security vulnerabilities out of caution.

 * ssh-keyscan(1): fix a one-byte overflow in SSH- banner processing.
   Reported by Qualys

 * ssh-keygen(1): double free() in error path of file hashing step in
   signing/verify code; GHPR333

 * ssh-keysign(8): double-free in error path introduced in openssh-8.9

Potentially-incompatible changes


 * The portable OpenSSH project now signs commits and release tags
   using git's recent SSH signature support. The list of developer
   signing keys is included in the repository as .git_allowed_signers
   and is cross-signed using the PGP key that is still used to sign
   release artifacts:
   https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/RELEASE_KEY.asc

 * ssh(1), sshd(8): SetEnv directives in ssh_config and sshd_config
   are now first-match-wins to match other directives. Previously
   if an environment variable was multiply specified the last set
   value would have been used. bz3438

 * ssh-keygen(8): ssh-keygen -A (generate all default host key types)
   will no longer generate DSA keys, as these are insecure and have
   not been used by default for some years.


New features


 * ssh(1), sshd(8): add a RequiredRSASize directive to set a minimum
   RSA key length. Keys below this length will be ignored for user
   authentication and for host authentication in sshd(8). 

   ssh(1) will terminate a connection if the server offers an RSA key
   that falls below this limit, as the SSH protocol does not include
   the ability to retry a failed key exchange.

 * sftp-server(8): add a "users-groups-by...@openssh.com" extension
   request that allows the client to obtain user/group names that
   correspond to a set of uids/gids.

 * sftp(1): use "users-groups-by...@openssh.com" sftp-server
   extension (when available) to fill in user/group names for
   directory listings.

 * sftp-server(8): support the "home-directory" extension request
   defined in draft-ietf-secsh-filexfer-extensions-00. This overlaps
   a bit with the existing "expand-p...@openssh.com", but some other
   clients support it.

 * ssh-keygen(1), sshd(8): allow certificate validity intervals,
   sshsig verification times and authorized_keys expiry-time options
   to accept dates in the UTC time zone in addition to the default
   of interpreting them in the system time zone. MMDD and
   YYMMDDHHMM[SS] dates/times will be interpreted as UTC if suffixed
   with a 'Z' character.

   Also allow certificate validity intervals to be specified in raw
   seconds-since-epoch as hex value, e.g. -V 0x1234:0x4567890. This
   is intended for use by regress tests and other tools that call
   ssh-keygen as part of a CA workflow. bz3468

 * sftp(1): allow arguments to the sftp -D option, e.g. sftp -D
   "/usr/libexec/sftp-server -el debug3"

 * ssh-keygen(1): allow the existing -U (use agent) flag to work
   with "-Y sign" operations, where it will be interpreted to require
   that the private keys is hosted in an agent; bz3429

Bugfixes


 * ssh-keygen(1): implement the "verify-required" certificate option.
   This was already documented when support for user-verified FIDO
   keys was added, but the ssh-keygen(1) code was missing.

 * ssh-agent(1): hook up the restrict_websafe command-line flag;
   previously the flag was accepted but never actually used.

 * sftp(1): improve filename tab completions: never try to complete
   names to non-existent commands, and better match the completion
   type (local or remote filename) against the argument position
   being completed.

 * ssh-keygen(1), ssh(1), ssh-agent(1): several fixes to FIDO key
   handling, especially relating to keys that request
   user-verification. These should reduce the number of unnecessary
   PIN prompts for keys that support intrinsic user verification.
   GHPR302, GHPR329

 * ssh-keygen(1): when enrolling a FIDO resident key, check if a
   credential with matching application and user ID strings already
   exists and, if so, prompt the user for confirmation before
   overwriting the credential. GHPR329

 * sshd(8): improve logging of errors when opening authorized_keys
   files. bz2042

 * ssh(1): avoid multiplexing operations that could cause SIGPIPE from
   causing the client to exit early. bz3454

 * ssh_config(5), sshd_config(5): clarify that the RekeyLimit
   directive applies to both transmitted and received data. GHPR328

 * ssh-keygen(1): avoid double fclose() in error path.

 * sshd(8): log an error if 

CVS commit: src/doc

2022-10-05 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct  5 22:21:19 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
mention dhcp patch


To generate a diff of this commit:
cvs rdiff -u -r1.1883 -r1.1884 src/doc/3RDPARTY
cvs rdiff -u -r1.2913 -r1.2914 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1883 src/doc/3RDPARTY:1.1884
--- src/doc/3RDPARTY:1.1883	Tue Oct  4 08:18:58 2022
+++ src/doc/3RDPARTY	Wed Oct  5 18:21:19 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1883 2022/10/04 12:18:58 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1884 2022/10/05 22:21:19 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -335,12 +335,12 @@ distribution into the netbsd format.  Th
 src/lib/libc/db/db2netbsd.
 
 Package:	dhcp
-Version:	4.4.3
-Current Vers:	4.4.3
+Version:	4.4.3-P1
+Current Vers:	4.4.3-P1
 Maintainer:	mellon
 Archive Site:	ftp://ftp.isc.org/isc/dhcp/
 Home Page:	http://www.isc.org/software/dhcp/
-Date:		2022-04-02
+Date:		2022-10-05
 Mailing List:	dhcp-ser...@isc.org
 Mailing List:	dhcp-cli...@isc.org
 Mailing List:	dhcp-annou...@isc.org

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2913 src/doc/CHANGES:1.2914
--- src/doc/CHANGES:1.2913	Wed Sep 28 07:09:13 2022
+++ src/doc/CHANGES	Wed Oct  5 18:21:19 2022
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2913 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2914 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -693,3 +693,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 	unbound(8): Import 1.16.3. [christos 20220924]
 	file(1): Upgraded to 5.43. [christos 20220924]
 	tzdata: updated to 2022d (using the 2022dgtz fork) [kre 20220928]
+	dhcp: Patch to version 4.4.3-P1. [christos 20221005]



CVS commit: src/doc

2022-10-05 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct  5 22:21:19 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
mention dhcp patch


To generate a diff of this commit:
cvs rdiff -u -r1.1883 -r1.1884 src/doc/3RDPARTY
cvs rdiff -u -r1.2913 -r1.2914 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mpl/dhcp/dist

2022-10-05 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct  5 22:20:15 UTC 2022

Modified Files:
src/external/mpl/dhcp/dist: RELNOTES
src/external/mpl/dhcp/dist/common: options.c
src/external/mpl/dhcp/dist/common/tests: option_unittest.c

Log Message:
Apply security fixes:
https://downloads.isc.org/isc/dhcp/4.4.3-P1/patches/CVE-2022-2928.4-4-3.diff
https://downloads.isc.org/isc/dhcp/4.4.3-P1/patches/CVE-2022-2929.4-4-3.diff


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/mpl/dhcp/dist/RELNOTES
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/dhcp/dist/common/options.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/mpl/dhcp/dist/common/tests/option_unittest.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/dhcp/dist

2022-10-05 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct  5 22:20:15 UTC 2022

Modified Files:
src/external/mpl/dhcp/dist: RELNOTES
src/external/mpl/dhcp/dist/common: options.c
src/external/mpl/dhcp/dist/common/tests: option_unittest.c

Log Message:
Apply security fixes:
https://downloads.isc.org/isc/dhcp/4.4.3-P1/patches/CVE-2022-2928.4-4-3.diff
https://downloads.isc.org/isc/dhcp/4.4.3-P1/patches/CVE-2022-2929.4-4-3.diff


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/mpl/dhcp/dist/RELNOTES
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/dhcp/dist/common/options.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/mpl/dhcp/dist/common/tests/option_unittest.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/dhcp/dist/RELNOTES
diff -u src/external/mpl/dhcp/dist/RELNOTES:1.1.1.4 src/external/mpl/dhcp/dist/RELNOTES:1.2
--- src/external/mpl/dhcp/dist/RELNOTES:1.1.1.4	Sat Apr  2 21:08:35 2022
+++ src/external/mpl/dhcp/dist/RELNOTES	Wed Oct  5 18:20:15 2022
@@ -1,10 +1,8 @@
 Internet Systems Consortium DHCP Distribution
-Version 4.4.3
-9 March 2022
+  Version 4.4.3-P1
+? ? 2022
 Release Notes
 
-NEW FEATURES
-
 Please note that that ISC DHCP is licensed under the Mozilla Public
 License, MPL 2.0. Please see https://www.mozilla.org/en-US/MPL/2.0/ to read
 the MPL 2.0 license terms.
@@ -28,6 +26,20 @@ ISC DHCP is open source software maintai
 Consortium.  This product includes cryptographic software written
 by Eric Young (e...@cryptsoft.com).
 
+		Changes since 4.4.3 (Bug Fixes)
+
+! Corrected a reference count leak that occurs when the server builds
+  responses to leasequery packets. Thanks to VictorV of Cyber Kunlun
+  Lab for reporting the issue.
+  [Gitblab #253]
+  CVE: CVS-2022-2928
+
+! Corrected a memory leak that occurs when unpacking a packet that has an
+  FQDN option (81) that contains a label whose lenght is greater than 63.
+  Thanks to VictorV of Cyber Kunlun Lab for reporting the issue.
+  [Gitblab #254]
+  CVE: CVS-2022-2929
+
 		Changes since 4.4.2-P1 (New Features)
 
 - Two new OMAPI function calls were added, `dhcpctl_timed_connect()`

Index: src/external/mpl/dhcp/dist/common/options.c
diff -u src/external/mpl/dhcp/dist/common/options.c:1.6 src/external/mpl/dhcp/dist/common/options.c:1.7
--- src/external/mpl/dhcp/dist/common/options.c:1.6	Sat Apr  2 21:10:58 2022
+++ src/external/mpl/dhcp/dist/common/options.c	Wed Oct  5 18:20:15 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: options.c,v 1.6 2022/04/03 01:10:58 christos Exp $	*/
+/*	$NetBSD: options.c,v 1.7 2022/10/05 22:20:15 christos Exp $	*/
 
 /* options.c
 
@@ -29,7 +29,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: options.c,v 1.6 2022/04/03 01:10:58 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.7 2022/10/05 22:20:15 christos Exp $");
 
 #define DHCP_OPTION_DATA
 #include "dhcpd.h"
@@ -465,16 +465,16 @@ int fqdn_universe_decode (struct option_
 		while (s <  -> data[0] + length + 2) {
 			len = *s;
 			if (len > 63) {
-log_info ("fancy bits in fqdn option");
-return 0;
+log_info ("label length exceeds 63 in fqdn option");
+goto bad;
 			}
 			if (len == 0) {
 terminated = 1;
 break;
 			}
 			if (s + len >  -> data [0] + length + 3) {
-log_info ("fqdn tag longer than buffer");
-return 0;
+log_info ("fqdn label longer than buffer");
+goto bad;
 			}
 
 			if (first_len == 0) {
@@ -4463,6 +4463,8 @@ add_option(struct option_state *options,
 	if (!option_cache_allocate(, MDL)) {
 		log_error("No memory for option cache adding %s (option %d).",
 			  option->name, option_num);
+		/* Get rid of reference created during hash lookup. */
+		option_dereference(, MDL);
 		return 0;
 	}
 
@@ -4474,6 +4476,8 @@ add_option(struct option_state *options,
 			 MDL)) {
 		log_error("No memory for constant data adding %s (option %d).",
 			  option->name, option_num);
+		/* Get rid of reference created during hash lookup. */
+		option_dereference(, MDL);
 		option_cache_dereference(, MDL);
 		return 0;
 	}
@@ -4482,6 +4486,9 @@ add_option(struct option_state *options,
 	save_option(_universe, options, oc);
 	option_cache_dereference(, MDL);
 
+	/* Get rid of reference created during hash lookup. */
+	option_dereference(, MDL);
+
 	return 1;
 }
 

Index: src/external/mpl/dhcp/dist/common/tests/option_unittest.c
diff -u src/external/mpl/dhcp/dist/common/tests/option_unittest.c:1.4 src/external/mpl/dhcp/dist/common/tests/option_unittest.c:1.5
--- src/external/mpl/dhcp/dist/common/tests/option_unittest.c:1.4	Sat Apr  2 21:10:58 2022
+++ src/external/mpl/dhcp/dist/common/tests/option_unittest.c	Wed Oct  5 18:20:15 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: option_unittest.c,v 1.4 2022/04/03 01:10:58 

Re: CVS commit: src/sys/kern

2022-10-04 Thread Christos Zoulas

On 2022-10-01 3:39 pm, Robert Elz wrote:

Date:Sat, 1 Oct 2022 13:00:04 -0400

[stuff deleted]


Even when it is called, the code is:

fp->f_flag = flags & FMASK;

where FMASK is (from fcntl.h)

#define FMASK   (FREAD|FWRITE|FCNTLFLAGS|FEXEC)

and

#define FCNTLFLAGS  
(FAPPEND|FASYNC|FFSYNC|FNONBLOCK|FDSYNC|FRSYNC|FALTIO|\

 FDIRECT|FNOSIGPIPE)

which all looks exactly as it should be to me - and note that O_CLOEXEC
(which has no F equivalent name - it doesn't need one) is not 
there.


So, fp->f_flag isn't set at all (is probably 0), and even if it were
O_CLOEXEC would not be there, and should not be.


Thanks for pointing that out, I always forget the O_CLOEXEC is special
in that regard. I wish it was not, but it is difficult to fix.



For the vnode actually being opened, none of this matters, as the open
lasts as long (actually not as long) as the open() sys call - when that
returns, the device being opened has been closed again, so what the
file that refers to it looks like (or would have looked like) really
doesn't matter at all, it never becomes visible.   That's my guess as
to why the open_setfp() call is missing in that case.

But what got forgotten (or deliberately was not done) was anything to
affect the modes of the clone which is opened.

  | What does it mean when the open specifies O_CLOEXEC
  | and ff->ff_exclose is false? Can that happen? Is that desirable?

It is what is currently happening whenever we open a cloning device.
(Or that is what it looks like to me).   Desirable, no idea, I didn't
define the semantics of cloning device opens, nor which of the open
flags should apply to the clone that is created.

  | I am fine with the locking to stay where it is. I guess it is 
probably

  | not needed after dup/clone, since the underlying vnode is shared...

Assuming you mean dup(2) (and dup2()) and clone(2) then no - those have
no way to pass the relevant locking flags, if you have a fd and want to
apply a lock, fcntl() is what does that (and the fcntl operations that
duplicate fds do not also apply locks).

The only issue is O_EXLOCK and O_SHLOCK (and O_CLOEXEC) for cloned 
devices.


I suspect it makes sense for O_CLOEXEC to be applied in that case, it
makes little sense for open("/dev/ptmx", O_RDWR|O_CLOEXEC) to succeed,
returning an open fd which does not have cloexec set (which is the 
issue,

along with O_NONBLOCK) which started all of this discussion.

The locking flags I am less sure about.   I don't see how they can fail
to succeed if applied, as the vnode for the device has just been 
created,
nothing else can possibly have any kind of lock on it.   Whether 
there's

any benefit in applying the lock so that the node is locked for later,
I don't know - but it certainly should do no harm to do that.

It seems clear to me that what we need is (something like)

Index: vfs_syscalls.c
===
RCS file: /cvsroot/src/sys/kern/vfs_syscalls.c,v
retrieving revision 1.555
diff -u -r1.555 vfs_syscalls.c
--- vfs_syscalls.c  12 Feb 2022 15:51:29 -  1.555
+++ vfs_syscalls.c  1 Oct 2022 19:27:15 -
@@ -1763,6 +1763,9 @@
error = fd_dupopen(dupfd, dupfd_move, flags, );
if (error)
return error;
+   error = open_setfp(l, fp, XXXvp, indx, flags);
+   if (error)
+   return error;
*fd = indx;
} else {
error = open_setfp(l, fp, vp, indx, flags);


where XXXvp needs to be extracted from somewhere (it isn't vp, as 
vp==NULL)

except that what follows in the else case is ...

if (error)
return error;
VOP_UNLOCK(vp);
*fd = indx;


That VOP_UNLOCK(vp) is what is bothering me,   It tells me that 
open_setfp()
is expecting to be called with vp locked - but in the first case (the 
cloning
case) there is no VOP_UNLOCK() call (and what's more, fd_dupopen() 
cannot
do it, as it has no vp arg).   That means, I believe, that when 
vn_open()
returns in the normal case, vp is returned locked, but in the cloning 
case

the vnode that was created for the clone is not locked.

I'm not sure what is the right way to find the vnode, or how it should
properly be locked so open_setfp() can do its thing.   If I knew all of
that I would have made an attempt at fixing this already.   We need
someone who really understands what is happening here, and the right
way to handle it all (which very likely is nothing like I just 
suggested).


The question is how to find the vnode? Perhaps it is easiest to fail the
open call if O_EXLOCK or O_SHLOCK are specified in a cloning open? At 
least

we will not silently ignore them?

Best,

christos


Re: CVS commit: src/sys/kern

2022-10-01 Thread Christos Zoulas


> On Sep 30, 2022, at 11:02 PM, Robert Elz  wrote:
> 
>Date:Fri, 30 Sep 2022 20:15:07 -0400
>From:    Christos Zoulas 
>Message-ID:  
> 
>  | It does not need an extra flag (it looks in the file descriptor flags to
>  | find if it needs to set or not.
> 
> One of us is confused.   From where in this case does anything
> get the exclose flag set?   That's the whole question here.  The
> flags arg that is passed around has O_CLOEXEC set in it - you used
> that in the call to fd_set_exclose() in kern/tty_ptm.c ... but where
> you said that would be better done in fd_affix().

This is what I meant:

RCS file: /cvsroot/src/sys/kern/kern_descrip.c,v
retrieving revision 1.251
diff -u -u -r1.251 kern_descrip.c
--- kern_descrip.c  29 Jun 2021 22:40:53 -  1.251
+++ kern_descrip.c  1 Oct 2022 16:56:44 -
@@ -1162,6 +1162,7 @@
KASSERT(ff->ff_allocated);
KASSERT(fd_isused(fdp, fd));
KASSERT(fd >= NDFDFILE || ff == (fdfile_t *)fdp->fd_dfdfile[fd]);
+   ff->ff_exclose = (fp->f_flag & O_CLOEXEC) != 0;

/* No need to lock in order to make file initially visible. */
ff->ff_file = fp;

> 
> That does not have access to the flags.   So from where is it going
> to get the close on exec info ?
> 
> My reading of do_open() is that the O_CLOEXEC flag is never even
> examined when a cloning device is opened, it doesn't get set on
> the original fd (the cloner) or the cloned device (other than by
> your recent modification for /dev/pmx).
> 
> Did I misread the code?
> 
> Or are you planning something different than it seemed?
> 
>  | to find other cases where we forgot to call fd_set_exclose() before calling
>  | fd_affix().
> 
> My point is that it should not be necessary to call fd_set_exclose()
> in every (or any) cloning device driver.  The open syscall handling
> is where that should be done, just as it is for all the opens that
> are not cloning devices.

What does it mean when the open specifies O_CLOEXEC
and ff->ff_exclose is false? Can that happen? Is that desirable?

> Why be different?
> 
>  | It also does not need locking because the process can't access
>  | the descriptor before calling fd_affix.
> 
> The locking I was referring to are the vnode locks/references in
> do_open(), not anything related to the file struct or descriptor.
> I just do not feel competent to get all of that correct in this
> case (more complex than the normal case because of the extra vnode
> involved) and would prefer if someone familiar with all of that
> were to handle it - particularly in the extra error case that will
> need to be handled, even if I cannot see how it would actually fire
> in the case in question.

I am fine with the locking to stay where it is. I guess it is probably
not needed after dup/clone, since the underlying vnode is shared...

christos


signature.asc
Description: Message signed with OpenPGP


Re: CVS commit: src/sys/kern

2022-09-30 Thread Christos Zoulas


> On Sep 30, 2022, at 5:57 PM, Robert Elz  wrote:
> 
>Date:Fri, 30 Sep 2022 16:34:20 -0400
>From:    Christos Zoulas 
>Message-ID:  <232331ad-d501-4547-b730-03590c0c9...@zoulas.com>
> 
>  | How about handling exclose there?
> 
> That would be possible, but why?   We still need higher level code to
> handle the locking, which can also handle cloexec -- the problem we
> have now is simply that the relevant call is missing, I don't think adding
> it will be hard, but it needs to be done by someone who understands the
> locking requirements, and correct exit strategy in this case if an error
> occurs (failing to successfully lock a newly created clone would seem to
> be a very bizarre case, but still...)   That is, I don't feel competent to
> suggest the 3 or 4 lines that ought be added in do_open to fix this (for
> just O_CLOEXEC it would be trivial there, as that cannot fail).
> 
> Currently fd_affix (I mistakenly made it fp_affix in the last message...)
> doesn't have a flags parameter, so to do it the way you suggest, we'd need
> to alter its signature, bump to 9.99.101 (and I haven't yet gotten around
> to making my kernel be 98.99.100 which I'm kind of planning to do ...)
> and go alter all the calls everywhere, mostly just filling in an extra
> arg with a 0.

It does not need an extra flag (it looks in the file descriptor flags to
find if it needs to set or not. In fact the first thing I thought was to add
an assertion to make sure that the flags agrees with that is set in exclose,
to find other cases where we forgot to call fd_set_exclose() before calling
fd_affix(). It also does not need locking because the process can't access
the descriptor before calling fd_affix.

christos


signature.asc
Description: Message signed with OpenPGP


Re: CVS commit: src/sys/kern

2022-09-30 Thread Christos Zoulas


> On Sep 30, 2022, at 10:13 AM, Robert Elz  wrote:
> 
>Date:Thu, 29 Sep 2022 16:47:06 - (UTC)
>From:chris...@astron.com (Christos Zoulas)
>Message-ID:  
> 
>  | I think that the way to go is to:
>  |
>  | 1. Do the fd_set_exclose() in fd_affix(). That will remove most of the 
> calls
>  |to fd_set_exclose() *and* the open-coded versions of it.
>  | 2. Move the open_setfp locking initialization code to fd_affix() and do it
>  |if fp->f_type == DTYPE_VNODE. This should enable locking in all the
>  |appropriate cloners.
> 
> I initially intended to reply and say that decisions where to put stuff
> like that were for someone else (you, dholland, ...) rather than me, as
> I haven't played around much at this level since before vnodes existed.
> 
> But I have been thinking about it, and I disagree with that approach.
> 
> fp_affix() has a job to do, and should be left to do it, without being
> burdened by applying weird side effects, sometimes.   The "do one thing
> and do it well" philosophy applies to more than the commands.
> 
> eg: currently fd_affix() is a void func, but to handle the lock flags
> it would need to be able to fail, and return an error code.  It would
> also need to be able to sleep.   That's just wrong.
> 
> O_CLOEXEC and O_??LOCK are high level open() flags, and deserve to be
> handled somewhere near the upper levels of the open syscall handling,
> not buried in some utility function.

That is the feedback that I wanted. But there were two parts to it. How about
handling exclose there? It is just making sure that the value from flags is 
propagated
to the exclose field.

christos


signature.asc
Description: Message signed with OpenPGP


Re: CVS commit: src/sys/kern

2022-09-29 Thread Christos Zoulas
In article <9275.1664462...@jacaranda.noi.kre.to>,
Robert Elz   wrote:
>Date:Thu, 29 Sep 2022 08:18:28 -0400
>From:    "Christos Zoulas" 
>Message-ID:  <20220929121828.06edff...@cvs.netbsd.org>
>
>  | Log Message:
>  | Add fd_set_exclose(). It is probably better to do this automatically in
>  | fd_affix()...
>
>Since that only affects /dev/ptmx I'd suggest fixing it generally for all
>cloning devices (and handling O_??LOCK as well) would be a better method.

I think that the way to go is to:

1. Do the fd_set_exclose() in fd_affix(). That will remove most of the calls
   to fd_set_exclose() *and* the open-coded versions of it.
2. Move the open_setfp locking initialization code to fd_affix() and do it
   if fp->f_type == DTYPE_VNODE. This should enable locking in all the
   appropriate cloners.

Best,

christos



Re: CVS commit: src/lib/libc/stdlib

2022-09-29 Thread Christos Zoulas
Yes, I had forgotten about the need to do this explicitly...

christos

> On Sep 28, 2022, at 10:23 PM, Robert Elz  wrote:
> 
> Apologies, I did not read the code closely enough, there must be a bug
> in the way the clone file descriptor is created.
> 
> kre



signature.asc
Description: Message signed with OpenPGP


CVS commit: src/sys/kern

2022-09-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Sep 29 12:18:27 UTC 2022

Modified Files:
src/sys/kern: tty_ptm.c

Log Message:
Add fd_set_exclose(). It is probably better to do this automatically in
fd_affix()...


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/kern/tty_ptm.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/kern/tty_ptm.c
diff -u src/sys/kern/tty_ptm.c:1.44 src/sys/kern/tty_ptm.c:1.45
--- src/sys/kern/tty_ptm.c:1.44	Sat Sep 24 12:29:27 2022
+++ src/sys/kern/tty_ptm.c	Thu Sep 29 08:18:27 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: tty_ptm.c,v 1.44 2022/09/24 16:29:27 christos Exp $	*/
+/*	$NetBSD: tty_ptm.c,v 1.45 2022/09/29 12:18:27 christos Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.44 2022/09/24 16:29:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.45 2022/09/29 12:18:27 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -204,7 +204,9 @@ retry:
 	fp->f_type = DTYPE_VNODE;
 	fp->f_ops = 
 	fp->f_vnode = vp;
+
 	VOP_UNLOCK(vp);
+	fd_set_exclose(l, *fd, (flags & O_CLOEXEC) != 0);
 	fd_affix(curproc, fp, *fd);
 	return 0;
 bad:



  1   2   3   4   5   6   7   8   9   10   >