[milter-regex/el6] Add support for STARTTLS macro checking (#840665)

[Paul Howarth]

commit 1b83b6a01ebb72ec27ae8bd1e52287b36cf5c380
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Jul 17 11:18:03 2012 +0100

    Add support for STARTTLS macro checking (#840665)

 milter-regex-1.9-starttls.patch | 18 ++++++++++++++++++
 milter-regex.spec               | 11 ++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/milter-regex-1.9-starttls.patch b/milter-regex-1.9-starttls.patch
new file mode 100644
index 0000000..5929aaf
--- /dev/null
+++ b/milter-regex-1.9-starttls.patch
@@ -0,0 +1,18 @@
+diff -uw milter-regex-1.9-orig/milter-regex.c milter-regex-1.9/milter-regex.c
+--- milter-regex-1.9-orig/milter-regex.c	2012-07-16 19:30:27.120520043 +0200
++++ milter-regex-1.9/milter-regex.c	2012-07-16 19:38:04.251049263 +0200
+@@ -119,7 +119,14 @@
+ 	{ "helo", "{cipher_bits}" },
+ 	{ "helo", "{cert_subject}" },
+ 	{ "helo", "{cert_issuer}" },
++	{ "helo", "{verify}" },
+ 	{ "envfrom", "i" },
++	{ "envfrom", "{tls_version}" },
++	{ "envfrom", "{cipher}" },
++	{ "envfrom", "{cipher_bits}" },
++	{ "envfrom", "{cert_subject}" },
++	{ "envfrom", "{cert_issuer}" },
++	{ "envfrom", "{verify}" },
+ 	{ "envfrom", "{auth_type}" },
+ 	{ "envfrom", "{auth_authen}" },
+ 	{ "envfrom", "{auth_ssf}" },
diff --git a/milter-regex.spec b/milter-regex.spec
index 356da22..91f3b6d 100644
--- a/milter-regex.spec
+++ b/milter-regex.spec
@@ -1,6 +1,6 @@
 Name:		milter-regex
 Version:	1.9
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	Milter plug-in for regular expression filtering
 Group:		System Environment/Daemons
 License:	BSD
@@ -10,6 +10,7 @@ Source1:	milter-regex-initscript
 Source2:	milter-regex-options
 Source3:	milter-regex.conf
 Patch0:		milter-regex-1.9-cleanup.patch
+Patch1:		milter-regex-1.9-starttls.patch
 BuildRequires:	sendmail-devel >= 8.13, byacc, groff
 
 %description
@@ -18,8 +19,13 @@ emails using regular expressions.
 
 %prep
 %setup -q
+
+# Get rid of compiler warnings where possible
 %patch0 -p1 -b .cleanup
 
+# Add support for STARTTLS macro checking (#840665)
+%patch1 -p1 -b .starttls
+
 # Customize config file location and dæmon user
 sed -i -e	's|/etc/milter-regex\.conf|%{_sysconfdir}/mail/milter-regex.conf|;
 		 s|_milter-regex|mregex|' milter-regex.[8c]
@@ -76,6 +82,9 @@ fi
 %{_mandir}/man8/milter-regex.8*
 
 %changelog
+* Mon Mar  2 2015 Paul Howarth <paul at city-fan.org> - 1.9-3
+- add support for STARTTLS macro checking (#840665)
+
 * Mon Mar  2 2015 Paul Howarth <paul at city-fan.org> - 1.9-1
 - update to 1.9
   - add -j option to chroot