more forkserver promotion

META.yml

@@ -32,4 +32,5 @@ requires:
   Time::TAI64: 0
   Mail::SPF: 0
   Geo::IP: 0
+  Redis: 0
 version: 1.00

Makefile.PL

@@ -22,9 +22,11 @@ WriteMakefile(
         'Test::More'      => 0,
         'Test::Output'    => 0,
 # modules for specific features
+        'Mail::SPF'          => 0,
         'Mail::DKIM'         => 0.40,
         'File::Tail'         => 0,   # log/summarize, log/watch
         'Time::TAI64'        => 0,   # log2sql
+        'Redis'           => 0,
 #       'DBI'                => 0,   # auth_vpopmail_sql and
 #       'DBD::mysql'         => 0,   # log2sql
 #       'DBIx::Simple'       => 0,   # log2sql
@@ -33,7 +35,6 @@ WriteMakefile(
         'Geo::IP'            => 1,
         'Math::Complex'      => 0,   # geodesic distance in Geo::IP
         'PerlIO::gzip'       => 0,   # gunzip GeoIP databases
-        'Mail::SPF'          => 0,
     },
     ABSTRACT       => 'Flexible smtpd daemon written in Perl',
     AUTHOR         => 'Ask Bjoern Hansen <[email protected]>',

packaging/rpm/files/qpsmtpd-forkserver.rc

@@ -1,26 +1,26 @@
 #! /bin/bash
 #
-# qpsmtpd-forkserver          Start/Stop the qpsmtpd forking server
+# qpsmtpd          Start/Stop the qpsmtpd forking server
 #
 # chkconfig: 2345 90 60
 # description: qpsmtpd is a flexible smtpd daemon written in Perl. \
 #              Apart from the core SMTP features, all functionality is \
 #              implemented in small "extension plugins" using the easy \
 #              to use object oriented plugin API.
-# processname: qpsmtpd-forkserver
+# processname: qpsmtpd
 # config: /etc/qpsmtpd
-# pidfile: /var/run/qpsmtpd-forkserver.pid
+# pidfile: /var/run/qpsmtpd.pid
 
 
 # Source function library.
 . /etc/init.d/functions
-. /etc/sysconfig/qpsmtpd-forkserver
+. /etc/sysconfig/qpsmtpd
 
 RETVAL=0
 
 # See how we were called.
 
-prog="qpsmtpd-forkserver"
+prog="qpsmtpd"
 
 start() {
 	# cleanup environment a bit.
@@ -109,7 +109,7 @@ case "$1" in
   	reload
 	;;
   status)
-  	qpstatus qpsmtpd-forkserver
+  	qpstatus qpsmtpd
 	;;
   condrestart)
   	[ -f /var/lock/subsys/$prog ] && restart || :

packaging/rpm/files/qpsmtpd-forkserver.sysconfig

@@ -1,3 +1,3 @@
-QPSMTPD_OPTIONS="-p 25 -l 127.0.0.1 --pid-file /var/run/qpsmtpd-forkserver.pid"
+QPSMTPD_OPTIONS="-p 25 -l 127.0.0.1 --pid-file /var/run/qpsmtpd.pid"
 export QPSMTPD_CONFIG=/etc/qpsmtpd
 export HOME=~smtpd