From nobody Fri Aug 29 08:07:49 2025 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 4cCrVF3084z66Jv4; Fri, 29 Aug 2025 08:07:49 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCrVF2LXXz42g5; Fri, 29 Aug 2025 08:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756454869; 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=wNZRhTmNRC+Bt9ObI7yrDrLj1DgX2BlPPBdUa/hiwdo=; b=VRfWJN/FuABYgv7K+6oAaSTVyDhUMogGasPemLEFvlQIVqNvMnHSqVDc7QVTHluhroobtU xtwtvcC7ToxjLiCyg1Fsw3LFIT7HGj5kVpluUQUMos/1qEZp27WaAoY4oV2dqrbbp+r+Tm gJxXt8cQebBDWWn5v1agQZU3OaZ37GQY/RIYnFJU3MfV7fZ8Htv0XP6ZXqdlQIf2gpXtCd fTTeOwooySkm0UOIkFucRuO51Vv/xvFh63whLQpQ6wg0Kwzb+uCbuQN9qzlGSobOHgPIzH XAaHk3JvcEv8UsB8KaOh+NiG6tFlndOhdlREZGMuMabGV8x5aN6GOnqY1gDq6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756454869; 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=wNZRhTmNRC+Bt9ObI7yrDrLj1DgX2BlPPBdUa/hiwdo=; b=QvYmgbTiCGshYuEddIcCuM97tb9s30LgVcVgCqt6D8hVsmsWKM57cnSnzB43lirF4fwflL GzmE9ioRat4HLHQ4HPD7HaVR8KHApdE3hVbziNHsyyScSjPHU+6ISbodITQYFJvslMDKRf FR/R2CDU0VO7mzGzmHKq3WCjCDz+7OX4Nfk76wIg4HOregpBTbm+pHe/fd5wYUg6F1uqax VM1JN40hxsLYOLgcK217Nko7oZcl5AcBOCJ6R8+A27F40lBpZWJZM8N7iD81DNY6WIlTQ5 izD/PLsCx9Qtj1afxevcqV6p7MiA6aDVKH/LDQJ7KmhElrzOzVSjXyjdY394KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756454869; a=rsa-sha256; cv=none; b=SJL5yUASl0ZEt2FUOU+XJ1NO7ID/lI1g39AL014CMawzhPe3sFAbGjw8+B1xd99fzBxxI8 ZS+CrYVWfUaXj92GQXSFzoBKW506XxzSZJVzbjEX7B3zyUSmzaGeBDMXSPLGC1k43WA6TJ 9pwjkQmWWWM9blx1c5T8AVdyi0epHXWaDaQ+jUO96lrGHmQd9UItVdl35g00AYXe+y6Iev xO3Ly9akvuNz/xlGwRHFKrWPBAM99nUsCkEKJlHkoJLrwVw9g/4d0RXvfm7XXDBiJfKviz v5Gmffb9L040T4dX1TZX8bLwW+QetXKLHnRp1SjALQddabBH2VwVyI7R30dC7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cCrVF1w2SzVmh; Fri, 29 Aug 2025 08:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57T87n6c091371; Fri, 29 Aug 2025 08:07:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57T87nSb091368; Fri, 29 Aug 2025 08:07:49 GMT (envelope-from git) Date: Fri, 29 Aug 2025 08:07:49 GMT Message-Id: <202508290807.57T87nSb091368@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexander Leidinger Subject: git: a3fbcaec5398 - main - www/apache24: make the start script service jails ready 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: netchild X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3fbcaec539824a635d1bd53a2508fafae06ec6a Auto-Submitted: auto-generated The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/ports/commit/?id=a3fbcaec539824a635d1bd53a2508fafae06ec6a commit a3fbcaec539824a635d1bd53a2508fafae06ec6a Author: Alexander Leidinger AuthorDate: 2025-08-29 07:44:59 +0000 Commit: Alexander Leidinger CommitDate: 2025-08-29 08:07:34 +0000 www/apache24: make the start script service jails ready The setup I've chosen is to allow ipv4/ipv6 access. It does not allow to use sysv IPC in a jail. If you want to use this possibility, the config would need to be changed to "net_basic sysvipc" instead. More advanced use cases may need different service jail options. The config can be overridden in rc.conf. See also: https://docs.freebsd.org/en/books/handbook/jails/#service-jails https://docs.freebsd.org/en/articles/rc-scripting/#rcng-service-jails Some notes: - There are special apache24_limits_* stuff which is different from the name_limits stuff as part of the rc framework. - The limits part in the precmd will probably not work in a service jail, as the start command will be executed in a jail and the precmd outside the jail. - While the patch is taking the profiles into account, it may fail when the jail is started, as the name of the service jail is derived from the name of the rc script (assuming "profiles" means different instances of apache are started for each profile). The tomcat/oauth2-proxy/openhab ports use a way to have different instances of the software running in parallel which is based upon the name of the rc script (via links to the original rc script). That way works well with service jails. Approved by: maintainer timeout PR: 279494 --- www/apache24/Makefile | 1 + www/apache24/files/apache24.in | 3 +++ 2 files changed, 4 insertions(+) diff --git a/www/apache24/Makefile b/www/apache24/Makefile index d356e4acadd4..ab878e5db287 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -1,5 +1,6 @@ PORTNAME= apache24 PORTVERSION= 2.4.65 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} diff --git a/www/apache24/files/apache24.in b/www/apache24/files/apache24.in index 0b9c4bd55ba6..d9ced6f55d73 100644 --- a/www/apache24/files/apache24.in +++ b/www/apache24/files/apache24.in @@ -43,6 +43,8 @@ pidfile="${_pidprefix}.pid" required_files=%%PREFIX%%/etc/apache24/httpd.conf envvars="%%PREFIX%%/sbin/envvars" +: ${apache24_svcj_options:="net_basic"} + [ -z "$apache24_enable" ] && apache24_enable="NO" [ -z "$apache24limits_enable" ] && apache24limits_enable="NO" [ -z "$apache24limits_args" ] && apache24limits_args="-e -C daemon" @@ -83,6 +85,7 @@ if [ -n "$2" ]; then eval command="\${apache24_${profile}_command:-${command}}" eval pidfile="\${apache24_${profile}_pidfile:-${pidfile}}" eval apache24_envvars="\${apache24_${profile}_envvars:-${envvars}}" + eval apache24_svcj_options="\${apache24_${profile}_svcj_options:-${apache24_svcj_options}}" apache24_flags="-f ${apache24_configfile} -c \"PidFile ${pidfile}\" ${apache24_flags}" else echo "$0: extra argument ignored"