[mimedefang] Upgrade to 2.74 (#971523, thanks to Philip Prindeville)

[Robert Scheck]

commit ad4805a1f36a644459866f9e2994eb25dba5c602
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Aug 31 20:13:14 2013 +0200

    Upgrade to 2.74 (#971523, thanks to Philip Prindeville)

 .gitignore                           |    1 +
 mimedefang-2.74-perl_prototype.patch |   15 +++++++++++++++
 mimedefang.spec                      |   25 +++++++++++++++----------
 sources                              |    2 +-
 4 files changed, 32 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 672f60b..cc0e04b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 mimedefang-2.73.tar.gz
+/mimedefang-2.74.tar.gz
diff --git a/mimedefang-2.74-perl_prototype.patch b/mimedefang-2.74-perl_prototype.patch
new file mode 100644
index 0000000..2be819b
--- /dev/null
+++ b/mimedefang-2.74-perl_prototype.patch
@@ -0,0 +1,15 @@
+Patch by Philip Prindeville <philipp_subx at redfish-solutions.com> for MIMEDefang <= 2.74,
+which avoids "Slave 0 stderr: main::rebuild_entity() called too early to check prototype
+at /usr/bin/mimedefang.pl line 805." messages with recent Perl versions. For details see
+also http://lists.roaringpenguin.com/pipermail/mimedefang/2013-June/037083.html
+
+--- mimedefang-2.74/mimedefang.pl.in			2013-05-25 17:30:50.000000000 +0200
++++ mimedefang-2.74/mimedefang.pl.in.perl_prototype	2013-08-31 19:52:27.000000000 +0200
+@@ -764,6 +764,7 @@
+ #  Descends through input entity and rebuilds an output entity.  The
+ #  various parts of the input entity may be modified (or even deleted)
+ #***********************************************************************
++sub rebuild_entity ($$); # Forward declaration to stop warning
+ sub rebuild_entity ($$) {
+     my($out, $in) = @_;
+     my @parts = $in->parts;
diff --git a/mimedefang.spec b/mimedefang.spec
index 0930aa6..2dde6a0 100644
--- a/mimedefang.spec
+++ b/mimedefang.spec
@@ -1,12 +1,13 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
-Version:           2.73
-Release:           6%{?dist}
+Version:           2.74
+Release:           1%{?dist}
 License:           GPLv2+
 Group:             System Environment/Daemons
 URL:               http://www.mimedefang.org/
 Source0:           http://www.mimedefang.org/static/%{name}-%{version}.tar.gz
 Source1:           README.FEDORA
+Patch0:            mimedefang-2.74-perl_prototype.patch
 Requires:          perl-MailTools >= 1.15, perl(Mail::SpamAssassin) >= 1.6
 Requires:          perl(IO::Stringy) >= 1.212, perl(MIME::Base64) >= 3.03
 Requires(pre):     shadow-utils
@@ -31,6 +32,7 @@ could cause problems, for example, with encrypted or signed messages.
 
 %prep
 %setup -q
+%patch0 -p1 -b .perl_prototype
 cp -pf %{SOURCE1} .
 
 %build
@@ -47,6 +49,11 @@ sed -e 's/2345/-/' -i $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mail/sa-mimedefang.cf.example
 
+# Avoid smfi_setsymlist usage due to memory leaks in Sendmail < 8.14.4
+%if 0%{?rhel}%{?fedora} > 5
+sed -e 's/\(-m $MX_SOCKET\)/\1 -y/' -i $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
+%endif
+
 # Create a dummy file and install perl script for later executing
 touch $RPM_BUILD_ROOT%{_sysconfdir}/mail/mimedefang-ip-key
 sed -e '1s@^@#!%{_bindir}/perl\n@' gen-ip-validator.pl > gen-ip-validator.pl.new
@@ -59,13 +66,8 @@ touch -c -r Changelog Changelog.utf8
 mv -f Changelog.utf8 Changelog
 
 %pre
-if [ -x %{_sbindir}/fedora-groupadd -a -x %{_sbindir}/fedora-useradd ]; then
-  getent group defang > /dev/null || %{_sbindir}/fedora-groupadd 8 -r defang
-  getent passwd defang > /dev/null || %{_sbindir}/fedora-useradd 8 -r -g defang -d %{_localstatedir}/spool/MIMEDefang -s /sbin/nologin -c "MIMEDefang User" defang
-else
-  getent group defang > /dev/null || %{_sbindir}/groupadd -r defang
-  getent passwd defang > /dev/null || %{_sbindir}/useradd -r -g defang -d %{_localstatedir}/spool/MIMEDefang -s /sbin/nologin -c "MIMEDefang User" defang
-fi
+getent group defang > /dev/null || %{_sbindir}/groupadd -r defang
+getent passwd defang > /dev/null || %{_sbindir}/useradd -r -g defang -d %{_localstatedir}/spool/MIMEDefang -s /sbin/nologin -c "MIMEDefang User" defang
 exit 0
 
 %post
@@ -89,7 +91,7 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README README.{NONROOT,SECURITY,SOPHIE,SPAMASSASSIN,VEXIRA,FEDORA}
 %doc COPYING Changelog contrib/{word-to-html,linuxorg,fang.pl} examples/*filter*
 %dir %attr(0750,defang,defang) %{_localstatedir}/log/%{name}
@@ -105,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Sat Aug 31 2013 Robert Scheck <robert at fedoraproject.org> 2.74-1
+- Upgrade to 2.74 (#971523, thanks to Philip Prindeville)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.73-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 6e5d47a..d11eaef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-385680c16fb7ecb345d7806a5ee31843  mimedefang-2.73.tar.gz
+4f394f9ec7b62bea3268cb44a35dedbf  mimedefang-2.74.tar.gz