Skip to content

Commit 353a7b0

Browse files
mpapernompaperno
committed
Make ready for release; Update example service scripts.
1 parent fbedea9 commit 353a7b0

File tree

6 files changed

+30
-18
lines changed

6 files changed

+30
-18
lines changed

‎.github/FUNDING.yml

-3
This file was deleted.

‎changelog.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SpamPD Change Log
88
! : important change, change of default behavior, etc.
99
-----------------------------------------------------------
1010

11-
2.61 (3-Aug-21)
11+
2.61 (6-Aug-21)
1212

1313
Bug fixes, new features, and some optimization. Thanks to Simon Matter for reporting, suggestions, and testing!
1414

‎misc/spampd-rh-rc-script.sh

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
#
33
# This script starts and stops the spampd daemon
44
#
5+
#### NOTE #####
6+
# This is a very old and outdated example!!!
7+
# Recommend checking the Debian version of spampd.init script,
8+
# in the /debian branch of the source repository
9+
# (https://github.com/mpaperno/spampd/tree/debian).
10+
#
511
# chkconfig: 2345 80 30
612
#
713
# description: spampd is a daemon process which uses SpamAssassin to check

‎misc/spampd.service

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
[Unit]
2-
Description=Spamassassin Proxy Daemon
3-
After=network.target
2+
Description=Spam Proxy Daemon
3+
After=syslog.target network.target
44

55
[Service]
6-
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
6+
ExecStart=/usr/sbin/spampd --config /etc/spampd.cfg --pid /run/spampd.pid --nodetach
7+
ExecReload=/usr/bin/kill -HUP $MAINPID
8+
KillMode=mixed
9+
KillSignal=SIGQUIT
10+
TimeoutStopSec=30
11+
Restart=on-failure
12+
# To run as a forking server, uncomment below and remove the "--nodetach" option
13+
# from the command line above. You may need/want to add "--setsid" option instead.
14+
#Type=forking
15+
#PIDFile=/run/spampd.pid
716

817
[Install]
918
WantedBy=multi-user.target

‎readme.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
# SpamPD
1+
# SpamPD - Spam Proxy Daemon
22

3-
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.
4-
It uses an excellent program called <a href="https://spamassassin.apache.org/" target="_new">SpamAssassin</a> (SA) to do the actual message scanning. SpamPD acts as a transparent SMTP/LMTP proxy between
5-
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
6-
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
3+
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.
4+
It uses an excellent program called <a href="https://spamassassin.apache.org/" target="_new">SpamAssassin</a> (SA) to do the actual message scanning. SpamPD acts as a transparent SMTP/LMTP proxy between
5+
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
6+
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
77
platform supported by Perl and SpamAssassin.
88

9-
Check the [Releases](https://github.com/mpaperno/spampd/releases) area for latest versions, and see the old
10-
<a href="https://github.com/mpaperno/spampd/downloads">Downloads</a> section for older releases.
9+
Check the [Releases](https://github.com/mpaperno/spampd/releases) area for latest versions, and see the old
10+
[Downloads](https://github.com/mpaperno/spampd/downloads) section for older releases (and the "previous-versions" folder for some even more ancient ones).
1111
Recently the Debian package version was added to this repo as a branch, and those tags will also show up in the Releases page.
1212

13-
Please read the [POD file](https://github.com/mpaperno/spampd/blob/master/spampd.pod) for full documentation of the many available options.
13+
Please read the [POD file](https://github.com/mpaperno/spampd/blob/master/spampd.pod) for full documentation of the many available options.
1414
See the [changelog](https://github.com/mpaperno/spampd/blob/master/changelog.txt) for version history.
1515

16-
More historic background information is available <a href="http://www.worlddesign.com/index.cfm/page/rd/mta/spampd.htm">here</a>.
16+
More historic background information is available <a href="http://www.worlddesign.com/index.cfm/page/rd/mta/spampd.htm" target="_new">here</a>.
1717

1818
Linux packages data courtesy of Repology:
1919

2020
<a href="https://repology.org/metapackage/spampd/versions" target="_new">
21-
<img src="https://repology.org/badge/vertical-allrepos/spampd.svg?minversion=2.60&header=Latest+release+v2.60" alt="Packaging status">
21+
<img src="https://repology.org/badge/vertical-allrepos/spampd.svg?minversion=2.61&header=Latest+release+v2.61" alt="Packaging status">
2222
</a>

‎spampd.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
######################
44
# SpamPD - Spam Proxy Daemon
55
#
6-
# v2.61 - 03-Aug-21
6+
# v2.61 - 06-Aug-21
77
# v2.60 - 26-Jul-21
88
# v2.53 - 25-Feb-19
99
# v2.52 - 10-Nov-18

0 commit comments

Comments
 (0)