From 8499346dc45b265f3362e0e587a7dc7330926092 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Tue, 9 May 2023 20:02:59 +0000
Subject: [PATCH] Handle OpenSSL-3.x

---
 games/factor/Makefile         | 4 +++-
 usr.bin/moduli/qsafe/Makefile | 5 ++++-
 usr.sbin/racoon/Makefile      | 9 +++++----
 usr.sbin/syslogd/Makefile     | 4 +++-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/games/factor/Makefile b/games/factor/Makefile
index f77644c95f2b..48031bde568b 100644
--- a/games/factor/Makefile
+++ b/games/factor/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2021/04/12 04:19:32 mrg Exp $
+#	$NetBSD: Makefile,v 1.15 2023/05/09 20:03:11 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 .include <bsd.own.mk>
@@ -13,6 +13,8 @@ CPPFLAGS+=-DHAVE_OPENSSL
 LDADD+=	-lcrypto -lcrypt
 DPADD+=	${LIBCRYPTO} ${LIBCRYPT}
 
+COPTS.factor.c+= -Wno-error=deprecated-declarations
+
 MAN=	factor.6
 .PATH:	${PRIMES}
 
diff --git a/usr.bin/moduli/qsafe/Makefile b/usr.bin/moduli/qsafe/Makefile
index d184a9d95982..a843340b1a09 100644
--- a/usr.bin/moduli/qsafe/Makefile
+++ b/usr.bin/moduli/qsafe/Makefile
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2006/01/24 18:59:23 elad Exp $
+# $NetBSD: Makefile,v 1.2 2023/05/09 20:02:59 christos Exp $
 
 NOMAN=yes
 PROG=   qsafe
 SRCS= qsafe.c qfile.c
+
 QSIEVE=${.CURDIR}/../qsieve
 .PATH: ${QSIEVE}
 CPPFLAGS+=-I${QSIEVE}
 
+COPTS.qsafe.c+= -Wno-error=deprecated-declarations
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/racoon/Makefile b/usr.sbin/racoon/Makefile
index 502f01ba46f6..84e51fccc5fb 100644
--- a/usr.sbin/racoon/Makefile
+++ b/usr.sbin/racoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2023/05/09 02:30:21 christos Exp $
+# $NetBSD: Makefile,v 1.42 2023/05/09 20:11:54 christos Exp $
 
 WARNS?=	0	# XXX third-party program, many issues
 NOCLANGERROR=	# defined
@@ -84,9 +84,10 @@ prsa_par.c: ${DIST}/src/racoon/prsa_par.y
 CWARNFLAGS.gcc+=        ${GCC_NO_ADDR_OF_PACKED_MEMBER}
 
 COPTS+=		-fcommon
-COPTS.crypto_openssl.c+=-Wno-error=deprecated-declarations
-COPTS.rsalist.c+=-Wno-error=deprecated-declarations
-COPTS.prsa_par.c+=-Wno-error=deprecated-declarations
+COPTS.crypto_openssl.c+= -Wno-error=deprecated-declarations
+COPTS.rsalist.c+= -Wno-error=deprecated-declarations
+COPTS.prsa_par.c+= -Wno-error=deprecated-declarations
+COPTS.plainrsa-gen.c+= -Wno-error=deprecated-declarations
 
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile
index 6a584dbdb9cf..95d79eca2594 100644
--- a/usr.sbin/syslogd/Makefile
+++ b/usr.sbin/syslogd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.31 2021/03/07 15:09:12 christos Exp $
+#	$NetBSD: Makefile,v 1.32 2023/05/09 20:10:07 christos Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
 .include <bsd.own.mk>
 
@@ -32,5 +32,7 @@ LDADD+=	-lssl -lcrypto
 
 # Overflow that appears impossible
 COPTS.syslogd.c+=        ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.tls.c+= -Wno-error=deprecated-declarations
+COPTS.sign.c+= -Wno-error=deprecated-declarations
 
 .include <bsd.prog.mk>