From nobody Tue Mar 01 14:21:32 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3886019F7783; Tue, 1 Mar 2022 14:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K7KDs10V0z3DDs; Tue, 1 Mar 2022 14:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646144493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e/c6EKj8PQFuPb+gf9b9v8RQnz319tRR07lj4P0RwzU=; b=P0FAb0MIxISOcuTzCG0RtXyb4Go3CDJB1L/VH8y4ioFvgVGQO7Rsu1XGqhp4YCkkE1ZDxU Uifxu0E7aAoldXRFhPYR9hXnpRfWU5TYMv55ET88bpZWbvHNv1y4XL3SRXkjtLvbCmB8+5 fjwMfJP8i6CR7y7u1n1w1tF0swv1KwOARpjHhJDvzT6ntQX7PBDt5PkjLtuejaxzSR/Ram nTYTa8HoOmBmEAyUSKkxU5pA1MWW15X8yGwIGbpkGL0TBl9te550ERQLdg4mS7KuVN95LB qJpJ8dDiWzJuwkMrjScjc/WFHXyHDO1tEXGguaiaSAyxXHg9rIyVzkCM7BvXFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 022B311277; Tue, 1 Mar 2022 14:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 221ELWpg023550; Tue, 1 Mar 2022 14:21:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 221ELWcA023549; Tue, 1 Mar 2022 14:21:32 GMT (envelope-from git) Date: Tue, 1 Mar 2022 14:21:32 GMT Message-Id: <202203011421.221ELWcA023549@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: ef3410d93b5d - 2022Q1 - net/relayd: fix build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: ef3410d93b5d57d467404236e8731e6a2da6852c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646144493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e/c6EKj8PQFuPb+gf9b9v8RQnz319tRR07lj4P0RwzU=; b=jdgyHiAx9fI+gNfG3ys/539LAgdeGsftswoUNQgXIp/47aGavHABHwsd1F4TLSin5gqLW5 xGWjnNTM+KX2FOdR3SsZYk8P0x0QEF0670CmEcFNKDQ17JkNQXBz8InHFvuvOMwM+1kKOk 8eeQhKvH1VebMoiNn+84ON2cEawtiAhDzhkXjzIZ8SMtH+Va5K6D3i5j/vmzVvy2NtLfjn Iih4Frqog4wKxZ5OEkm4kRHuXgf4/sLQigXL2LZdWJqKG8toUK+11LHi3oEdOPwqR5L+0L FWkCUgpcvDKsQ+IeYkd1bFOE2Vsg32LOS87wwWO53pJoXs+ci5WOVnv3s7QJYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646144493; a=rsa-sha256; cv=none; b=Zu9YYDp2WpKWwPjnwjQKhtsgZJJ2S4Fn61c+odSnV2FMWHDFN6s0k3op4vU2LSksjAZGUt 4f7HoXHO2P1YwuV8ioZsc6uJj/5o1O5GgVV7ZR9ijWqauauKNkrfPvRLq6Q9ycavTJW0Rs bWsPuQAl7IopAyBDSHjIYENN8PIVt/k0o/VuIPiEWe7aYihe/UxoOHyZ+SGy9wiEdX+KN9 zecz2sk5hKHyFTrZJmqDxI/T1JSYpqb9IBo4tIcCiziFcmnxbDiIVD5eWoIW0WeKSIXZ9z Frje38x4T2K/w+Dp2Sjgq0tDfjgNGt97gs0H5YqcU86m7Y299r8Lnzy3UQ/BHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef3410d93b5d57d467404236e8731e6a2da6852c commit ef3410d93b5d57d467404236e8731e6a2da6852c Author: Steve Wills AuthorDate: 2022-02-25 13:19:12 +0000 Commit: Fernando Apesteguía CommitDate: 2022-03-01 14:15:04 +0000 net/relayd: fix build While here, pet linters. PR: 262004 Reported by: swills@FreeBSD.org Approved by: koue@chaosophia.net (maintainer) MFH: 2022Q1 build fix (cherry picked from commit b4d94c7c3d864775002f92322cc978bf522d27b2) --- net/relayd/Makefile | 12 ++++++------ net/relayd/files/patch-relayd_Makefile | 12 ++++++++++++ net/relayd/files/patch-relayd_relay.c | 18 ++++++++++++++++++ net/relayd/files/patch-relayd_relayd.h | 11 +++++++++++ 4 files changed, 47 insertions(+), 6 deletions(-) diff --git a/net/relayd/Makefile b/net/relayd/Makefile index decfb1e6970e..e9cd92faecd0 100644 --- a/net/relayd/Makefile +++ b/net/relayd/Makefile @@ -8,23 +8,23 @@ COMMENT= OpenBSD relay daemon LICENSE= ISCL -GH_ACCOUNT= mmatuska - USES= ssl uidfix USE_GITHUB= yes +GH_ACCOUNT= mmatuska + USE_RC_SUBR= relayd -WRKSRC_SUBDIR= src/usr.sbin +MAKE_ARGS+= BINDIR=${PREFIX}/sbin \ + MANDIR=${PREFIX}/man/man CFLAGS+= -Wall -MAKE_ARGS+= BINDIR=${PREFIX}/sbin \ - MANDIR=${PREFIX}/man/man +WRKSRC_SUBDIR= src/usr.sbin USERS= _relayd GROUPS= _relayd post-install: - @${INSTALL_DATA} ${WRKSRC}/../etc/relayd.conf \ + ${INSTALL_DATA} ${WRKSRC}/../etc/relayd.conf \ ${STAGEDIR}${PREFIX}/etc/relayd.conf.sample .include diff --git a/net/relayd/files/patch-relayd_Makefile b/net/relayd/files/patch-relayd_Makefile new file mode 100644 index 000000000000..08b89f0f61c9 --- /dev/null +++ b/net/relayd/files/patch-relayd_Makefile @@ -0,0 +1,12 @@ +--- relayd/Makefile.orig 2014-08-10 20:08:47 UTC ++++ relayd/Makefile +@@ -28,8 +28,7 @@ SRCS+= parse.y \ + relay_udp.c \ + relayd.c \ + shuffle.c \ +- ssl.c \ +- ssl_privsep.c ++ ssl.c + + .PATH: ${.CURDIR}/../../../libevent + SRCS+= buffer.c \ diff --git a/net/relayd/files/patch-relayd_relay.c b/net/relayd/files/patch-relayd_relay.c index 42c6745bf485..cb0c2378a152 100644 --- a/net/relayd/files/patch-relayd_relay.c +++ b/net/relayd/files/patch-relayd_relay.c @@ -1,5 +1,23 @@ --- relayd/relay.c.orig 2014-08-10 20:08:47 UTC +++ relayd/relay.c +@@ -2097,7 +2097,7 @@ relay_ssl_ctx_create(struct relay *rlay) + /* Verify the server certificate if we have a CA chain */ + if ((rlay->rl_conf.flags & F_SSLCLIENT) && + (rlay->rl_ssl_ca != NULL)) { +- if (!ssl_ctx_load_verify_memory(ctx, ++ if (!SSL_CTX_load_verify_mem(ctx, + rlay->rl_ssl_ca, rlay->rl_conf.ssl_ca_len)) + goto err; + SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, NULL); +@@ -2107,7 +2107,7 @@ relay_ssl_ctx_create(struct relay *rlay) + return (ctx); + + log_debug("%s: loading certificate", __func__); +- if (!ssl_ctx_use_certificate_chain(ctx, ++ if (!SSL_CTX_use_certificate_chain_mem(ctx, + rlay->rl_ssl_cert, rlay->rl_conf.ssl_cert_len)) + goto err; + @@ -2716,12 +2716,12 @@ relay_load_certfiles(struct relay *rlay) return (-1); diff --git a/net/relayd/files/patch-relayd_relayd.h b/net/relayd/files/patch-relayd_relayd.h index a3b511623af1..cbde779fb369 100644 --- a/net/relayd/files/patch-relayd_relayd.h +++ b/net/relayd/files/patch-relayd_relayd.h @@ -49,3 +49,14 @@ /* Attach the control socket to the following process */ #define PROC_CONTROL PROC_PFE +@@ -1242,10 +1252,6 @@ int ssl_load_pkey(const void *, size_t, char *, off_t + X509 **, EVP_PKEY **); + int ssl_ctx_fake_private_key(SSL_CTX *, const void *, size_t, + char *, off_t, X509 **, EVP_PKEY **); +- +-/* ssl_privsep.c */ +-int ssl_ctx_use_certificate_chain(SSL_CTX *, char *, off_t); +-int ssl_ctx_load_verify_memory(SSL_CTX *, char *, off_t); + + /* ca.c */ + pid_t ca(struct privsep *, struct privsep_proc *);