[milter-regex] Add support for STARTTLS macro checking (#840665)
Paul Howarth
pghmcfc at fedoraproject.org
Tue Jul 17 10:19:20 UTC 2012
commit 8f77fead24905cb2653b6da6db6c77add779a514
Author: Paul Howarth <paul at city-fan.org>
Date: Tue Jul 17 11:18:03 2012 +0100
Add support for STARTTLS macro checking (#840665)
- Add support for STARTTLS macro checking (#840665)
- Defer dæmon startup until network is available
milter-regex-1.9-starttls.patch | 18 ++++++++++++++++++
milter-regex.service | 5 ++---
milter-regex.spec | 16 +++++++++++++++-
3 files changed, 35 insertions(+), 4 deletions(-)
---
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.service b/milter-regex.service
index 50af363..294cf1c 100644
--- a/milter-regex.service
+++ b/milter-regex.service
@@ -1,8 +1,7 @@
[Unit]
Description = Regular expression based mail filter
-After = syslog.target
-Before = sendmail.service
-Before = postfix.service
+After = network.target
+Before = postfix.service sendmail.service
[Service]
Type = forking
diff --git a/milter-regex.spec b/milter-regex.spec
index a249963..cc87681 100644
--- a/milter-regex.spec
+++ b/milter-regex.spec
@@ -1,6 +1,6 @@
Name: milter-regex
Version: 1.9
-Release: 2%{?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.service
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
BuildRequires: systemd-units
@@ -30,9 +31,18 @@ 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]
+
+# Copy out the license text from the source code
head -n +31 milter-regex.c > LICENSE
%build
@@ -101,6 +111,10 @@ fi
%{_mandir}/man8/milter-regex.8*
%changelog
+* Tue Jul 17 2012 Paul Howarth <paul at city-fan.org> - 1.9-3
+- add support for STARTTLS macro checking (#840665)
+- defer dæmon startup until network is available
+
* Fri Jan 6 2012 Paul Howarth <paul at city-fan.org> - 1.9-2
- rebuilt for gcc 4.7
More information about the scm-commits
mailing list