changes for sqmail-4.3.14

2 files changed, 45 insertions, 30 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ac3e9d7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,13 @@
+fehqlibs-*/
+sqmail-*/
+ucspi-ssl-*/
+ucspi-tcp6-*/
+*.tgz
+*.tgz.*
+*.debian.tar.xz
+*.dsc
+*.build
+*.buildinfo
+*.changes
+*.orig.tar.gz
+*.deb
diff --git a/build-sqmail b/build-sqmail
index 41a43b7..4c4622b 100755
--- a/build-sqmail
+++ b/build-sqmail
@@ -3,7 +3,7 @@
 set -eu
 
 name=sqmail
-version=4.2.29
+version=4.3.14
 upname=${name}_$version.orig.tar.gz
 srcname=$name-$version
 rel_project_root=$name/$name-$version
@@ -243,28 +243,31 @@ awk -f debian/contrib/convert_ids.awk sqmail/$srcname/conf-ids | expand -t 3,12,
 cat <<'END' >debian/contrib/sqmail-send.service
 [Unit]
 Description=qmail delivery daemon
-After=local-fs.target network.target 
+After=network-online.target 
+
+[Service]
+execStart=qmail-start ./Maildir
 
 [Install]
 WantedBy=multi-user.target
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/qmail-start Maildir/
 END
 
 cat <<'END' >debian/contrib/sqmail-smtpd.service
 [Unit]
 Description=qmail delivery daemon
-After=local-fs.target network.target
+After=network-online.target
+
+[Service]
+User=qmaild
+Group=qmaild
+Environment=UCSPITLS="" SPF="1"
+EnvironmentFile=/var/qmail/ssl/ssl.env
+ExecStart=sslserver -seVn -Rp -l %H -Xx /etc/qmail/rules.smtpd.cdb 0 smtp qmail-smtpd
+ExecReload=qmail-tcpok
+ExecReload=/bin/kill -ALRM $MAINPID
 
 [Install]
 WantedBy=multi-user.target
-
-[Service]
-Restart=always
-ExecStart=/service/qmail-smtpd/run
-#ExecReload=/var/qmail/bin/qmail-tcpok ; /bin/kill -ALRM ${MAINPID}
 END
 
 cat <<'END' >debian/contrib/auto_uids.c
@@ -473,34 +476,33 @@ Description: replace direct ucspissl.a with libucspissl
 
 --- $orig_project_root/src/Makefile
 +++ $abs_project_root/src/Makefile
-@@ -900,10 +900,10 @@
- load qmail-smtpam.o control.o now.o dns.o constmap.o \\
- ipalloc.o ipme.o quote.o auto_qmail.o tcpto.o \\
- tls_timeoutio.o tls_errors.o tls_remote.o dns_tlsa.o \\
--ssl.lib dns.lib socket.lib qlibs.lib ucspissl.a
-+ssl.lib dns.lib socket.lib qlibs.lib
- 	./load qmail-smtpam constmap.o control.o dns_tlsa.o \\
- 	tcpto.o now.o dns.o ipalloc.o ipme.o quote.o auto_qmail.o \\
--	tls_errors.o tls_remote.o tls_timeoutio.o ucspissl.a \\
-+	tls_errors.o tls_remote.o tls_timeoutio.o -lucspissl \\
- 	\`cat ssl.lib\` \`cat dns.lib\` \`cat socket.lib\` \`cat qlibs.lib\` 
- 
- qmail-smtpam.o: \\
-@@ -1048,11 +1048,11 @@
+@@ -1051,11 +1051,11 @@ qmail-remote: \\
  load qmail-remote.o control.o tcpto.o now.o dns.o ipalloc.o ipme.o \\
  quote.o tls_timeoutio.o tls_errors.o tls_remote.o dns_tlsa.o \\
- base64.o constmap.o md5c.o hmac_md5.o auto_qmail.o \\
+ base64.o constmap.o md5c.o hmac_md5.o auto_qmail.o auto_queue.o \\
 -ssl.lib dns.lib socket.lib qlibs.lib idn2.lib ucspissl.a
 +ssl.lib dns.lib socket.lib qlibs.lib idn2.lib
  	./load qmail-remote control.o tcpto.o now.o \\
- 	base64.o constmap.o md5c.o hmac_md5.o ipalloc.o ipme.o \\
--	quote.o dns.o ucspissl.a auto_qmail.o dns_tlsa.o \\
+ 	base64.o constmap.o hmac_md5.o md5c.o ipalloc.o ipme.o \\
+ 	quote.o dns.o auto_qmail.o auto_queue.o dns_tlsa.o \\
 -	tls_errors.o tls_remote.o tls_timeoutio.o ucspissl.a \\
-+	quote.o dns.o auto_qmail.o dns_tlsa.o \\
 +	tls_errors.o tls_remote.o tls_timeoutio.o -lucspissl \\
  	\`cat ssl.lib\` \`cat dns.lib\` \`cat socket.lib\` \`cat qlibs.lib\` \`cat idn2.lib\`
  
  qmail-remote.o: \\
+@@ -1098,10 +1098,10 @@ qmail-smtpam: \\
+ load qmail-smtpam.o control.o now.o dns.o constmap.o \\
+ ipalloc.o ipme.o quote.o auto_qmail.o auto_queue.o tcpto.o \\
+ tls_timeoutio.o tls_errors.o tls_remote.o dns_tlsa.o \\
+-ssl.lib dns.lib socket.lib qlibs.lib ucspissl.a
++ssl.lib dns.lib socket.lib qlibs.lib
+ 	./load qmail-smtpam constmap.o control.o dns_tlsa.o \\
+ 	tcpto.o now.o dns.o ipalloc.o ipme.o quote.o auto_qmail.o \\
+-	auto_queue.o tls_errors.o tls_remote.o tls_timeoutio.o ucspissl.a \\
++	auto_queue.o tls_errors.o tls_remote.o tls_timeoutio.o -lucspissl \\
+ 	\`cat ssl.lib\` \`cat dns.lib\` \`cat socket.lib\` \`cat qlibs.lib\` 
+ 
+ qmail-smtpam.o: \\
 END
 
 printf "000-config.patch\n000-make-ucspissl.patch\n" >>debian/patches/series