sync with OpenBSD -current

This commit is contained in:
purplerain 2024-04-05 06:11:03 +00:00
parent 69f13bbae9
commit d875ef6d7b
Signed by: purplerain
GPG Key ID: F42C07F07E2E35B7
4 changed files with 10 additions and 10 deletions

View File

@ -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)

View File

@ -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 <schwarze@openbsd.org>
.\"
@ -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

View File

@ -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

View File

@ -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 <nicholas.marriott@gmail.com>
@ -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