--- rpms/qmail/sme10/qmail.spec	2016/12/05 15:50:39	1.3
+++ rpms/qmail/sme10/qmail.spec	2021/04/12 21:54:46	1.8
@@ -1,32 +1,38 @@
-# $Id: qmail.spec,v 1.2 2016/12/05 15:49:55 vip-ire Exp $
+# $Id: qmail.spec,v 1.7 2021/04/12 21:50:15 jpp Exp $
 
 #
 # RPM spec file for Dan Bernstein's qmail package
 #
-# $Id: qmail.spec,v 1.2 2016/12/05 15:49:55 vip-ire Exp $
+# $Id: qmail.spec,v 1.7 2021/04/12 21:50:15 jpp Exp $
 #
 Summary: A modern, fast, secure replacement for sendmail
 %define name qmail
 Name: %{name}
 %define version 1.03
-%define release 18
+%define release 25
 Version: %{version}
 Release: %{release}%{?dist}
 #Author: Daniel J. Bernstein
 License: Public Domain
 Group: Networking/Daemons
 Source: http://cr.yp.to/software/%{name}-%{version}.tar.gz
+Source1: http://notes.sagredo.eu/sites/notes.sagredo.eu/files/qmail/patches/moreipme.README
 Patch0: qmail-1.03-echouser.patch
 Patch1: http://homepages.tesco.net./~J.deBoynePollard/Softwares/qmail/any-to-cname.patch
 Patch2: qmail-103-dns_response_buffer.patch
-Patch3: http://www.suspectclass.com/sgifford/qmail/qmail-0.0.0.0.patch
+#Patch3: http://www.suspectclass.com/sgifford/qmail/qmail-0.0.0.0.patch
 Patch4: qmail-inject-null-sender.patch
+Patch5: http://notes.sagredo.eu/sites/notes.sagredo.eu/files/qmail/patches/qmail-1.03-moreipme-0.6.patch
+Patch6: netqmail-1.06-tls-20190517-remote.patch
+#adapted from http://inoa.net/qmail-tls/netqmail-1.06-tls-20190517.patch
 URL: http://cr.yp.to/%{name}.html
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Provides: smtpdaemon
 Requires: /bin/cut, /bin/grep, /usr/bin/id
 Requires: /usr/sbin/useradd, /usr/sbin/groupadd
+Requires: openssl
 BuildRequires: groff
+BuildRequires: openssl openssl-devel
 Conflicts: sendmail
 AutoReqProv: no
 
@@ -75,6 +81,21 @@ also includes a drop-in ``sendmail'' wra
 transparently by your current UAs.
 
 %changelog
+* Mon Apr 12 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.03-25.sme
+- add remote tls transport for qmail-remote [SME: 9349]
+- updated release number higher than SME9
+- now TLS and EHLO are defined to allow proper compilation
+- add DEBUG flag for the moment to help configuring -DDEBUG=1
+
+* Thu Apr 13 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.03-21.sme
+- added documentation [SME: 9705]
+- added binaries ipmetest et ipmeprint to help configuration
+
+* Mon Apr 10 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.03-20.sme
+- add moreip to avoid loop [SME: 9705]
+- patch from Scott Gifford
+- remove qmail-0.0.0.0.patch as it is included
+
 * Mon Dec 5 2016 Daniel Berteaud <daniel@firewall-services.com> 1.03-18
 - Consider literal <> as null sender [SME: 9884]
 
@@ -204,11 +225,15 @@ transparently by your current UAs.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+#%patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
-echo gcc -O2 --include /usr/include/errno.h > conf-cc
+#echo gcc -O2 --include /usr/include/errno.h > conf-cc
+#gcc -O2 -DTLS=20021228 -I/usr/local/ssl/include
+echo gcc -O2 -DTLS=20021228 -I/usr/local/ssl/include -DEHLO=1 -DDEBUG=1  --include /usr/include/errno.h > conf-cc
 make
 
 %install
@@ -244,7 +269,7 @@ for i in \
   qmail-qmqpd qmail-qmtpd qmail-smtpd sendmail tcp-env qreceipt \
   qsmhook qbiff forward preline condredirect \
   bouncesaying except maildirmake maildir2mbox maildirwatch \
-  qail elq pinq
+  qail elq pinq ipmetest ipmeprint
 do
   mv $i $RPM_BUILD_ROOT/var/qmail/bin/
 done
@@ -266,6 +291,7 @@ for i in \
 do
   mv $i $RPM_BUILD_ROOT/var/qmail/doc/
 done
+%{__install} -Dp  %{SOURCE1} %{buildroot}/var/qmail/doc/
 
 for i in 1 5 7 8
 do
@@ -491,6 +517,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(700,qmails,qmail) %dir /var/qmail/queue/remote/21
 %attr(700,qmails,qmail) %dir /var/qmail/queue/remote/22
 %attr(750,qmailq,qmail) %dir /var/qmail/queue/lock
+%attr(755,root,qmail)        /var/qmail/bin/ipmetest
+%attr(755,root,qmail)        /var/qmail/bin/ipmeprint
 %attr(4711,qmailq,qmail)     /var/qmail/bin/qmail-queue
 %attr(700,root,qmail)        /var/qmail/bin/qmail-lspawn
 %attr(700,root,qmail)        /var/qmail/bin/qmail-start
@@ -568,6 +596,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(644,root,qmail)        /var/qmail/doc/PIC.relaybad
 %attr(644,root,qmail)        /var/qmail/doc/PIC.relaygood
 %attr(644,root,qmail)        /var/qmail/doc/PIC.rem2local
+%attr(644,root,qmail)        /var/qmail/doc/moreipme.README
 %attr(644,root,qmail)        /var/qmail/man/cat1/forward.0
 %attr(644,root,qmail)        /var/qmail/man/cat1/condredirect.0
 %attr(644,root,qmail)        /var/qmail/man/cat1/bouncesaying.0