From nobody Tue Oct 12 22:52:38 2021 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 12676180DAF0; Tue, 12 Oct 2021 22:52:39 +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 4HTWCB6gZjz4cTb; Tue, 12 Oct 2021 22:52:38 +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 BCD981CE10; Tue, 12 Oct 2021 22:52:38 +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 19CMqcGV026329; Tue, 12 Oct 2021 22:52:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19CMqcx6026328; Tue, 12 Oct 2021 22:52:38 GMT (envelope-from git) Date: Tue, 12 Oct 2021 22:52:38 GMT Message-Id: <202110122252.19CMqcx6026328@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 5a0478bf4034 - main - www/lighttpd: fix regression on service restart 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a0478bf403492de3669d19eba56347939bef24a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=5a0478bf403492de3669d19eba56347939bef24a commit 5a0478bf403492de3669d19eba56347939bef24a Author: Piotr Kubaj AuthorDate: 2021-10-12 22:49:58 +0000 Commit: Piotr Kubaj CommitDate: 2021-10-12 22:49:58 +0000 www/lighttpd: fix regression on service restart Problem: Performing sanity check on lighttpd configuration: lighttpd not running? (check /var/run/lighttpd.pid). Starting lighttpd. 2021-10-12 23:02:07: (network.c.419) can't bind to socket: 0.0.0.0:80: Address already in use /usr/local/etc/rc.d/lighttpd: WARNING: failed to start lighttpd Workaround: Performing sanity check on lighttpd configuration: lighttpd not running? (check /var/run/lighttpd.pid). Starting lighttpd. Diagnostics: When "lighttpd_checkconfig" runs, the content of the pid file is removed. PR: 259114 Submitted by: dinoex --- www/lighttpd/Makefile | 1 + www/lighttpd/files/lighttpd.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index 15be00d0567e..0787fb915951 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -2,6 +2,7 @@ PORTNAME?= lighttpd PORTVERSION= 1.4.60 +PORTREVISION= 1 CATEGORIES?= www MASTER_SITES?= https://download.lighttpd.net/lighttpd/releases-1.4.x/ diff --git a/www/lighttpd/files/lighttpd.in b/www/lighttpd/files/lighttpd.in index 3ea8749e615e..1894d95c50e4 100644 --- a/www/lighttpd/files/lighttpd.in +++ b/www/lighttpd/files/lighttpd.in @@ -47,7 +47,7 @@ fi command=%%PREFIX%%/sbin/lighttpd stop_postcmd=stop_postcmd -restart_precmd="lighttpd_checkconfig" +#restart_precmd="lighttpd_checkconfig" graceful_precmd="lighttpd_checkconfig" graceful_cmd="lighttpd_graceful" gracefulstop_cmd="lighttpd_gracefulstop"