Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mimedefang
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
mimedefang
Commits
e79072a2
Commit
e79072a2
authored
Jan 30, 2021
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Configure ClamdSock in a better way than patching
parent
8b4ecce8
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
324 additions
and
43 deletions
+324
-43
Makefile
Makefile
+1
-1
mimedefang-2.84-clamav_socket_fix.patch
mimedefang-2.84-clamav_socket_fix.patch
+0
-42
mimedefang-filter
mimedefang-filter
+323
-0
No files found.
Makefile
View file @
e79072a2
...
@@ -22,12 +22,12 @@ all: mimedefang-service mimedefang-multiplexor-service
...
@@ -22,12 +22,12 @@ all: mimedefang-service mimedefang-multiplexor-service
mv
-v
/etc/gshadow /data/etc/gshadow
mv
-v
/etc/gshadow /data/etc/gshadow
ln
-sv
/data/etc/gshadow /etc/gshadow
ln
-sv
/data/etc/gshadow /etc/gshadow
tar
xf mimedefang-2.84.tar.gz
tar
xf mimedefang-2.84.tar.gz
patch
-Np1
-d
mimedefang-2.84 < mimedefang-2.84-clamav_socket_fix.patch
cd
mimedefang-2.84
&&
./configure
--prefix
=
/usr
cd
mimedefang-2.84
&&
./configure
--prefix
=
/usr
$(MAKE)
-C
mimedefang-2.84
$(MAKE)
-C
mimedefang-2.84
$(MAKE)
-C
mimedefang-2.84
install
$(MAKE)
-C
mimedefang-2.84
install
rm
/etc/.pwd.lock
rm
/etc/.pwd.lock
install
-v
-Dm755
mimedefang-wrapper /usr/libexec
install
-v
-Dm755
mimedefang-wrapper /usr/libexec
install
-v
-Dm644
mimedefang-filter /etc/mail
install
-v
-Dm644
mimedefang.conf /etc/default/mimedefang
install
-v
-Dm644
mimedefang.conf /etc/default/mimedefang
@
echo
"
$$
MIMEDEFANG_SERVICE"
>
/lib/systemd/system/mimedefang.service
@
echo
"
$$
MIMEDEFANG_SERVICE"
>
/lib/systemd/system/mimedefang.service
@
echo
"
$$
MIMEDEFANG_MULTIPLEXOR_SERVICE"
>
/lib/systemd/system/mimedefang-multiplexor.service
@
echo
"
$$
MIMEDEFANG_MULTIPLEXOR_SERVICE"
>
/lib/systemd/system/mimedefang-multiplexor.service
...
...
mimedefang-2.84-clamav_socket_fix.patch
deleted
100644 → 0
View file @
8b4ecce8
diff -uNr mimedefang-2.84/mimedefang-filter.5.in mimedefang-2.84-clamav_socket_fix/mimedefang-filter.5.in
--- mimedefang-2.84/mimedefang-filter.5.in 2017-09-08 03:16:57.000000000 +0930
+++ mimedefang-2.84-clamav_socket_fix/mimedefang-filter.5.in 2021-01-30 19:25:15.656463303 +1030
@@ -634,7 +634,7 @@
routine.
.TP
-.B $ClamdSock \fR(default @SPOOLDIR@/clamd.sock)
+.B $ClamdSock \fR(default /run/clamav/clamd.sock)
Socket used for clamd daemon calls within message_contains_virus_clamd
and entity_contains_virus_clamd unless a socket is provided by the calling
routine.
diff -uNr mimedefang-2.84/mimedefang.pl.in mimedefang-2.84-clamav_socket_fix/mimedefang.pl.in
--- mimedefang-2.84/mimedefang.pl.in 2017-11-20 02:47:20.000000000 +1030
+++ mimedefang-2.84-clamav_socket_fix/mimedefang.pl.in 2021-01-30 19:26:06.760624267 +1030
@@ -171,7 +171,7 @@
$Fprotd6Host = "127.0.0.1:10200";
$SophieSock = '@SPOOLDIR@/sophie';
-$ClamdSock = '@SPOOLDIR@/clamd.sock';
+$ClamdSock = '/run/clamav/clamd.sock';
$TrophieSock = '@SPOOLDIR@/trophie';
#***********************************************************************
@@ -4800,7 +4800,7 @@
my ($entity) = shift;
my ($clamd_sock) = $ClamdSock;
$clamd_sock = shift if (@_ > 0);
- $clamd_sock = '@SPOOLDIR@/clamd.sock' if (!defined($clamd_sock));
+ $clamd_sock = '/run/clamav/clamd.sock' if (!defined($clamd_sock));
if (!defined($entity->bodyhandle)) {
return (wantarray ? (0, 'ok', 'ok') : 0);
}
@@ -4869,7 +4869,7 @@
sub message_contains_virus_clamd {
my ($clamd_sock) = $ClamdSock;
$clamd_sock = shift if (@_ > 0);
- $clamd_sock = '@SPOOLDIR@/clamd.sock' if (!defined($clamd_sock));
+ $clamd_sock = '/run/clamav/clamd.sock' if (!defined($clamd_sock));
my ($output,$sock);
# PING/PONG test to make sure clamd is alive
mimedefang-filter
0 → 100644
View file @
e79072a2
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment