Add *.bak to .gitignore

- move qmail template from qpsmtpd [SME: 9492]
  badrcptto,badmailfrom,rcpthosts are for qmail-smtpd, they were used by qpsmtpd
  as a direct remplacement, some file override them now, moving to qmail
  alternative would be to drop them as long as qpsmptd is used in front

.gitignore

@@ -2,3 +2,4 @@
 *.log
 *spec-20*
 *.tar.xz
+*.bak

README.md

@@ -6,7 +6,14 @@ SMEServer Koozali developed git repo for smeserver-qmail smeserver
 <br />https://wiki.koozali.org/
 
 ## Bugzilla
-Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-qmail&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)\
+Show list of outstanding bugs:
+[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&cf_package=smeserver-qmail&classification=SME+Server&list_id=105756&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&cf_package=smeserver-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&cf_package=smeserver-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[Need info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&cf_package=smeserver-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[In progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&cf_package=smeserver-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&cf_package=smeserver-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&cf_package=smeserver-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
 And a list of outstanding Legacy bugs: (e-smith-qmail) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-qmail&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
 
 ## Description

createlinks

@@ -6,9 +6,11 @@ use File::Path;
 
 # email-conf - console-save, bootstrap-console-save, domain-create, domain-delete,
 # ip-change, email-update, host-create, host-delete, host-modify, post-upgrade
-
+# rcpthosts template was in smeserver qpsmtpd, and not used if qpsmtpd in use anymore 
 
 foreach (qw(
+		badmailfrom
+		badrcptto
 		bouncefrom
 		bouncehost
 	   	concurrencylocal
@@ -40,8 +42,23 @@ foreach (qw(
             post-upgrade
             smeserver-qmail-update
       ));
+
 }
 
+templates2events("/var/qmail/control/badrcptto", qw(
+            user-create
+            user-delete
+            user-modify
+            group-create
+            group-delete
+            group-modify
+            pseudonym-create
+            pseudonym-delete
+            pseudonym-modify
+        ));
+
+
+
 foreach (qw(
     /var/qmail/alias/.qmail-default
     /var/qmail/alias/.qmail-localdelivery-default

root/etc/e-smith/templates/var/qmail/control/badmailfrom/10sample

@@ -0,0 +1,2 @@
+#spamer@spamdomain.com
+#@spamdomain.com

root/etc/e-smith/templates/var/qmail/control/badrcptto/00setup

@@ -0,0 +1,9 @@
+{
+    require esmith::AccountsDB;
+    require esmith::DomainsDB;
+    
+    %Accounts = esmith::AccountsDB->as_hash;
+    %Domains  = esmith::DomainsDB->as_hash;
+
+    "";
+}

root/etc/e-smith/templates/var/qmail/control/badrcptto/10blockVisibleInternal

@@ -0,0 +1,16 @@
+{
+    foreach my $account ( keys %Accounts )
+    {
+	next unless ( exists $Accounts{$account}{Visible} 
+	     and $Accounts{$account}{Visible} eq "internal" );
+
+        $OUT .= "$account\n";
+        $OUT .= "$account\@$DomainName\n";
+
+	foreach my $domain ( keys %Domains )
+	{
+	    next unless $Domains{$domain}{type} eq "domain";
+	    $OUT .= "$account\@$domain\n";
+	}
+    }
+}

root/etc/e-smith/templates/var/qmail/control/rcpthosts/10standard

@@ -0,0 +1,14 @@
+{
+    use esmith::DomainsDB;
+
+    my $ddb = esmith::DomainsDB->open_ro or die "Couldn't open DomainsDB\n";
+
+    my @rcpt_hosts = ( "$SystemName.$DomainName" );
+
+    foreach my $domain ( $ddb->get_all_by_prop( type => "domain" ) )
+    {
+	push @rcpt_hosts, $domain->key;
+    }
+
+    $OUT = join "\n", @rcpt_hosts;
+}

root/etc/e-smith/templates/var/qmail/control/rcpthosts/12LiteralIP

@@ -0,0 +1,5 @@
+{
+    return "" unless (defined $ExternalIP);
+
+    return "[$ExternalIP]";
+}

smeserver-qmail.spec

@@ -4,7 +4,7 @@ Summary: startup scripts for Dan Bernstein's qmail package
 %define name smeserver-qmail
 Name: %{name}
 %define version 11.0.0
-%define release 6
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -29,6 +29,12 @@ Provides: e-smith-qmail
 AutoReqProv: no
 
 %changelog
+* Thu Apr 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme
+- move qmail template from qpsmtpd [SME: 9492]
+  badrcptto,badmailfrom,rcpthosts are for qmail-smtpd, they were used by qpsmtpd
+  as a direct remplacement, some file override them now, moving to qmail 
+  alternative would be to drop them as long as qpsmptd is used in front
+
 * Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-6.sme
 - Update createlinks to create smeserver-package-update event[SME: 12579]