diff --git a/etc/skel/dot.version b/etc/skel/dot.version index 01f043a59..339830be8 100644 --- a/etc/skel/dot.version +++ b/etc/skel/dot.version @@ -1 +1 @@ -# SecBSD 1.5-695fd1d: Tue Mar 26 00:00:00 UTC 2024 (Yatagarasu) +# SecBSD 1.5-efcc4eb: Thu Apr 4 00:00:00 UTC 2024 (Yatagarasu) diff --git a/lib/libcrypto/man/OPENSSL_malloc.3 b/lib/libcrypto/man/OPENSSL_malloc.3 index 7779a3ec0..a43dc5692 100644 --- a/lib/libcrypto/man/OPENSSL_malloc.3 +++ b/lib/libcrypto/man/OPENSSL_malloc.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: OPENSSL_malloc.3,v 1.12 2024/03/19 17:48:57 tb Exp $ +.\" $OpenBSD: OPENSSL_malloc.3,v 1.13 2024/04/04 09:30:43 tb Exp $ .\" .\" Copyright (c) 2016 Ingo Schwarze .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: March 19 2024 $ +.Dd $Mdocdate: April 4 2024 $ .Dt OPENSSL_MALLOC 3 .Os .Sh NAME @@ -61,7 +61,7 @@ Do not use any of the interfaces documented here in new code. They are provided purely for compatibility with legacy application code. .Pp -All 8 of these functions are wrappers around the corresponding +These functions are wrappers around the corresponding standard .Xr malloc 3 , .Xr free 3 , @@ -69,7 +69,7 @@ and .Xr strdup 3 functions. .Pp -The four +The .Fn OPENSSL_* functions are implemented as macros. .Sh RETURN VALUES diff --git a/usr.bin/ssh/ssh-agent/Makefile b/usr.bin/ssh/ssh-agent/Makefile index c60a219f7..9eb6c61cc 100644 --- a/usr.bin/ssh/ssh-agent/Makefile +++ b/usr.bin/ssh/ssh-agent/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.39 2024/04/01 15:50:17 deraadt Exp $ +# $OpenBSD: Makefile,v 1.40 2024/04/04 16:00:51 semarie Exp $ .PATH: ${.CURDIR}/.. @@ -28,7 +28,7 @@ install.sh: Makefile echo "${CC} ${LDFLAGS} ${LDSTATIC} -o ${PROG}" \ "\`echo " ${OBJS} "| tr ' ' '\\\n' | sort -R\`" ${LDADD} >> $@ echo "./${PROG} /usr/bin/true" >> $@ - echo "install -c -s -o root -g bin -m ${BINMODE} ${PROG} " \ + echo "install -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${PROG} " \ "${BINDIR}/${PROG}" >> $@ ${PROG}.tar: ${OBJS} install.sh @@ -37,5 +37,5 @@ ${PROG}.tar: ${OBJS} install.sh afterinstall: ${PROG}.tar install -d -o root -g wheel -m 755 \ ${DESTDIR}/usr/share/relink/${BINDIR}/${PROG} - install -o ${BINOWN} -g ${BINGRP} -m 640 \ + install -o root -g bin -m 640 \ ${PROG}.tar ${DESTDIR}/usr/share/relink/${BINDIR}/${PROG}/${PROG}.tar diff --git a/usr.bin/tmux/server-fn.c b/usr.bin/tmux/server-fn.c index ad01c8ae7..e3cd2186c 100644 --- a/usr.bin/tmux/server-fn.c +++ b/usr.bin/tmux/server-fn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-fn.c,v 1.136 2024/03/21 11:30:42 nicm Exp $ */ +/* $OpenBSD: server-fn.c,v 1.137 2024/04/04 22:44:40 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -410,7 +410,7 @@ server_find_session(struct session *s, static int server_newer_session(struct session *s_loop, struct session *s_out) { - return (timercmp(&s_loop->activity_time, &s_out->activity_time, <)); + return (timercmp(&s_loop->activity_time, &s_out->activity_time, >)); } static int