From nobody Thu Sep 12 04:01:04 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 4X43dY11Zdz5WZ1C; Thu, 12 Sep 2024 04:01:05 +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 4X43dY0C2Wz43nT; Thu, 12 Sep 2024 04:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726113665; 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=a0DjDbQOOjKwO+cSMvg/TalIPdmREAQAUDwjPX2Hmuo=; b=gkab2hkqXZtB0QfIWarIFDI9Etp9qhLueswHqTGtVkdK2Zd/76/EFi/igPfXxGVbSIMD+v YxRFq7YTpj4p2voNGOUqE4pu7aXBoOepMo4D8fro9efMbnvx21++o+zBsPEx5bReI1z08+ NGJIxMXLJ9JlxI920T7GUV5gT6sQyfOpBCN1YEk5OTnyAvYbup6HGVf3/bxCIKhqssa2RN BSSci7gW8yqI7xvLTCFhV4dGZArPZ20Skih5tEZKPdEvYX7srqb5DqD3yeSJcfGxLyQxOl xGX5Cfj3H/4BBcDMF0NtV35ESVEtbawmIUvDIjLoYJWkscy/me8WKpQqMtzUSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726113665; a=rsa-sha256; cv=none; b=NFHQ4wLrdtZO2pFLfZnOjOnCh1FrHKm3eBDu8Jai3l8+ekXMKOYCIQuKNzjKHULSuYwUWf r7tpC1geZRpm2FNhB4tNU8dJIgiY4gvW/oRtt02Ih+oPxuW9dTN3a9xKYkFVttIQ+iilZN /r5IYRJRtgKbccz42s8ORxf7wdrCoN5w24OFlbL653uOnWR4bB1Kx0zHuKfit0+GkVSzMd rf0jm1tSNz3MQJmQI3qlvkUX/LDFJsQnrQFC/YRhfLvk2dE/T+wj7VwZG2X5xZUemDi5ld pNSD8npB+QqZOKVK0thGpwrnXNmKxUTPuIs3UIIwEmpBroJ2/XrL922S6pCPCA== 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=1726113665; 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=a0DjDbQOOjKwO+cSMvg/TalIPdmREAQAUDwjPX2Hmuo=; b=qB+Pu+RNJCa94Qwk1sOJ+wAwGHoDuG0TzkFLUVSRFWA4IdV8UAi2NsZinBJ94RpjHDOwOJ TaN7bZOZxrE16UR/h2pHIYbtxiSaKVcB+vWU7DkVZRvxm41k1leSoyhX0wF1enJLZyPUvK Snbibx0Z1iDTqPKIpA5f+wYbtG7nU9PlEe1i1AV6/cbXFRsmc1dfH2OGuIkTEH24t/GH4L Z8QdwUggxD7kido5CxiwO0ErjTbZczi3cfRJ+B+g8onSoN3NJ+ogY+Y1/tbWOoSeFkE/Cr cAqkmEirEUjtoPG6bDdohC4XvhCHfA63q2jysMJ1ZpjDS/Heebipi9Ym1+PqdQ== 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 4X43dX6wVjz102q; Thu, 12 Sep 2024 04:01:04 +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 48C414LO078249; Thu, 12 Sep 2024 04:01:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48C414hx078246; Thu, 12 Sep 2024 04:01:04 GMT (envelope-from git) Date: Thu, 12 Sep 2024 04:01:04 GMT Message-Id: <202409120401.48C414hx078246@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 36e211c572f8 - main - security/{clamav,clamav-lts}: Fix filename of the rc script to comply to the rc scripting recommendations 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: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36e211c572f8b975ec8852ec394e83005cbd6385 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=36e211c572f8b975ec8852ec394e83005cbd6385 commit 36e211c572f8b975ec8852ec394e83005cbd6385 Author: Alexander Leidinger AuthorDate: 2024-07-05 08:20:03 +0000 Commit: Yasuhiro Kimura 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