openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 19:14:30 +04:00
Code Issues Packages Projects Releases Wiki Activity

clamav: all; init; add only non-empty parameters

Browse Source 
Gate all parameters behind -n, a not-empty check. Prevents failed starts
where daemons expect a value for a parameter.

Closes #27430
Tested-on: 24.10.3
Signed-off-by: Paul Donald <newtwen+github@gmail.com>
This commit is contained in:
Paul Donald
2025-10-02 14:24:38 +02:00
committed by Wesley Gimenes
parent 10ac81b9aa
commit 4c35b89332
5 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/clamav/Makefile
View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=clamav PKG_NAME:=clamav
PKG_VERSION:=1.4.3 PKG_VERSION:=1.4.3
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.clamav.net/downloads/production/ PKG_SOURCE_URL:=https://www.clamav.net/downloads/production/

48
net/clamav/files/clamav-milter.init
View File

@@ -51,30 +51,30 @@ start_clamav_milter_instance() {
ln -sf "$clamav_milter_config_file" "$CLAMAV_MILTER_CONFIGFILE" ln -sf "$clamav_milter_config_file" "$CLAMAV_MILTER_CONFIGFILE"
{ {
echo "Foreground " "$Foreground" [ -n "$Foreground" ] && echo "Foreground " "$Foreground"
echo "PidFile " "$PidFile" [ -n "$PidFile" ] && echo "PidFile " "$PidFile"
echo "User " "$User" [ -n "$User" ] && echo "User " "$User"
echo "MilterSocketGroup " "$MilterSocketGroup" [ -n "$MilterSocketGroup" ] && echo "MilterSocketGroup " "$MilterSocketGroup"
echo "ReadTimeout " "$ReadTimeout" [ -n "$ReadTimeout" ] && echo "ReadTimeout " "$ReadTimeout"
echo "OnClean " "$OnClean" [ -n "$OnClean" ] && echo "OnClean " "$OnClean"
echo "OnInfected " "$OnInfected" [ -n "$OnInfected" ] && echo "OnInfected " "$OnInfected"
echo "OnFail " "$OnFail" [ -n "$OnFail" ] && echo "OnFail " "$OnFail"
echo "AddHeader " "$AddHeader" [ -n "$AddHeader" ] && echo "AddHeader " "$AddHeader"
echo "LogVerbose " "$LogVerbose" [ -n "$LogVerbose" ] && echo "LogVerbose " "$LogVerbose"
echo "LogTime " "$LogTime" [ -n "$LogTime" ] && echo "LogTime " "$LogTime"
echo "LogSyslog " "$LogSyslog" [ -n "$LogSyslog" ] && echo "LogSyslog " "$LogSyslog"
echo "Debug " "$Debug" [ -n "$Debug" ] && echo "Debug " "$Debug"
echo "LogFacility " "$LogFacility" [ -n "$LogFacility" ] && echo "LogFacility " "$LogFacility"
echo "LogInfected " "$LogInfected" [ -n "$LogInfected" ] && echo "LogInfected " "$LogInfected"
echo "LogClean " "$LogClean" [ -n "$LogClean" ] && echo "LogClean " "$LogClean"
echo "MaxFileSize " "$MaxFileSize" [ -n "$MaxFileSize" ] && echo "MaxFileSize " "$MaxFileSize"
echo "SupportMultipleRecipients " "$SupportMultipleRecipients" [ -n "$SupportMultipleRecipients" ] && echo "SupportMultipleRecipients " "$SupportMultipleRecipients"
echo "RejectMsg " "$RejectMsg" [ -n "$RejectMsg" ] && echo "RejectMsg " "$RejectMsg"
echo "TemporaryDirectory " "$TemporaryDirectory" [ -n "$TemporaryDirectory" ] && echo "TemporaryDirectory " "$TemporaryDirectory"
echo "MilterSocket " "$MilterSocket" [ -n "$MilterSocket" ] && echo "MilterSocket " "$MilterSocket"
echo "MilterSocketMode " "$MilterSocketMode" [ -n "$MilterSocketMode" ] && echo "MilterSocketMode " "$MilterSocketMode"
echo "ClamdSocket " "$ClamdSocket" [ -n "$ClamdSocket" ] && echo "ClamdSocket " "$ClamdSocket"
echo "FixStaleSocket " "$FixStaleSocket" [ -n "$FixStaleSocket" ] && echo "FixStaleSocket " "$FixStaleSocket"
} > "$CLAMAV_MILTER_CONFIGFILE" } > "$CLAMAV_MILTER_CONFIGFILE"
procd_open_instance procd_open_instance

66
net/clamav/files/clamav.init
View File

@@ -64,39 +64,39 @@ start_clamav_instance() {
ln -sf "$clamd_config_file" "$CLAMD_CONFIGFILE" ln -sf "$clamd_config_file" "$CLAMD_CONFIGFILE"
{ {
echo "LogVerbose " "$LogVerbose" [ -n "$LogVerbose" ] && echo "LogVerbose " "$LogVerbose"
echo "LogTime " "$LogTime" [ -n "$LogTime" ] && echo "LogTime " "$LogTime"
echo "Debug " "$Debug" [ -n "$Debug" ] && echo "Debug " "$Debug"
echo "LogSyslog " "$LogSyslog" [ -n "$LogSyslog" ] && echo "LogSyslog " "$LogSyslog"
echo "LogFacility " "$LogFacility" [ -n "$LogFacility" ] && echo "LogFacility " "$LogFacility"
echo "ExtendedDetectionInfo " "$ExtendedDetectionInfo" [ -n "$ExtendedDetectionInfo" ] && echo "ExtendedDetectionInfo " "$ExtendedDetectionInfo"
echo "OfficialDatabaseOnly " "$OfficialDatabaseOnly" [ -n "$OfficialDatabaseOnly" ] && echo "OfficialDatabaseOnly " "$OfficialDatabaseOnly"
echo "StreamMinPort " "$StreamMinPort" [ -n "$StreamMinPort" ] && echo "StreamMinPort " "$StreamMinPort"
echo "StreamMaxPort " "$StreamMaxPort" [ -n "$StreamMaxPort" ] && echo "StreamMaxPort " "$StreamMaxPort"
echo "MaxThreads " "$MaxThreads" [ -n "$MaxThreads" ] && echo "MaxThreads " "$MaxThreads"
echo "ReadTimeout " "$ReadTimeout" [ -n "$ReadTimeout" ] && echo "ReadTimeout " "$ReadTimeout"
echo "CommandReadTimeout " "$CommandReadTimeout" [ -n "$CommandReadTimeout" ] && echo "CommandReadTimeout " "$CommandReadTimeout"
echo "MaxDirectoryRecursion " "$MaxDirectoryRecursion" [ -n "$MaxDirectoryRecursion" ] && echo "MaxDirectoryRecursion " "$MaxDirectoryRecursion"
echo "FollowDirectorySymlinks " "$FollowDirectorySymlinks" [ -n "$FollowDirectorySymlinks" ] && echo "FollowDirectorySymlinks " "$FollowDirectorySymlinks"
echo "FollowFileSymlinks " "$FollowFileSymlinks" [ -n "$FollowFileSymlinks" ] && echo "FollowFileSymlinks " "$FollowFileSymlinks"
echo "SelfCheck " "$SelfCheck" [ -n "$SelfCheck" ] && echo "SelfCheck " "$SelfCheck"
echo "DetectPUA " "$DetectPUA" [ -n "$DetectPUA" ] && echo "DetectPUA " "$DetectPUA"
echo "ScanPE " "$ScanPE" [ -n "$ScanPE" ] && echo "ScanPE " "$ScanPE"
echo "DisableCertCheck " "$DisableCertCheck" [ -n "$DisableCertCheck" ] && echo "DisableCertCheck " "$DisableCertCheck"
echo "ScanELF " "$ScanELF" [ -n "$ScanELF" ] && echo "ScanELF " "$ScanELF"
echo "AlertBrokenExecutables " "$AlertBrokenExecutables" [ -n "$AlertBrokenExecutables" ] && echo "AlertBrokenExecutables " "$AlertBrokenExecutables"
echo "ScanOLE2 " "$ScanOLE2" [ -n "$ScanOLE2" ] && echo "ScanOLE2 " "$ScanOLE2"
echo "ScanPDF " "$ScanPDF" [ -n "$ScanPDF" ] && echo "ScanPDF " "$ScanPDF"
echo "ScanSWF " "$ScanSWF" [ -n "$ScanSWF" ] && echo "ScanSWF " "$ScanSWF"
echo "ScanMail " "$ScanMail" [ -n "$ScanMail" ] && echo "ScanMail " "$ScanMail"
echo "ScanPartialMessages " "$ScanPartialMessages" [ -n "$ScanPartialMessages" ] && echo "ScanPartialMessages " "$ScanPartialMessages"
echo "ScanArchive " "$ScanArchive" [ -n "$ScanArchive" ] && echo "ScanArchive " "$ScanArchive"
echo "TemporaryDirectory " "$TemporaryDirectory" [ -n "$TemporaryDirectory" ] && echo "TemporaryDirectory " "$TemporaryDirectory"
echo "AlertEncrypted " "$AlertEncrypted" [ -n "$AlertEncrypted" ] && echo "AlertEncrypted " "$AlertEncrypted"
echo "MaxFileSize " "$MaxFileSize" [ -n "$MaxFileSize" ] && echo "MaxFileSize " "$MaxFileSize"
echo "User " "$User" [ -n "$User" ] && echo "User " "$User"
echo "ExitOnOOM " "$ExitOnOOM" [ -n "$ExitOnOOM" ] && echo "ExitOnOOM " "$ExitOnOOM"
echo "DatabaseDirectory " "$DatabaseDirectory" [ -n "$DatabaseDirectory" ] && echo "DatabaseDirectory " "$DatabaseDirectory"
} > "$CLAMD_CONFIGFILE" } > "$CLAMD_CONFIGFILE"
if [ -n "$LocalSocket" ]; then if [ -n "$LocalSocket" ]; then

4
net/clamav/files/freshclam.config
View File

@@ -21,6 +21,6 @@ config freshclam 'freshclam'
option Checks '12' option Checks '12'
option TestDatabases 'yes' option TestDatabases 'yes'
option Bytecode 'yes' option Bytecode 'yes'
option ExtraDatabase ' ' option ExtraDatabase ''
option ExcludeDatabase ' ' option ExcludeDatabase ''

46
net/clamav/files/freshclam.init
View File

@@ -52,29 +52,29 @@ start_freshclam_instance() {
ln -sf "$freshclam_config_file" "$FRESHCLAM_CONFIGFILE" ln -sf "$freshclam_config_file" "$FRESHCLAM_CONFIGFILE"
{ {
echo "LogTime " "$LogTime" [ -n "$LogTime" ] && echo "LogTime " "$LogTime"
echo "LogVerbose " "$LogVerbose" [ -n "$LogVerbose" ] && echo "LogVerbose " "$LogVerbose"
echo "LogSyslog " "$LogSyslog" [ -n "$LogSyslog" ] && echo "LogSyslog " "$LogSyslog"
echo "Debug " "$Debug" [ -n "$Debug" ] && echo "Debug " "$Debug"
echo "LogFacility " "$LogFacility" [ -n "$LogFacility" ] && echo "LogFacility " "$LogFacility"
echo "Foreground " "$Foreground" [ -n "$Foreground" ] && echo "Foreground " "$Foreground"
echo "PidFile " "$PidFile" [ -n "$PidFile" ] && echo "PidFile " "$PidFile"
echo "DatabaseMirror " "$DatabaseMirror" [ -n "$DatabaseMirror" ] && echo "DatabaseMirror " "$DatabaseMirror"
echo "NotifyClamd " "$NotifyClamd" [ -n "$NotifyClamd" ] && echo "NotifyClamd " "$NotifyClamd"
echo "DatabaseOwner " "$DatabaseOwner" [ -n "$DatabaseOwner" ] && echo "DatabaseOwner " "$DatabaseOwner"
echo "CompressLocalDatabase " "$CompressLocalDatabase" [ -n "$CompressLocalDatabase" ] && echo "CompressLocalDatabase " "$CompressLocalDatabase"
echo "DatabaseDirectory " "$DatabaseDirectory" [ -n "$DatabaseDirectory" ] && echo "DatabaseDirectory " "$DatabaseDirectory"
echo "DNSDatabaseInfo " "$DNSDatabaseInfo" [ -n "$DNSDatabaseInfo" ] && echo "DNSDatabaseInfo " "$DNSDatabaseInfo"
echo "ScriptedUpdates " "$ScriptedUpdates" [ -n "$ScriptedUpdates" ] && echo "ScriptedUpdates " "$ScriptedUpdates"
echo "DatabaseCustomURL " "$DatabaseCustomURL" [ -n "$DatabaseCustomURL" ] && echo "DatabaseCustomURL " "$DatabaseCustomURL"
echo "ConnectTimeout " "$ConnectTimeout" [ -n "$ConnectTimeout" ] && echo "ConnectTimeout " "$ConnectTimeout"
echo "ReceiveTimeout " "$ReceiveTimeout" [ -n "$ReceiveTimeout" ] && echo "ReceiveTimeout " "$ReceiveTimeout"
echo "PrivateMirror " "$PrivateMirror" [ -n "$PrivateMirror" ] && echo "PrivateMirror " "$PrivateMirror"
echo "Checks " "$Checks" [ -n "$Checks" ] && echo "Checks " "$Checks"
echo "TestDatabases " "$TestDatabases" [ -n "$TestDatabases" ] && echo "TestDatabases " "$TestDatabases"
echo "Bytecode " "$Bytecode" [ -n "$Bytecode" ] && echo "Bytecode " "$Bytecode"
echo "ExtraDatabase " "$ExtraDatabase" [ -n "$ExtraDatabase" ] && echo "ExtraDatabase " "$ExtraDatabase"
echo "ExcludeDatabase " "$ExcludeDatabase" [ -n "$ExcludeDatabase" ] && echo "ExcludeDatabase " "$ExcludeDatabase"
} > "$FRESHCLAM_CONFIGFILE" } > "$FRESHCLAM_CONFIGFILE"
procd_open_instance procd_open_instance