stevej pushed to opendkim (el5). "Update to 2.10.1-6"

[notifications at fedoraproject.org]

>From dcc6fb82a4d9a30e50f98e1d8db68f85881a5557 Mon Sep 17 00:00:00 2001
From: stevejenkins <steve at stevejenkins.com>
Date: Sat, 28 Mar 2015 11:24:52 -0700
Subject: Update to 2.10.1-6


diff --git a/opendkim.spec b/opendkim.spec
index 38b625a..dc56d8b 100644
--- a/opendkim.spec
+++ b/opendkim.spec
@@ -1,11 +1,9 @@
 %global systemd (0%{?fedora} && 0%{?fedora} >= 18) || (0%{?rhel} && 0%{?rhel} >= 7)
 
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-
 Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail
 Name: opendkim
 Version: 2.10.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD and Sendmail
 URL: http://opendkim.org/
 Group: System Environment/Daemons
@@ -21,6 +19,7 @@ Requires (post): systemd-sysv
 BuildRequires: libdb-devel
 BuildRequires: libmemcached-devel
 %else
+# Required for SysV
 Requires (post): chkconfig
 Requires (preun): chkconfig, initscripts
 Requires (postun): initscripts
@@ -106,7 +105,7 @@ install -m 0755 contrib/init/redhat/%{name} %{buildroot}%{_initrddir}/%{name}
 
 cat > %{buildroot}%{_sysconfdir}/%{name}.conf << 'EOF'
 ## BASIC OPENDKIM CONFIGURATION FILE
-## See %{name}.conf(5) or %{_pkgdocdir}/%{name}.conf.sample for more
+## See %{name}.conf(5) or %{_defaultdocdir}/%{name}/%{name}.conf.sample for more
 
 ## BEFORE running OpenDKIM you must:
 
@@ -114,7 +113,7 @@ cat > %{buildroot}%{_sysconfdir}/%{name}.conf << 'EOF'
 ## - generate keys for your domain (if signing)
 ## - edit your DNS records to publish your public keys (if signing)
 
-## See %{_pkgdocdir}/INSTALL for detailed instructions.
+## See %{_defaultdocdir}/%{name}/INSTALL for detailed instructions.
 
 ## CONFIGURATION OPTIONS
 
@@ -425,16 +424,16 @@ rm -rf %{buildroot}
 %doc README.fedora
 %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(0640,%{name},%{name}) %{_sysconfdir}/%{name}/SigningTable
+%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/KeyTable
+%config(noreplace) %attr(0640,%{name},%{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(0775,%{name},%{name}) %{_localstatedir}/run/%{name}
 %dir %attr(-,root,%{name}) %{_sysconfdir}/%{name}
-%dir %attr(750,%name,%{name}) %{_sysconfdir}/%{name}/keys
+%dir %attr(0750,%name,%{name}) %{_sysconfdir}/%{name}/keys
 %attr(0755,root,root) %{_sbindir}/%{name}-default-keygen
 
 %if %systemd
@@ -457,6 +456,12 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sat Mar 28 2015 Steve Jenkins <steve at stevejenkins.com> - 2.10.1-6
+- Remove global _pkgdocdir variable
+- Use defaultdocdir variable in default config file
+- Setting permissions special mode bit explicitly in all cases for consistency
+- Change /var/run/opendkim permissions to group writable for Bug #1120080
+
 * Wed Mar 25 2015 Steve Jenkins <steve at stevejenkins.com> - 2.10.1-5
 - Combined systemd and SysV spec files using conditionals
 - Drop sysvinit subpackage completely
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/opendkim.git/commit/?h=el5&id=dcc6fb82a4d9a30e50f98e1d8db68f85881a5557