From 6c2c1eab1c7a73a03a6d8eaed439c8372fdefeb1 Mon Sep 17 00:00:00 2001
From: stevejenkins <steve@stevejenkins.com>
Date: Mon, 4 Aug 2014 13:48:04 -0700
Subject: Update to 2.9.2-2

---
 .gitignore    |  3 +++
 opendkim.spec | 26 +++++++++++++++++---------
 sources       |  3 +++
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index a025574..34ae57d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,6 @@
 /opendkim-2.9.0.tar.gz
 /opendkim.add-user-group.patch
 /opendkim-2.9.2.tar.gz
+/opendkim.autocreate-keys-no.patch
+/opendkim.keygen-permissions.patch
+/opendkim.systemd-no-default-genkey.patch
diff --git a/opendkim.spec b/opendkim.spec
index c79ee4f..855fb1d 100644
--- a/opendkim.spec
+++ b/opendkim.spec
@@ -5,7 +5,7 @@
 Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail
 Name: opendkim
 Version: 2.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD and Sendmail
 URL: http://opendkim.org/
 Group: System Environment/Daemons
@@ -35,7 +35,9 @@ BuildRequires: unbound-devel
 
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
-# Patch0: %{name}.patchname.patch
+Patch0: %{name}.keygen-permissions.patch
+Patch1: %{name}.autocreate-keys-no.patch
+Patch2: %{name}.systemd-no-default-genkey.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -79,7 +81,9 @@ It is not required when the init system used is systemd.
 
 %prep
 %setup -q
-# %patch0 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure --with-unbound --with-libmemcached --with-db
@@ -187,8 +191,8 @@ cat > %{buildroot}%{_sysconfdir}/sysconfig/%{name} << 'EOF'
 # Set the necessary startup options
 OPTIONS="-x %{_sysconfdir}/%{name}.conf -P %{_localstatedir}/run/%{name}/%{name}.pid"
 
-# Determine whether default DKIM keys are automatically created on start
-AUTOCREATE_DKIM_KEYS=YES
+# Determine whether default DKIM keys are automatically created on start (deprecated)
+# AUTOCREATE_DKIM_KEYS=YES
 
 # Set the default DKIM selector
 DKIM_SELECTOR=default
@@ -334,16 +338,16 @@ rm -rf %{buildroot}
 %doc contrib/stats/README.%{name}-reportstats
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
-%config(noreplace) %attr(640,%{name},%{name}) %{_sysconfdir}/%{name}/SigningTable
-%config(noreplace) %attr(640,%{name},%{name}) %{_sysconfdir}/%{name}/KeyTable
-%config(noreplace) %attr(640,%{name},%{name}) %{_sysconfdir}/%{name}/TrustedHosts
+%config(noreplace) %attr(640,root,%{name}) %{_sysconfdir}/%{name}/SigningTable
+%config(noreplace) %attr(640,root,%{name}) %{_sysconfdir}/%{name}/KeyTable
+%config(noreplace) %attr(640,root,%{name}) %{_sysconfdir}/%{name}/TrustedHosts
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
 %dir %attr(-,%{name},%{name}) %{_localstatedir}/spool/%{name}
 %dir %attr(-,%{name},%{name}) %{_localstatedir}/run/%{name}
 %dir %attr(-,root,%{name}) %{_sysconfdir}/%{name}
-%dir %attr(750,%name,%{name}) %{_sysconfdir}/%{name}/keys
+%dir %attr(750,root,%{name}) %{_sysconfdir}/%{name}/keys
 %attr(0644,root,root) %{_unitdir}/%{name}.service
 %attr(0755,root,root) %{_sbindir}/%{name}-default-keygen
 
@@ -365,6 +369,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Aug 4 2014 Steve Jenkins <steve@stevejenkins.com> - 2.9.2-2
+- Change file ownerships/permissions to fix https://bugzilla.redhat.com/show_bug.cgi?id=891292
+- Default keys no longer created on startup. Privileged user must run opendkim-default-keygen or create manually (after install)
+
 * Wed Jul 30 2014 Steve Jenkins <steve@stevejenkins.com> - 2.9.2-1
 - Updated to use newer upstream 2.9.2 source code
 - Fixed invalid date in changelog
diff --git a/sources b/sources
index fc2bffa..6c5f0b5 100644
--- a/sources
+++ b/sources
@@ -1 +1,4 @@
+80043a5147ae4ff2feb7f8d32ed2ccac  opendkim.autocreate-keys-no.patch
+a6a9c36328a9b4c18f5fca19e3b1aabc  opendkim.keygen-permissions.patch
+4f9d50fcd8428c280b2a4739cf4b8492  opendkim.systemd-no-default-genkey.patch
 08cc80a2aedec62b0444d8d6af24a155  opendkim-2.9.2.tar.gz
-- 
cgit