From nobody Tue Jan 11 11:18:24 2022 X-Original-To: dev-commits-ports-main@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 437F81952729; Tue, 11 Jan 2022 11:18:25 +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 4JY7V86pr9z3LRB; Tue, 11 Jan 2022 11:18:24 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C6A6717D67; Tue, 11 Jan 2022 11:18:24 +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 20BBIOVW038585; Tue, 11 Jan 2022 11:18:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BBIO6R038584; Tue, 11 Jan 2022 11:18:24 GMT (envelope-from git) Date: Tue, 11 Jan 2022 11:18:24 GMT Message-Id: <202201111118.20BBIO6R038584@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: bc5c2f7d9852 - main - www/nginx-devel: able to build with security/openssl-quictls List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc5c2f7d9852ae41cd31976ba18ae3d16cace055 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641899905; 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=aFoiOb4+UrEaufhEm4xOSymJy8Dvzg+fLIfRd1HQRdM=; b=GLl34VviObp6ABzzcfc7qcWrp4oLTucSEjjHU9xh3yxBvWeGaJRQr2HUOv2Lx+drazLyZu fAdYYOKR9XJ8Duk1g8CSuCdx591qaJQLrGlGK9EMjGS+S8IvfduMCq8+sevnkVlhJs9OOC ndnaWTzoRYQHFQU1gTPiUs09vrEWf6C00X78atTytM7vbKpqe7Vy+Wy2dzl2Re+xNOyYSI u6LG6Ups0kLlkLk1qTFnZQF6WkxN/c0gcZDchL0xtaW75BYuEfXH/drTcD3B2gPCBOAk4O 9Kpt2K9TE/Cnev8bYQp6ONy0gaURKoaWub3KVKw079A2/AYa8TCvn15VixbgJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641899905; a=rsa-sha256; cv=none; b=cp+60jiLFOYf3cYcQy3PwVJcuT7eMzLqPTPDuaCd5gaOrpEKBrCxN2yDI2RzK47EooLQ0h ae7lMcJr6fmbCb8AsWdd8S+MGPi6uEWCybzFY09VfMU6IKNX9MyOVpsheKN6W6Fdi3NEDD 7VY/yuGEb7IOMvctzrO7K6MNknyYqwTGa9B0cb/xbePsNva/7ip6YIWMsZ/8xdvB6g6KXO CNeq+jJvGo05hwG872qtdkjWU7zUQGv9tKH1OsVHOnZjg472rkDz0BGNPBCKWCSPLA49i4 84ouyDsf+9EwgaVGREv4w2LHQlN+FXjwGCMJMdNj5utitUv/dfNCRcztPsVYFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=bc5c2f7d9852ae41cd31976ba18ae3d16cace055 commit bc5c2f7d9852ae41cd31976ba18ae3d16cace055 Author: Sergey A. Osokin AuthorDate: 2022-01-11 11:14:28 +0000 Commit: Sergey A. Osokin CommitDate: 2022-01-11 11:18:16 +0000 www/nginx-devel: able to build with security/openssl-quictls While I'm here fix a typo in a start-up template, introduced in c42df2fcbbeccbfb2d57f4d6d7558493d512d732. Bump PORTREVISION. Differential Revision: https://reviews.freebsd.org/D33773 Reviewed by: pluknet --- www/nginx-devel/Makefile | 22 ++++++++++++++++------ www/nginx-devel/Makefile.options.desc | 4 +++- www/nginx-devel/files/nginx.in | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index f691a8f93632..8560909b0327 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME?= nginx PORTVERSION= 1.21.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -72,7 +72,7 @@ OPTIONS_GROUP_HTTPGRP= GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \ HTTP_CACHE HTTP_DAV HTTP_DEGRADATION HTTP_FLV HTTP_GUNZIP_FILTER \ HTTP_GZIP_STATIC HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL \ HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \ - HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV3 + HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV3 HTTPV3_BORING HTTPV3_QTLS OPTIONS_GROUP_MAILGRP= MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL @@ -170,13 +170,17 @@ HTTP_XSLT_USE= GNOME=libxml2,libxslt HTTP_XSLT_VARS= DSO_BASEMODS+=http_xslt_module HTTPV2_IMPLIES= HTTP_SSL HTTPV2_CONFIGURE_ON= --with-http_v2_module -HTTPV3_BUILD_DEPENDS= ${LOCALBASE}/bin/bssl:security/boringssl -HTTPV3_RUN_DEPENDS= ${LOCALBASE}/bin/bssl:security/boringssl -HTTPV3_CONFIGURE_ON= --with-http_ssl_module \ - --build=nginx-quic \ +HTTPV3_CONFIGURE_ON= --build=nginx-quic \ --with-stream_quic_module \ --with-http_v3_module HTTPV3_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-httpv3:-p1 +HTTPV3_BORING_BUILD_DEPENDS= ${LOCALBASE}/bin/bssl:security/boringssl +HTTPV3_BORING_RUN_DEPENDS= ${LOCALBASE}/bin/bssl:security/boringssl +HTTPV3_BORING_IMPLIES= HTTPV3 +HTTPV3_BORING_PREVENTS= HTTPV3_QTLS +HTTPV3_QTLS_BUILD_DEPENDS= ${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls +HTTPV3_QTLS_RUN_DEPENDS= ${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls +HTTPV3_QTLS_IMPLIES= HTTPV3 MAIL_VARS= DSO_BASEMODS+=mail MAIL_IMAP_CONFIGURE_OFF= --without-mail_imap_module MAIL_POP3_CONFIGURE_OFF= --without-mail_pop3_module @@ -234,6 +238,12 @@ IGNORE= required at least PCRE_ONE or PCRE_TWO \ to be defined. Please do 'make config' again .endif +.if ${PORT_OPTIONS:MHTTPV3} && \ + (empty(PORT_OPTIONS:MHTTPV3_BORING) && empty(PORT_OPTIONS:MHTTPV3_QTLS)) +IGNORE= required HTTPV3_BORING or HTTPV3_QTLS \ + to be defined. Please do 'make config' again +.endif + .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5} && (empty(PORT_OPTIONS:MGSSAPI_HEIMDAL) && empty(PORT_OPTIONS:MGSSAPI_MIT)) IGNORE= required at least GSSAPI_HEIMDAL or \ GSSAPI_MIT to be defined. Please do \ diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc index b39e871d0a9b..b6067fe10827 100644 --- a/www/nginx-devel/Makefile.options.desc +++ b/www/nginx-devel/Makefile.options.desc @@ -22,7 +22,9 @@ GSSAPI_DESC= GSSAPI implementation (imply HTTP_AUTH_KRB5) HEADERS_MORE_DESC= 3rd party headers_more module HTTPGRP_DESC= Modules that require HTTP module HTTPV2_DESC= Enable HTTP/2 protocol support (SSL req.) -HTTPV3_DESC= Enable HTTP/3 protocol support (BoringSSL req.) +HTTPV3_DESC= Enable HTTP/3 protocol support +HTTPV3_BORING_DESC= Use security/boringssl +HTTPV3_QTLS_DESC= Use security/openssl-quictls HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module HTTP_ADDITION_DESC= Enable http_addition module HTTP_AUTH_DIGEST_DESC= 3rd party http_authdigest module diff --git a/www/nginx-devel/files/nginx.in b/www/nginx-devel/files/nginx.in index 7ab503d01820..652468a97596 100644 --- a/www/nginx-devel/files/nginx.in +++ b/www/nginx-devel/files/nginx.in @@ -25,7 +25,7 @@ # nginx_http_accept_enable (bool): Set to "NO" by default. # Set to yes to check for accf_http kernel module # on start-up and load if not loaded. -# nginx_sig_stop (str): Default to "-TERM" +# nginx_sig_stop (str): Default to "TERM" . /etc/rc.subr