diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index b87e729..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,3 +0,0 @@ -# Supported funding model platforms - -github: [mpaperno] diff --git a/changelog.txt b/changelog.txt index ff8a985..232d3c5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -8,7 +8,7 @@ SpamPD Change Log ! : important change, change of default behavior, etc. ----------------------------------------------------------- -2.61 (3-Aug-21) +2.61 (6-Aug-21) Bug fixes, new features, and some optimization. Thanks to Simon Matter for reporting, suggestions, and testing! diff --git a/misc/spampd-rh-rc-script.sh b/misc/spampd-rh-rc-script.sh index 5b90c0b..b92b334 100644 --- a/misc/spampd-rh-rc-script.sh +++ b/misc/spampd-rh-rc-script.sh @@ -2,6 +2,12 @@ # # This script starts and stops the spampd daemon # +#### NOTE ##### +# This is a very old and outdated example!!! +# Recommend checking the Debian version of spampd.init script, +# in the /debian branch of the source repository +# (https://github.com/mpaperno/spampd/tree/debian). +# # chkconfig: 2345 80 30 # # description: spampd is a daemon process which uses SpamAssassin to check diff --git a/misc/spampd.service b/misc/spampd.service index 514c3c7..b961f30 100644 --- a/misc/spampd.service +++ b/misc/spampd.service @@ -1,9 +1,18 @@ [Unit] -Description=Spamassassin Proxy Daemon -After=network.target +Description=Spam Proxy Daemon +After=syslog.target network.target [Service] -ExecStart=/usr/bin/spampd --port=10025 --relayhost=127.0.0.1:10026 --tagall --log-rules-hit --user spampd --group spampd --pid=/home/spampd/spampd.pid --nodetach +ExecStart=/usr/sbin/spampd --config /etc/spampd.cfg --pid /run/spampd.pid --nodetach +ExecReload=/usr/bin/kill -HUP $MAINPID +KillMode=mixed +KillSignal=SIGQUIT +TimeoutStopSec=30 +Restart=on-failure +# To run as a forking server, uncomment below and remove the "--nodetach" option +# from the command line above. You may need/want to add "--setsid" option instead. +#Type=forking +#PIDFile=/run/spampd.pid [Install] WantedBy=multi-user.target diff --git a/readme.md b/readme.md index 22fca06..d6d262b 100644 --- a/readme.md +++ b/readme.md @@ -1,22 +1,22 @@ -# SpamPD +# SpamPD - Spam Proxy Daemon -Originally released in May of 2002, SpamPD is a program used within an e-mail delivery system to scan messages for possible Unsolicited Commercial E-mail (UCE, aka spam) content. -It uses an excellent program called SpamAssassin (SA) to do the actual message scanning. SpamPD acts as a transparent SMTP/LMTP proxy between -two mail servers, and during the transaction it passes the mail through SA. If SA decides the mail could be spam, then SpamPD will ask SA to -add some headers and a report to the message indicating it's spam and why. SpamPD is written in Perl and should theoretically run on any +Originally released in May of 2002, _SpamPD_ is a program used within an e-mail delivery system to scan messages for possible Unsolicited Commercial E-mail (UCE, aka spam) content. +It uses an excellent program called SpamAssassin (SA) to do the actual message scanning. SpamPD acts as a transparent SMTP/LMTP proxy between +two mail servers, and during the transaction it passes the mail through SA. If SA decides the mail could be spam, then SpamPD will ask SA to +add some headers and a report to the message indicating it's spam and why. SpamPD is written in Perl and should theoretically run on any platform supported by Perl and SpamAssassin. -Check the [Releases](https://github.com/mpaperno/spampd/releases) area for latest versions, and see the old -Downloads section for older releases. +Check the [Releases](https://github.com/mpaperno/spampd/releases) area for latest versions, and see the old +[Downloads](https://github.com/mpaperno/spampd/downloads) section for older releases (and the "previous-versions" folder for some even more ancient ones). Recently the Debian package version was added to this repo as a branch, and those tags will also show up in the Releases page. -Please read the [POD file](https://github.com/mpaperno/spampd/blob/master/spampd.pod) for full documentation of the many available options. +Please read the [POD file](https://github.com/mpaperno/spampd/blob/master/spampd.pod) for full documentation of the many available options. See the [changelog](https://github.com/mpaperno/spampd/blob/master/changelog.txt) for version history. -More historic background information is available here. +More historic background information is available here. Linux packages data courtesy of Repology: - Packaging status + Packaging status diff --git a/spampd.pl b/spampd.pl index 577fc98..1bcf67a 100755 --- a/spampd.pl +++ b/spampd.pl @@ -3,7 +3,7 @@ ###################### # SpamPD - Spam Proxy Daemon # -# v2.61 - 03-Aug-21 +# v2.61 - 06-Aug-21 # v2.60 - 26-Jul-21 # v2.53 - 25-Feb-19 # v2.52 - 10-Nov-18