From nobody Wed Jan 05 22:30:57 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 BC3AF193CA43; Wed, 5 Jan 2022 22:30:57 +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 4JTkhx2C06z3Qld; Wed, 5 Jan 2022 22:30:57 +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 2BA47149B4; Wed, 5 Jan 2022 22:30:57 +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 205MUv6d007185; Wed, 5 Jan 2022 22:30:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 205MUv6M007184; Wed, 5 Jan 2022 22:30:57 GMT (envelope-from git) Date: Wed, 5 Jan 2022 22:30:57 GMT Message-Id: <202201052230.205MUv6M007184@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: c42df2fcbbec - main - www/nginx-devel: able to customize the stop signal 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: c42df2fcbbeccbfb2d57f4d6d7558493d512d732 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641421857; 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=dm1F/ihy6KkSZoTYnbXPSHbkn6woakYsBOEwZRuOcMY=; b=mmFosY6CBYM1Cy3fktilsNSm2JyWaybE9y9w+SzgUDBc12AviAfAhgM2NeZ5dfm3lZRQjj z5OYmdG4BkYZCqe7SgApCSWhKPuMxJvf/Fht74tP0uLhpRKTw/ucWB7Cm2PgNXRt3a/yTc e6tOqxdIkhNr9MdUVvUfGEoLuJKuIJ8JYzgu2mXpO7K/4tw/9ggcd1nRkbXu9kTDC9Segm dpLGVJDw4MamH3jUD4TV/7pvEkdaMH5tt2F4NtmBDcGP4kqvtLblKqHds+LJ6D+lZXz76N 7AJVJCoZK5l+JCPkMmO4WtAhrCpgmA60E0kyd4Zp1tp/cZNQP4lIZ0FdgZ0CPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641421857; a=rsa-sha256; cv=none; b=KuIBCSEOyQ1pM8JBdtzV+Bz4jZmPDWg/eTdx2sWJJsF7766b0i6nEnbzmIe3W8qyC6D5AT 7GzJBtGxppJA0bl9aRt91O8pZXq7gagju1XQky8wznYjzDHM32IBp1054vuQBAKUBj4D+a tDJZ8pXMjonEdi0SjWOH2ECkCdvXCHW1lmlNUoKi2fGojpiZ0RlwAbn5+eR2sD8Q6FbJpU HE9/pg9S7FV8ZFYI0Sx+sXXEmNs0BtTaOW7mzE+5Epqs98VddO5fCWkAKtefAdsTz/U9P5 OQ7GcqjAqmxszKewjK1HFLTasatMkVzXCzzqMMjQfWmUABwuK7Y0QvWHnhcwfA== 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=c42df2fcbbeccbfb2d57f4d6d7558493d512d732 commit c42df2fcbbeccbfb2d57f4d6d7558493d512d732 Author: Sergey A. Osokin AuthorDate: 2022-01-05 22:29:32 +0000 Commit: Sergey A. Osokin CommitDate: 2022-01-05 22:30:52 +0000 www/nginx-devel: able to customize the stop signal Bump PORTREVISION. PR: 254962 --- www/nginx-devel/Makefile | 2 +- www/nginx-devel/files/nginx.in | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 226d737b15b1..8bb72b3bc925 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME?= nginx PORTVERSION= 1.21.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa diff --git a/www/nginx-devel/files/nginx.in b/www/nginx-devel/files/nginx.in index 379229c45d0b..7ab503d01820 100644 --- a/www/nginx-devel/files/nginx.in +++ b/www/nginx-devel/files/nginx.in @@ -25,13 +25,15 @@ # 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" . /etc/rc.subr name="nginx" rcvar=nginx_enable -start_precmd="nginx_precmd" +start_precmd="nginx_prestart" +stop_precmd="nginx_prestop" restart_precmd="nginx_checkconfig" reload_precmd="nginx_checkconfig" configtest_cmd="nginx_checkconfig" @@ -131,7 +133,7 @@ nginx_upgrade() run_rc_command ${rc_prefix}reload $rc_extra_args || return 1 } -nginx_precmd() +nginx_prestart() { if checkyesno nginx_http_accept_enable then @@ -148,4 +150,9 @@ nginx_precmd() fi } +nginx_prestop() +{ + sig_stop="${nginx_sig_stop:-TERM}" +} + run_rc_command "$1"