rpms/dkim-milter/EL-6 dkim-milter.spec,1.12,1.13

[Jim Radford]

Author: radford

Update of /cvs/pkgs/rpms/dkim-milter/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5102

Modified Files:
	dkim-milter.spec 
Log Message:
changes from devel to support postfix and move Socket to the config file



Index: dkim-milter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/EL-6/dkim-milter.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- dkim-milter.spec	2 Feb 2010 18:39:31 -0000	1.12
+++ dkim-milter.spec	3 Jul 2010 21:15:52 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           dkim-milter
 Version:        2.8.3
-Release:        4%{?dist}
+Release:        7%{?dist}
 Summary:        DomainKeys Identified Mail sender authentication sendmail milter
 Group:          System Environment/Daemons
 License:        Sendmail
@@ -38,13 +38,16 @@ cat > devtools/Site/site.config.m4 <<'EO
 define(`confMANROOT', `%{_mandir}/man')
 define(`confUBINDIR', `%{_sbindir}')
 define(`confCCOPTS', `%{optflags}')
+APPENDDEF(`confLIBS', `-lresolv')
 EOF
 
 %build
 make %{?_smp_mflags}
 
-sed -i~ -e 's@^Domain\|^KeyFile\|^Socket@# &@' \
+sed -i~ -e 's@^Domain\|^KeyFile@# &@' \
         -e 's@^# KeyList.*@KeyList	%{keydir}/keylist@' \
+        -e 's@^Socket.*@Socket	local:%{_localstatedir}/run/%{name}/%{name}.sock@' \
+        -e 's@^# UMask.*@UMask	002@' \
   dkim-filter/dkim-filter.conf.sample
 
 sed -i~ -e 's!inet:8891 at localhost!local:%{_localstatedir}/run/%{name}/%{name}.sock!' INSTALL
@@ -126,6 +129,19 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Mon Mar 15 2010 Jim Radford <radford at blackbean.org> - 2.8.3-7
+- Better support postfix by making the defailt UMask 002.
+  This should by ok, as we run with our own user and group.
+
+* Mon Mar 15 2010 Jim Radford <radford at blackbean.org> - 2.8.3-6
+- set Socket in the conf file rather than the initscript to allow the
+  user to change the default in the obvious place, but support it
+  being set in in the sysconfig file or not set at all for backwards
+  compatability with older config files.
+
+* Fri Feb 19 2010 Jim Radford <radford at blackbean.org> - 2.8.3-5
+- libdkim uses resolver(3) and so should link with -lresolv, #565017
+
 * Tue Feb  2 2010 Jim Radford <radford at blackbean.org> - 2.8.3-4
 - require merely /usr/sbin/sendmail as we work with postfix as well as with sendmail