From nobody Fri Aug 09 18:31:24 2024 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 4WgXYS49HZz5ScZN; Fri, 09 Aug 2024 18:31:24 +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 4WgXYS1LbKz4JQZ; Fri, 9 Aug 2024 18:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723228284; 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=kdSyUw0Ob/QZMEBxwHkhhgwXcqdLUoJoMWeJruMwrrA=; b=g/YWhTTul7i7Z0NeJHNyNUDmZA0FnEPX/xCDyyP0FOi0s04CWklfpE4NdSTGFy0K5/LDtL hY/CMRtjN2uesYSwnOx8Bg1viuDSCU79LLvjWnlMu6lFsVnqZ18S045V6+Sm3Jl/vTrlBX tVQebbuGA9nvIoovjtKh1bSYinP7oiDcZt3cRsG+V7KeSLR2is9EGBcrv5okTU6eXpmdbs bXD8i5IclSGPtzcrjtdIT+jStFmiMHPSY4wZg/3sIl8rSrZGpwXuGEdcEXvbQRwr97PMGK fhqt/0Colfqmo2NGhfdiMX/PQJcPWnOFE/NHVtpd5s9XktwxB36bmBy5lR4/kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723228284; a=rsa-sha256; cv=none; b=IIhWVIi1oeQBm+n1xJibkOgQszHUH7tvrS3RGpQ9SpAxAaTBB4phhEZtSVJnmm7cCw6Nse 4/SBQrwJwJuBWZOZo6Sq3Zs44wqpSnfgieM+Q0NCNu67d7fuIHiOgyAH5B587PL6HYT844 U0202RndKwhSGRMGaMHI5r8lmWjrQsLpj8S0BuDoW1+VdX2EBoI0h2d6BAUZcO3+Ku2DWB JjKOZNbAs/RdCagMVbsK/Y8t0ujLgmx0+ynqiOQbJe23qSG+J8t5heWeoVU2DKSdnHTnAB Lyhhl5UIvnz3Qdi84QHyvdmr4bbrp+T7uMuuiu6A0fpxQwiP6KRmRQXSbBKEGw== 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=1723228284; 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=kdSyUw0Ob/QZMEBxwHkhhgwXcqdLUoJoMWeJruMwrrA=; b=e8PO+Ezry+HocasemWiUySEJvMdViFMMMCaN8504IVXjsbTHDZwmyzcGUOjcCK3ri7z34k wBVCdqugbytSazBfeyDenwB5L9W3WKr/ihE2VeSGlOp3R22gREgEe+SSBlVqknReZ2uaMS EJ/UMbrUwMyyyq92muYKG2pYbxAm2QV0GntQGmaZrp8wqEMOEIh7P+DKYl0umEdmpcmDav DoWmtA67zbcyJSOhZXwsobArR8AVCQCQ548q8UViwQ2zyJkDjLaMepUyPwCXV7pdc4BrmN 1fDJeSZYzt8BIRKdk4T6QAG9EwA32xY7S3fXPpoVRxmJmhpAJVmaK8UvOYo76w== 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 4WgXYS0z5MzS2t; Fri, 9 Aug 2024 18:31:24 +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 479IVO8U097323; Fri, 9 Aug 2024 18:31:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 479IVOPa097320; Fri, 9 Aug 2024 18:31:24 GMT (envelope-from git) Date: Fri, 9 Aug 2024 18:31:24 GMT Message-Id: <202408091831.479IVOPa097320@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Florian Smeets Subject: git: 577ee27d110a - main - security/amavisd-new: service jails readiness + fixes 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: flo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 577ee27d110a26cc4140b4b86e0db68b1a273f9f Auto-Submitted: auto-generated The branch main has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=577ee27d110a26cc4140b4b86e0db68b1a273f9f commit 577ee27d110a26cc4140b4b86e0db68b1a273f9f Author: Alexander Leidinger AuthorDate: 2024-08-08 22:08:35 +0000 Commit: Florian Smeets CommitDate: 2024-08-09 18:31:03 +0000 security/amavisd-new: service jails readiness + fixes Rename rc script to comply to the rc scripting recommendations (netchild) Make script service jail aware (netchild) Remove amavis-milter.in that should most likely have been removed with 4c8100486c3b ~18 years ago, the script hasn't been part of the package for a long time (flo) PR: 280139 --- UPDATING | 15 ++++++++++++ security/amavisd-new/Makefile | 6 ++--- security/amavisd-new/files/amavis-milter.in | 27 ---------------------- ...amavis-p0fanalyzer.in => amavis_p0fanalyzer.in} | 1 + security/amavisd-new/files/amavisd.in | 1 + .../files/{amavisd-snmp.in => amavisd_snmp.in} | 1 + 6 files changed, 21 insertions(+), 30 deletions(-) diff --git a/UPDATING b/UPDATING index 2f7843e2c92d..424d99d37bf7 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,21 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20240809: + AFFECTS: sysutils/amavisd-new + AUTHOR: netchildFreeBSD.org + + The start scripts of amavisd have been renamed to amavisd_snmp and + amavis_p0fanalyzer for improved compatibility with other parts of the + system. The automatic start at boot (rc.conf variable settings) is + not affected, but if you have some other automatism you may want to + change + ".../etc/rc.d/amavisd-snmp" to ".../etc/rc.d/amavisd_snmp" + ".../etc/rc.d/amavis-p0fanalyzer" to ".../etc/rc.d/amavis-p0fanalyzer" + or + "service amavisd-snmp ..." to "service amavisd_snmp ..." + "service amavis-p0fanalyzer ..." to "service amavis_p0fanalyzer ..." + 20240727: AFFECTS: lang/php8[13] AUTHOR: netchildFreeBSD.org diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 370705793f7b..fcc8528f26db 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,6 +1,6 @@ PORTNAME= amavisd-new DISTVERSION= 2.12.3 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= security @@ -99,7 +99,7 @@ RUN_DEPENDS+= p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 .endif .if ${PORT_OPTIONS:MSNMP} && ${PORT_OPTIONS:MBDB} -USE_RC_SUBR+= amavisd-snmp +USE_RC_SUBR+= amavisd_snmp RUN_DEPENDS+= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP .endif @@ -134,7 +134,7 @@ RUN_DEPENDS+= spamassassin>=0:mail/spamassassin .if ${PORT_OPTIONS:MP0F} RUN_DEPENDS+= ${LOCALBASE}/bin/p0f:net-mgmt/p0f -USE_RC_SUBR+= amavis-p0fanalyzer +USE_RC_SUBR+= amavis_p0fanalyzer .else AMAVIS_NOP0F= "@comment " .endif diff --git a/security/amavisd-new/files/amavis-milter.in b/security/amavisd-new/files/amavis-milter.in deleted file mode 100644 index 6e18196793a6..000000000000 --- a/security/amavisd-new/files/amavis-milter.in +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -# PROVIDE: amavis_milter -# REQUIRE: amavisd -# BEFORE: mail -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf to enable amavis-milter: -# -# amavis_milter_enable="YES" -# - -. /etc/rc.subr - -name=amavis_milter -rcvar=amavis_milter_enable - -load_rc_config $name - -: ${amavis_milter_enable:=NO} -: ${amavis_milter_flags=-D -p %%AMAVISDIR%%/amavis-milter.sock} -: ${amavis_milter_user=%%AMAVISUSER%%} - -command=%%PREFIX%%/sbin/amavis-milter -required_files=%%PREFIX%%/etc/amavisd.conf - -run_rc_command $1 diff --git a/security/amavisd-new/files/amavis-p0fanalyzer.in b/security/amavisd-new/files/amavis_p0fanalyzer.in similarity index 95% rename from security/amavisd-new/files/amavis-p0fanalyzer.in rename to security/amavisd-new/files/amavis_p0fanalyzer.in index 69de7d0445d8..23da95a938d7 100644 --- a/security/amavisd-new/files/amavis-p0fanalyzer.in +++ b/security/amavisd-new/files/amavis_p0fanalyzer.in @@ -16,6 +16,7 @@ load_rc_config $name : ${amavis_p0fanalyzer_pidfile1=/var/run/p0fanalyzer1.pid} : ${amavis_p0fanalyzer_pidfile2=/var/run/p0fanalyzer2.pid} : ${amavis_p0fanalyzer_flags=2345} +: ${amavis_p0fanalyzer_scj_options:="net_basic"} start_cmd=p0fanalyzer_start stop_cmd=p0fanalyzer_stop diff --git a/security/amavisd-new/files/amavisd.in b/security/amavisd-new/files/amavisd.in index d002b287f533..c432e88bf53d 100644 --- a/security/amavisd-new/files/amavisd.in +++ b/security/amavisd-new/files/amavisd.in @@ -28,6 +28,7 @@ extra_commands=reload start_precmd=start_precmd stop_postcmd="rm -f $pidfile" reload_cmd="$command reload" +: ${amavisd_svcj_options:="net_basic"} # svcjs may be incompatible with amavisd_ram # possible values include: amavisd_ram="512m" diff --git a/security/amavisd-new/files/amavisd-snmp.in b/security/amavisd-new/files/amavisd_snmp.in similarity index 93% rename from security/amavisd-new/files/amavisd-snmp.in rename to security/amavisd-new/files/amavisd_snmp.in index c08f32f219ed..a9126988fac2 100644 --- a/security/amavisd-new/files/amavisd-snmp.in +++ b/security/amavisd-new/files/amavisd_snmp.in @@ -21,6 +21,7 @@ load_rc_config $name : ${amavisd_snmp_dbdir=%%AMAVISDIR%%/db} # log_level 0..5, default 0 : ${amavisd_snmp_loglevel=0} +: ${amavisd_snmp_svcj_options:="net_basic"} command=%%PREFIX%%/sbin/amavisd-snmp-subagent command_interpreter=%%PERL%%