Skip to content

Commit

Permalink
Remove ScamNailer (#692)
Browse files Browse the repository at this point in the history
* Remove ScamNailer
  • Loading branch information
shawniverson authored Oct 12, 2024
1 parent b3431a4 commit b323058
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 209 deletions.
1 change: 1 addition & 0 deletions changelog
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
10/12/2024 Changes in v5.5.3-1
==================================
- Check for invalid chars in recipient address (msmilter) - Thanks to alexskynet
- Remove ScamNailer - Thanks to fictitiousexistence

06/09/2024 Changes in v5.5.2-1
==================================
Expand Down
9 changes: 0 additions & 9 deletions common/etc/MailScanner/defaults
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,6 @@ ms_cron_sa=1
#
ms_cron_ps=1

# Update ScamNailer bad emails
#
# You must have ScamNailer setup before enabling this. http://www.scamnailer.info
# This is disabled by default.
#
# This is executed during the DAILY cron option. 0 = off, 1 = on
#
ms_cron_sn=0

# MailScanner Process Check
#
# Check to see if MailScanner is running. If not, start it if the process
Expand Down
9 changes: 0 additions & 9 deletions common/usr/sbin/ms-cron
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ ms_cron_msg_alert=0
ms_cron_sa=0
ms_cron_av=0
ms_cron_ps=0
ms_cron_sn=0
q_days=0

# if no arguments are passed
Expand Down Expand Up @@ -97,14 +96,6 @@ if [ $ACTION = DAILY ]; then
/usr/sbin/ms-update-phishing >/dev/null
fi

# update ScamNailer phishing emails
if [ $ms_cron_sn = 1 ]; then
if [ ! -d /var/cache/ScamNailer ]; then
mkdir -p /var/cache/ScamNailer
fi
/usr/sbin/ms-update-bad-emails
fi

exit 0
fi

Expand Down
187 changes: 0 additions & 187 deletions common/usr/sbin/ms-update-bad-emails

This file was deleted.

5 changes: 3 additions & 2 deletions rhel/mailscanner.spec
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ install common/usr/sbin/ms-msg-alert ${RPM_BUILD_ROOT}/usr
install common/usr/sbin/ms-peek ${RPM_BUILD_ROOT}/usr/sbin/ms-peek
install common/usr/sbin/ms-perl-check ${RPM_BUILD_ROOT}/usr/sbin/ms-perl-check
install common/usr/sbin/ms-sa-cache ${RPM_BUILD_ROOT}/usr/sbin/ms-sa-cache
install common/usr/sbin/ms-update-bad-emails ${RPM_BUILD_ROOT}/usr/sbin/ms-update-bad-emails
install common/usr/sbin/ms-update-phishing ${RPM_BUILD_ROOT}/usr/sbin/ms-update-phishing
install common/usr/sbin/ms-update-sa ${RPM_BUILD_ROOT}/usr/sbin/ms-update-sa
install common/usr/sbin/ms-update-vs ${RPM_BUILD_ROOT}/usr/sbin/ms-update-vs
Expand Down Expand Up @@ -682,7 +681,6 @@ exit 0
%attr(755,root,root) /usr/sbin/ms-peek
%attr(755,root,root) /usr/sbin/ms-perl-check
%attr(755,root,root) /usr/sbin/ms-sa-cache
%attr(755,root,root) /usr/sbin/ms-update-bad-emails
%attr(755,root,root) /usr/sbin/ms-update-phishing
%attr(755,root,root) /usr/sbin/ms-update-sa
%attr(755,root,root) /usr/sbin/ms-update-vs
Expand Down Expand Up @@ -1281,6 +1279,9 @@ exit 0
%config(noreplace) /usr/share/MailScanner/reports/ca/stored.virus.message.txt

%changelog
* Sat Oct 12 2024 Shawn Iverson <[email protected]>
- Remove ScamNailer

* Thu Mar 02 2023 Shawn Iverson <[email protected]>
- Remove msmilter.service on remove

Expand Down
5 changes: 3 additions & 2 deletions suse/mailscanner.spec
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ install common/usr/sbin/ms-msg-alert ${RPM_BUILD_ROOT}/usr
install common/usr/sbin/ms-peek ${RPM_BUILD_ROOT}/usr/sbin/ms-peek
install common/usr/sbin/ms-perl-check ${RPM_BUILD_ROOT}/usr/sbin/ms-perl-check
install common/usr/sbin/ms-sa-cache ${RPM_BUILD_ROOT}/usr/sbin/ms-sa-cache
install common/usr/sbin/ms-update-bad-emails ${RPM_BUILD_ROOT}/usr/sbin/ms-update-bad-emails
install common/usr/sbin/ms-update-phishing ${RPM_BUILD_ROOT}/usr/sbin/ms-update-phishing
install common/usr/sbin/ms-update-sa ${RPM_BUILD_ROOT}/usr/sbin/ms-update-sa
install common/usr/sbin/ms-update-vs ${RPM_BUILD_ROOT}/usr/sbin/ms-update-vs
Expand Down Expand Up @@ -611,7 +610,6 @@ exit 0
%attr(755,root,root) /usr/sbin/ms-peek
%attr(755,root,root) /usr/sbin/ms-perl-check
%attr(755,root,root) /usr/sbin/ms-sa-cache
%attr(755,root,root) /usr/sbin/ms-update-bad-emails
%attr(755,root,root) /usr/sbin/ms-update-phishing
%attr(755,root,root) /usr/sbin/ms-update-sa
%attr(755,root,root) /usr/sbin/ms-update-vs
Expand Down Expand Up @@ -1206,6 +1204,9 @@ exit 0
%config(noreplace) /usr/share/MailScanner/reports/ca/stored.virus.message.txt

%changelog
* Sat Oct 12 2024 Shawn Iverson <[email protected]>
- Remove ScamNailer

* Thu Mar 02 2023 Shawn Iverson <[email protected]>
- Remove msmilter.service on remove

Expand Down

0 comments on commit b323058

Please sign in to comment.