git: 36e211c572f8 - main - security/{clamav,clamav-lts}: Fix filename of the rc script to comply to the rc scripting recommendations

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yasuhiro Kimura <yasu_at_FreeBSD.org>
Date: Thu, 12 Sep 2024 04:01:04 UTC
The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=36e211c572f8b975ec8852ec394e83005cbd6385

commit 36e211c572f8b975ec8852ec394e83005cbd6385
Author:     Alexander Leidinger <netchild@FreeBSD.org>
AuthorDate: 2024-07-05 08:20:03 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2024-09-12 03:59:14 +0000

    security/{clamav,clamav-lts}: Fix filename of the rc script to comply to the rc scripting recommendations
    
    PR:             280135
---
 UPDATING                                                | 17 +++++++++++++++++
 security/clamav-lts/Makefile                            |  6 +++---
 .../files/{clamav-clamd.in => clamav_clamd.in}          |  0
 .../files/{clamav-freshclam.in => clamav_freshclam.in}  |  0
 .../files/{clamav-milter.in => clamav_milter.in}        |  0
 security/clamav/Makefile                                |  6 +++---
 .../clamav/files/{clamav-clamd.in => clamav_clamd.in}   |  0
 .../files/{clamav-freshclam.in => clamav_freshclam.in}  |  0
 .../clamav/files/{clamav-milter.in => clamav_milter.in} |  0
 9 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/UPDATING b/UPDATING
index f72ab255b66e..a3176facc88e 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,23 @@ 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.
 
+20240912:
+  AFFECTS: security/clamav, security/clamav-lts
+  AUTHOR: netchildFreeBSD.org
+
+  The start scripts of clamav have been renamed to clamav_clamd,
+  clamav_freshclam and clamav_milter 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/clamav-clamd" to ".../etc/rc.d/clamav_clamd"
+    ".../etc/rc.d/clamav-freshclam" to ".../etc/rc.d/clamav_freshclam"
+    ".../etc/rc.d/clamav-milter" to ".../etc/rc.d/clamav_milter"
+  or
+    "service clamav-clamd ..." to "service clamav_clamd ..."
+    "service clamav-freshclam" to "service clamav_freshclam ..."
+    "service clamav-milter ..." to "service clamav_milter ..."
+
 20240907:
   AFFECTS: www/tt-rss
   AUTHOR: dereks@lifeofadishwasher.com
diff --git a/security/clamav-lts/Makefile b/security/clamav-lts/Makefile
index 27fcbaf402fd..e37ee4552d74 100644
--- a/security/clamav-lts/Makefile
+++ b/security/clamav-lts/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	clamav
 DISTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	https://www.clamav.net/downloads/production/
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 USES=		cmake cpe gnome iconv ncurses pkgconfig ssl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
-USE_RC_SUBR=	clamav-clamd clamav-freshclam
+USE_RC_SUBR=	clamav_clamd clamav_freshclam
 
 CMAKE_ARGS=	-DDATABASE_DIRECTORY:STRING=${_DBDIR} \
 		-DOPENSSL_CRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \
@@ -77,7 +77,7 @@ LHA_RUN_DEPENDS=		lha:archivers/lha
 .if !exists(/usr/lib/libmilter.so)
 MILTER_LIB_DEPENDS=		libmilter.so:mail/libmilter
 .endif
-MILTER_USE=			RC_SUBR=clamav-milter
+MILTER_USE=			RC_SUBR=clamav_milter
 .if !exists(/usr/lib/libmilter.so)
 MILTER_USE+=			localbase
 .endif
diff --git a/security/clamav-lts/files/clamav-clamd.in b/security/clamav-lts/files/clamav_clamd.in
similarity index 100%
rename from security/clamav-lts/files/clamav-clamd.in
rename to security/clamav-lts/files/clamav_clamd.in
diff --git a/security/clamav-lts/files/clamav-freshclam.in b/security/clamav-lts/files/clamav_freshclam.in
similarity index 100%
rename from security/clamav-lts/files/clamav-freshclam.in
rename to security/clamav-lts/files/clamav_freshclam.in
diff --git a/security/clamav-lts/files/clamav-milter.in b/security/clamav-lts/files/clamav_milter.in
similarity index 100%
rename from security/clamav-lts/files/clamav-milter.in
rename to security/clamav-lts/files/clamav_milter.in
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index d16b708bfc54..85f6c84894c2 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	clamav
 DISTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	https://www.clamav.net/downloads/production/
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 USES=		cmake cpe gnome iconv ncurses pkgconfig ssl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
-USE_RC_SUBR=	clamav-clamd clamav-freshclam
+USE_RC_SUBR=	clamav_clamd clamav_freshclam
 
 CMAKE_ARGS=	-DDATABASE_DIRECTORY:STRING=${_DBDIR} \
 		-DOPENSSL_CRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \
@@ -74,7 +74,7 @@ EXPERIMENTAL_CMAKE_BOOL=	ENABLE_EXPERIMENTAL
 .if !exists(/usr/lib/libmilter.so)
 MILTER_LIB_DEPENDS=		libmilter.so:mail/libmilter
 .endif
-MILTER_USE=			RC_SUBR=clamav-milter
+MILTER_USE=			RC_SUBR=clamav_milter
 .if !exists(/usr/lib/libmilter.so)
 MILTER_USE+=			localbase
 .endif
diff --git a/security/clamav/files/clamav-clamd.in b/security/clamav/files/clamav_clamd.in
similarity index 100%
rename from security/clamav/files/clamav-clamd.in
rename to security/clamav/files/clamav_clamd.in
diff --git a/security/clamav/files/clamav-freshclam.in b/security/clamav/files/clamav_freshclam.in
similarity index 100%
rename from security/clamav/files/clamav-freshclam.in
rename to security/clamav/files/clamav_freshclam.in
diff --git a/security/clamav/files/clamav-milter.in b/security/clamav/files/clamav_milter.in
similarity index 100%
rename from security/clamav/files/clamav-milter.in
rename to security/clamav/files/clamav_milter.in