From nobody Wed Jul 10 13:40:38 2024 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 4WJzWq101Lz5QV68; Wed, 10 Jul 2024 13:40: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WJzWp67pXz4L3j; Wed, 10 Jul 2024 13:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720618838; 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=v7C1ettcSflTSdAHyeQb5eNSiOe89tX1Hy4aLGChQog=; b=UAQEDDXnh90TKTX8CPyBo3PbjDYmoXGYSryp+S/ET+ee0SybN4XNQKzR4q4P2A4lUAkNaz 7FqThvqF2Dry/mxLaZ6nSC+WohiYBol8nb31jM6pGn0pfnmX/tEd/B5EYvXUo3D24dhhrr un3ZvtUW21dBfg960fx3MBwTpHJwPNTIROCvDQa48iHgzJSN+dBpkJd/nmARXLF4IDvlG7 fXVDbmUgDbIr8AdcKTjx14aWyap8+nzDfRotYLzDtZg7hHiVrLto+eynEfhBT82mOgVBR7 392RBHZVKwn7JnaovoDEAnqVQh1J2h7RtuX5a0ewQaf7miCupkAMdudH92Ce/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720618838; a=rsa-sha256; cv=none; b=OducJMP9bsfDMwXvDRRpx4wE8xkoBsfEudzpg2x0N6/Dy/GwFcO7qxCVVbFlCYo3tvVqLv IfdiRo5h0ADOcbNeoQ72i8r3IlIBvM/P0GCg4oFJGKQ5RNIQusySRIeW1D2ks2UbFp2OyC v93JvsQLRzu5+CjH3kkJBottGYaZnCWmo4YEnnHBoXqLGlFUZsqOXEeM1abV/DtwgKNjFU miJLhUaaa9sLYUht6XM7YXoGi28BZzgWm0i8zMgEYFkmvohp4cx9RCYDZ7NCvAiv0+3bMj 7T9bOXuv1wfQDTXGZJcl+E0Qi2Gq1pCC7371+eg58jxVTIBHAjjMrvdBVtN7pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720618838; 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=v7C1ettcSflTSdAHyeQb5eNSiOe89tX1Hy4aLGChQog=; b=mb47R5qoa4Qkmb1TN7PDsrhifya0/8/+ttCrRuQo2AfwOGm4sqHNuJsYGmSAIgInwpkA9F gHRzBVuM2YWEFuGAvub9sRJNG+e+jh+4e1pnp1OirE3fvAGrt8jaJsK4lztOeK/ib/UTx5 QTi4N7h81PikEfHsR6tbdgzErsztVZUBxbMuYe3fa0JPiM2vdkAgyJ2FbAhp2OR0Umgj7k 6xaD8YXwJ7yJq8/Mk7jb5zE013YGlT2GkLLUm/nWHzMh35lojrEZn98k5PfoCpuXqZ51C8 Li9umfBdgIMbyTtytxnVo2/qpd2+eeFZLJQx0jrldvhQ8+InHX/JnXO/SQDW9w== 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 4WJzWp5WbMzK8F; Wed, 10 Jul 2024 13:40:38 +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 46ADecHB019602; Wed, 10 Jul 2024 13:40:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46ADec9X019599; Wed, 10 Jul 2024 13:40:38 GMT (envelope-from git) Date: Wed, 10 Jul 2024 13:40:38 GMT Message-Id: <202407101340.46ADec9X019599@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: 73648ddbeca9 - main - ftp/vsftpd-ext: make the rc script service jails aware 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 73648ddbeca9d0d1d08e6c8c886ae136e94dc929 Auto-Submitted: auto-generated The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/ports/commit/?id=73648ddbeca9d0d1d08e6c8c886ae136e94dc929 commit 73648ddbeca9d0d1d08e6c8c886ae136e94dc929 Author: Alexander Leidinger AuthorDate: 2024-07-10 13:37:24 +0000 Commit: Alexander Leidinger CommitDate: 2024-07-10 13:39:46 +0000 ftp/vsftpd-ext: make the rc script service jails aware PR: 279642 Approved by: maintainer timeout (1 month) --- ftp/vsftpd-ext/Makefile | 2 +- ftp/vsftpd-ext/files/vsftpd.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ftp/vsftpd-ext/Makefile b/ftp/vsftpd-ext/Makefile index 92eac97bcddc..28e19b209263 100644 --- a/ftp/vsftpd-ext/Makefile +++ b/ftp/vsftpd-ext/Makefile @@ -1,6 +1,6 @@ PORTNAME= vsftpd-ext PORTVERSION= ${UPSTREAMVERSION}.${EXTVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ftp MASTER_SITES= http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/ PKGNAMESUFFIX?= ${SSL_SUFFIX}${PKGNAMESUFFIX2} diff --git a/ftp/vsftpd-ext/files/vsftpd.in b/ftp/vsftpd-ext/files/vsftpd.in index abcdeae7a8b4..e87b7e309ad0 100644 --- a/ftp/vsftpd-ext/files/vsftpd.in +++ b/ftp/vsftpd-ext/files/vsftpd.in @@ -24,6 +24,7 @@ rcvar=vsftpd_enable load_rc_config "$name" : ${vsftpd_enable:="NO"} +: ${vsftpd_svcj_options:="net_basic"} command="%%PREFIX%%/libexec/$name" required_files="%%PREFIX%%/etc/$name.conf"