From nobody Tue Mar 1 14:15:17 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 E8A7619F5A0F; Tue, 1 Mar 2022 14:15:17 +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 4K7K5d5vZpz3CLm; Tue, 1 Mar 2022 14:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646144117; 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=RYEbqsZw10l87PSVDDZ53SLVu6tkV7PTaqzkcZJVk00=; b=dXOKZ9FyzqVpGskckGfu3QnGox9CLbFqG92cfjaA70vw4KElgop6Kjq8KQ54x0xPZJoe+T PKPiHKaaHqTHXNu6fOfy/RuXLCAuO7tDALbQ1A0urTzeuxVXxAFFI/McMafVl783FZjyc+ FrSIiItbyg8aty90ZF+5/eZRCT5Qfy4ZXs9wYnfq5MF2yCQ3vd9OAfhTyePy/UOpVaS3Jk Ge6KCdLWOuIckD1ReSyT4mpthnp/zT0TNjGka/8zMpVOoFZDeJqpXcWKRXMmMQj+RHItW3 YSKiUvyRo2T9X+xeciOoD4xM0U6vZqc5tk+qzRW6g7jzCVU+wTX8Z3Sfb5n1EQ== 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 A6A7211285; Tue, 1 Mar 2022 14:15:17 +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 221EFHCI011614; Tue, 1 Mar 2022 14:15:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 221EFHIZ011613; Tue, 1 Mar 2022 14:15:17 GMT (envelope-from git) Date: Tue, 1 Mar 2022 14:15:17 GMT Message-Id: <202203011415.221EFHIZ011613@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: b4d94c7c3d86 - main - 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/main X-Git-Reftype: branch X-Git-Commit: b4d94c7c3d864775002f92322cc978bf522d27b2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646144117; 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=RYEbqsZw10l87PSVDDZ53SLVu6tkV7PTaqzkcZJVk00=; b=F1YcPBrXHy8/XgUH8kSdg23fha1RyjsXcUprPAZHJ4WYqh9a9jI26vWJN1iNUT6qwaJZq0 9OIJ7lrjFdm8ritQrNRMoErkTnPBLaCbyqQn3tE6Lzj0W2UrLpp/FfUc2TIpq933QYP5C3 9HstE23yEFP+3vj8EoOdkBUWufYoXV0VPQr++CAVE9G0tc5Gr60OcwBh9mzLxgWb5E/cnw 0avQYUrgGu8M7kTydZHgPbqOCtovClT9z6simd90QSUWyuLuWAK6Ns0eg6PyDmp/jv7CNh RHa3OnmJKIas4viFHXRUB+x6G1WF+qWAn7jqJTsLyA/Obv1nhAEYSuQGenuYsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646144117; a=rsa-sha256; cv=none; b=H6zgKkhX1neZdQIB9til2zNy5DAnMN98jBA+BT6/h09E8/KaYYN9RDp+ihLbqZnQhjIPSr u/pAgvRUGcYT3S/cK9W1aWR0rTU72TlsHq+FW2oFGEK6CIy3JWdMlxkiyUbB19NCH6GEhP S+0O4PYuPrNb0mihG+I8o+NnBRb58dIlhX3kMSvD3E9tdQvPCkS1IwUxC3hSZaN/PG3ViO IY89ykKyQUU1jUNd8+mZ0aHgcUIdeCvFFBnklqplAfRstD+fdq8TTpV1sffPuXzSK9XXbk q38/0zyPlTrJv0Fbh//KfNN90+LF7Nv/BgpZsGnEGiIHWa4eoywV5hbXmsfSSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=b4d94c7c3d864775002f92322cc978bf522d27b2 commit b4d94c7c3d864775002f92322cc978bf522d27b2 Author: Steve Wills AuthorDate: 2022-02-25 13:19:12 +0000 Commit: Fernando Apesteguía CommitDate: 2022-03-01 14:13:02 +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 --- 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 *);