From 1581251b250010c60a9e3d4b2722b3aaa9ef6fab Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 3 Jun 2015 18:10:28 +0200 Subject: [PATCH 01/65] Perl 5.22 rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 6da5364..f5f5603 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.78 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -111,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Wed Jun 03 2015 Jitka Plesnikova - 2.78-3 +- Perl 5.22 rebuild + * Tue May 05 2015 Robert Scheck 2.78-2 - Fix wrong interpreter of mimedefang-util script (#1218754) From 9af8f799916a37cf4f90d494af855e318867be79 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 20:07:27 +0000 Subject: [PATCH 02/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index f5f5603..45f4e73 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.78 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -111,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 2.78-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Jun 03 2015 Jitka Plesnikova - 2.78-3 - Perl 5.22 rebuild From ff19808a40a279de8d65e4d297fff9f800a969f4 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 4 Jan 2016 21:25:32 +0100 Subject: [PATCH 03/65] Provide native systemd service (#789768, #1279452) --- mimedefang-multiplexor.service | 20 ++++++++++ mimedefang-wrapper | 72 ++++++++++++++++++++++++++++++++++ mimedefang.service | 18 +++++++++ mimedefang.spec | 53 ++++++++++++++++++++++--- mimedefang.tmpfilesd | 4 ++ 5 files changed, 162 insertions(+), 5 deletions(-) create mode 100644 mimedefang-multiplexor.service create mode 100644 mimedefang-wrapper create mode 100644 mimedefang.service create mode 100644 mimedefang.tmpfilesd diff --git a/mimedefang-multiplexor.service b/mimedefang-multiplexor.service new file mode 100644 index 0000000..305a323 --- /dev/null +++ b/mimedefang-multiplexor.service @@ -0,0 +1,20 @@ +[Unit] +Description=MIMEDefang multiplexor +After=syslog.target network.target +BindsTo=mimedefang.service +Documentation=man:mimedefang-multiplexor(8) +Documentation=man:mimedefang.pl(8) + +[Service] +Type=forking +PIDFile=/var/spool/MIMEDefang/mimedefang-multiplexor.pid +Environment=HOME=/var/spool/MIMEDefang +Environment=LANG=C +EnvironmentFile=-/etc/sysconfig/mimedefang +ExecStartPre=/usr/libexec/mimedefang-wrapper configtest +ExecStart=/usr/libexec/mimedefang-wrapper multiplexor +ExecReload=/usr/libexec/mimedefang-wrapper reload +SuccessExitStatus=1 + +[Install] +WantedBy=multi-user.target diff --git a/mimedefang-wrapper b/mimedefang-wrapper new file mode 100644 index 0000000..9b1ec63 --- /dev/null +++ b/mimedefang-wrapper @@ -0,0 +1,72 @@ +#!/bin/sh + +# Make sure required variables are set +SOCKET=${SOCKET:=/var/spool/MIMEDefang/mimedefang.sock} +MX_SOCKET=${MX_SOCKET:=/var/spool/MIMEDefang/mimedefang-multiplexor.sock} + +if [ "$1" = "start" ]; then + # Tricky stuff below... "echo -E" won't work, hence the two-step. + exec /usr/bin/mimedefang -P /var/spool/MIMEDefang/mimedefang.pid \ + -m $MX_SOCKET -y \ + $([ -n "$LOOPBACK_RESERVED_CONNECTIONS" ] && echo "-R $LOOPBACK_RESERVED_CONNECTIONS") \ + $([ -n "$MX_USER" ] && echo "-U $MX_USER") \ + $([ -n "$SYSLOG_FACILITY" ] && echo "-S $SYSLOG_FACILITY") \ + $([ "$LOG_FILTER_TIME" = "yes" ] && echo "-T") \ + $([ "$MX_RELAY_CHECK" = "yes" ] && echo "-r") \ + $([ "$MX_HELO_CHECK" = "yes" ] && echo "-H") \ + $([ "$MX_SENDER_CHECK" = "yes" ] && echo "-s") \ + $([ "$MX_RECIPIENT_CHECK" = "yes" ] && echo "-t") \ + $([ "$KEEP_FAILED_DIRECTORIES" = "yes" ] && echo "-k") \ + $([ "$MD_ALLOW_GROUP_ACCESS" = "yes" ] && echo "-G") \ + $([ -n "$MD_EXTRA" ] && echo "$MD_EXTRA") \ + $([ "$ALLOW_NEW_CONNECTIONS_TO_QUEUE" = "yes" ] && echo "-q") \ + -p $SOCKET +fi + +if [ "$1" = "configtest" ]; then + # Check mimedefang-filter syntax + /usr/bin/mimedefang.pl $([ -n "$SUBFILTER" ] && echo "-f $SUBFILTER") -test > /var/spool/MIMEDefang/configtest.out 2>&1 + if [ $? != 0 ]; then + cat /var/spool/MIMEDefang/configtest.out + exit 2 + fi + rm -f /var/spool/MIMEDefang/configtest.out +fi + +if [ "$1" = "reload" ]; then + /usr/bin/md-mx-ctrl -s $MX_SOCKET reread > /dev/null 2>&1 +fi + +if [ "$1" = "multiplexor" ]; then + # Tricky stuff below... "echo -E" won't work, hence the two-step. + exec /usr/bin/mimedefang-multiplexor -p /var/spool/MIMEDefang/mimedefang-multiplexor.pid \ + $([ -n "$FILTER" ] && echo "-f $FILTER") \ + $([ -n "$SYSLOG_FACILITY" ] && echo "-S $SYSLOG_FACILITY") \ + $([ -n "$SUBFILTER" ] && echo "-F $SUBFILTER") \ + $([ -n "$MX_MINIMUM" ] && echo "-m $MX_MINIMUM") \ + $([ -n "$MX_MAXIMUM" ] && echo "-x $MX_MAXIMUM") \ + $([ -n "$MX_RECIPOK_PERDOMAIN_LIMIT" ] && echo "-y $MX_RECIPOK_PERDOMAIN_LIMIT") \ + $([ -n "$MX_USER" ] && echo "-U $MX_USER") \ + $([ -n "$MX_IDLE" ] && echo "-i $MX_IDLE") \ + $([ -n "$MX_BUSY" ] && echo "-b $MX_BUSY") \ + $([ -n "$MX_QUEUE_SIZE" ] && echo "-q $MX_QUEUE_SIZE") \ + $([ -n "$MX_QUEUE_TIMEOUT" ] && echo "-Q $MX_QUEUE_TIMEOUT") \ + $([ -n "$MX_REQUESTS" ] && echo "-r $MX_REQUESTS") \ + $([ -n "$MX_MAP_SOCKET" ] && echo "-N $MX_MAP_SOCKET") \ + $([ -n "$MX_SLAVE_DELAY" ] && echo "-w $MX_SLAVE_DELAY") \ + $([ -n "$MX_MIN_SLAVE_DELAY" ] && echo "-W $MX_MIN_SLAVE_DELAY") \ + $([ -n "$MX_LOG_SLAVE_STATUS_INTERVAL" ] && echo "-L $MX_LOG_SLAVE_STATUS_INTERVAL") \ + $([ -n "$MX_MAX_RSS" ] && echo "-R $MX_MAX_RSS") \ + $([ -n "$MX_MAX_AS" ] && echo "-M $MX_MAX_AS") \ + $([ "$MX_EMBED_PERL" = "yes" ] && (echo -n "-"; echo "E")) \ + $([ "$MX_LOG" = "yes" ] && echo "-l") \ + $([ "$MX_STATS" = "yes" ] && echo "-t /var/log/mimedefang/stats") \ + $([ "$MX_STATUS_UPDATES" = "yes" ] && echo "-Z") \ + $([ "$MX_STATS" = "yes" -a "$MX_FLUSH_STATS" = "yes" ] && echo "-u") \ + $([ -n "$MX_TICK_REQUEST" ] && echo "-X $MX_TICK_REQUEST") \ + $([ -n "$MX_TICK_PARALLEL" ] && echo "-P $MX_TICK_PARALLEL") \ + $([ "$MX_STATS_SYSLOG" = "yes" ] && echo "-T") \ + $([ "$MD_ALLOW_GROUP_ACCESS" = "yes" ] && echo "-G") \ + $([ -n "$MX_NOTIFIER" ] && echo "-O $MX_NOTIFIER") \ + -s $MX_SOCKET +fi diff --git a/mimedefang.service b/mimedefang.service new file mode 100644 index 0000000..5a7c22e --- /dev/null +++ b/mimedefang.service @@ -0,0 +1,18 @@ +[Unit] +Description=MIMEDefang +After=syslog.target network.target mimedefang-multiplexor.service +Before=postfix.service sendmail.service +Requires=mimedefang-multiplexor.service +Documentation=man:mimedefang(8) +Documentation=man:mimedefang-multiplexor(8) + +[Service] +Type=forking +PIDFile=/var/spool/MIMEDefang/mimedefang.pid +EnvironmentFile=-/etc/sysconfig/mimedefang +ExecStart=/usr/libexec/mimedefang-wrapper start +ExecReload=/usr/libexec/mimedefang-wrapper reload + +[Install] +WantedBy=multi-user.target +Also=mimedefang-multiplexor.service diff --git a/mimedefang.spec b/mimedefang.spec index 45f4e73..37475b8 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,18 +1,30 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.78 -Release: 4%{?dist} +Release: 5%{?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 +Source2: mimedefang.service +Source3: mimedefang-multiplexor.service +Source4: mimedefang-wrapper +Source5: mimedefang.tmpfilesd 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 -Requires(post): /sbin/chkconfig, perl(Digest::SHA1) +Requires(post): perl(Digest::SHA1) +%if 0%{?rhel} > 6 || 0%{?fedora} > 23 +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +BuildRequires: systemd +%else +Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service +%endif BuildRequires: sendmail-devel >= 8.12.0 BuildRequires: perl(ExtUtils::MakeMaker), perl(ExtUtils::Embed) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -41,16 +53,25 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' INSTALL_STRIP_FLAG='' install-redhat -# Fix config file, initscript, create log directory and remove duplicate +# Fix config file, create log directory and remove duplicate sed -e '1d' -i $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} -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 +# Install systemd/tmpfiles or initscript files +%if 0%{?rhel} > 6 || 0%{?fedora} > 23 +install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service +install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/%{name}-multiplexor.service +install -D -p -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-wrapper +install -D -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} +%else +sed -e 's/2345/-/' -i $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} # Avoid smfi_setsymlist usage due to memory leaks in Sendmail < 8.14.4 -%if 0%{?rhel}%{?fedora} > 5 +%if 0%{?rhel} > 5 || 0%{?fedora} > 10 sed -e 's/\(-m $MX_SOCKET\)/\1 -y/' -i $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} %endif +%endif # Fix interpreter (without path) of mimedefang-util script sed -e 's@^#!perl -w@#!%{_bindir}/perl -w@' -i $RPM_BUILD_ROOT%{_bindir}/mimedefang-util @@ -73,21 +94,33 @@ getent passwd defang > /dev/null || %{_sbindir}/useradd -r -g defang -d %{_local exit 0 %post +%if 0%{?rhel} > 6 || 0%{?fedora} > 23 +%systemd_post %{name}.service +%else /sbin/chkconfig --add %{name} +%endif if [ ! -f %{_sysconfdir}/mail/mimedefang-ip-key ]; then %{_bindir}/gen-ip-validator.pl > %{_sysconfdir}/mail/mimedefang-ip-key fi %preun +%if 0%{?rhel} > 6 || 0%{?fedora} > 23 +%systemd_preun %{name}.service +%else if [ $1 -eq 0 ]; then /sbin/service %{name} stop > /dev/null 2>&1 || : /sbin/chkconfig --del %{name} fi +%endif %postun +%if 0%{?rhel} > 6 || 0%{?fedora} > 23 +%systemd_postun_with_restart %{name}.service +%else if [ $1 -ne 0 ]; then /sbin/service %{name} condrestart > /dev/null 2>&1 || : fi +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -103,7 +136,14 @@ rm -rf $RPM_BUILD_ROOT %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine %{_bindir}/* %{_mandir}/man?/* +%if 0%{?rhel} > 6 || 0%{?fedora} > 23 +%{_unitdir}/%{name}.service +%{_unitdir}/%{name}-multiplexor.service +%{_libexecdir}/%{name}-wrapper +%{_tmpfilesdir}/%{name}.conf +%else %{_sysconfdir}/rc.d/init.d/%{name} +%endif %config(noreplace) %{_sysconfdir}/mail/mimedefang-filter %config(noreplace) %{_sysconfdir}/mail/sa-mimedefang.cf %ghost %config(noreplace) %{_sysconfdir}/mail/mimedefang-ip-key @@ -111,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Sun Jan 03 2016 Robert Scheck 2.78-5 +- Provide native systemd service (#789768, #1279452) + * Wed Jun 17 2015 Fedora Release Engineering - 2.78-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/mimedefang.tmpfilesd b/mimedefang.tmpfilesd new file mode 100644 index 0000000..87b0949 --- /dev/null +++ b/mimedefang.tmpfilesd @@ -0,0 +1,4 @@ +Z /var/spool/MD-Quarantine 0750 defang defang - - +Z /var/spool/MIMEDefang 0750 defang defang - - +d /var/spool/MIMEDefang/.razor 0750 defang defang - - +L+ /var/spool/MIMEDefang/.razor/razor-agent.log - defang defang - /dev/null From 70fc19be3e4882fdabd19cf799df87db9e279a96 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 9 Jan 2016 01:00:12 +0100 Subject: [PATCH 04/65] Avoid chown-ing and chmod-ing /dev/null (#1296288 #c6) --- mimedefang.spec | 5 ++++- mimedefang.tmpfilesd | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mimedefang.spec b/mimedefang.spec index 37475b8..870b003 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.78 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -151,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Sat Jan 09 2016 Robert Scheck 2.78-6 +- Avoid chown-ing and chmod-ing /dev/null (#1296288 #c6) + * Sun Jan 03 2016 Robert Scheck 2.78-5 - Provide native systemd service (#789768, #1279452) diff --git a/mimedefang.tmpfilesd b/mimedefang.tmpfilesd index 87b0949..28f838d 100644 --- a/mimedefang.tmpfilesd +++ b/mimedefang.tmpfilesd @@ -1,4 +1,4 @@ -Z /var/spool/MD-Quarantine 0750 defang defang - - -Z /var/spool/MIMEDefang 0750 defang defang - - +z /var/spool/MD-Quarantine 0750 defang defang - - +z /var/spool/MIMEDefang 0750 defang defang - - d /var/spool/MIMEDefang/.razor 0750 defang defang - - -L+ /var/spool/MIMEDefang/.razor/razor-agent.log - defang defang - /dev/null +L+ /var/spool/MIMEDefang/.razor/razor-agent.log - - - - /dev/null From 3430bbfd7635f468087be4340a67a9878370eaf5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 08:01:03 +0000 Subject: [PATCH 05/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 870b003..1e4220c 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.78 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -151,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2.78-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Jan 09 2016 Robert Scheck 2.78-6 - Avoid chown-ing and chmod-ing /dev/null (#1296288 #c6) From b337e9cbf6b3936406d25f3010f03e715577f159 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 15 May 2016 01:32:33 +0200 Subject: [PATCH 06/65] Perl 5.24 rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 1e4220c..a101e85 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.78 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -151,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Sat May 14 2016 Jitka Plesnikova - 2.78-8 +- Perl 5.24 rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 2.78-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 3bf238353ab9e9a41b39de4299676ef0bcb4c0e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 09:26:43 +0200 Subject: [PATCH 07/65] Mandatory Perl build-requires added --- mimedefang.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mimedefang.spec b/mimedefang.spec index a101e85..88db989 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -26,6 +26,8 @@ Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service %endif BuildRequires: sendmail-devel >= 8.12.0 +BuildRequires: perl-devel +BuildRequires: perl-generators BuildRequires: perl(ExtUtils::MakeMaker), perl(ExtUtils::Embed) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From 8a13030f782f32a7b41f694dcaf83c9232dceb0a Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Tue, 29 Nov 2016 01:00:23 +0100 Subject: [PATCH 08/65] Upgrade to 2.79 (#1380052) --- mimedefang.spec | 14 ++++++++++---- sources | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mimedefang.spec b/mimedefang.spec index 88db989..9453d3a 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.78 -Release: 8%{?dist} +Version: 2.79 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -25,9 +25,12 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service %endif +%if 0%{?rhel} > 7 || 0%{?fedora} > 25 +BuildRequires: sendmail-milter-devel >= 8.12.0 +%else BuildRequires: sendmail-devel >= 8.12.0 -BuildRequires: perl-devel -BuildRequires: perl-generators +%endif +BuildRequires: %{_sbindir}/sendmail, perl-devel, perl-generators BuildRequires: perl(ExtUtils::MakeMaker), perl(ExtUtils::Embed) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -153,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Tue Nov 29 2016 Robert Scheck 2.79-1 +- Upgrade to 2.79 (#1380052) + * Sat May 14 2016 Jitka Plesnikova - 2.78-8 - Perl 5.24 rebuild diff --git a/sources b/sources index be31638..8018185 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -556999ff8adfed53de9eceac3d84d8a7 mimedefang-2.78.tar.gz +2e8e688101d76eac8e623ac321b00f41 mimedefang-2.79.tar.gz From 1b324f55703f8427bdbacf74f76bc6ba3ed617a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 20:56:57 +0000 Subject: [PATCH 09/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 9453d3a..074510d 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.79 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.79-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Nov 29 2016 Robert Scheck 2.79-1 - Upgrade to 2.79 (#1380052) From 59e92506ed2c67b84ad5336293def3caedb43463 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 4 Jun 2017 08:05:35 +0200 Subject: [PATCH 10/65] Perl 5.26 rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 074510d..4e48d0d 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.79 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Sun Jun 04 2017 Jitka Plesnikova - 2.79-3 +- Perl 5.26 rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.79-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 2a63e0c897583e8f2b83e3b593bf8af7098f3134 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 21:25:15 +0000 Subject: [PATCH 11/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 4e48d0d..8ac1299 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.79 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.79-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sun Jun 04 2017 Jitka Plesnikova - 2.79-3 - Perl 5.26 rebuild From 0b3b520d56186550db5ff036a1c26461bf57a9fc Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 27 Jul 2017 00:51:50 +0200 Subject: [PATCH 12/65] Upgrade to 2.80 (#1474551) --- README.FEDORA | 10 +++++----- mimedefang-multiplexor.service | 1 - mimedefang.spec | 15 +++++++-------- sources | 2 +- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/README.FEDORA b/README.FEDORA index 5be2ad9..7eb2786 100644 --- a/README.FEDORA +++ b/README.FEDORA @@ -5,16 +5,16 @@ sample filters in the /usr/share/doc/mimedefang-* directory. In order to complete the installation of MIMEDefang, you will need to add for example the following lines to your /etc/mail/sendmail.mc file (which requires, -in turn, the installation of sendmail-cf): +in turn, the installation of sendmail-cf package): define(`MILTER', `1')dnl define(`confMILTER_LOG_LEVEL', `6')dnl INPUT_MAIL_FILTER(`mimedefang', `S=unix:/var/spool/MIMEDefang/mimedefang.sock, F=T, T=S:1m;R:1m;E:5m')dnl -Use "service sendmail restart" to rebuild your /etc/mail/sendmail.cf file, run -"chkconfig --level 2345 on" to start MIMEDefang during booting time per default -and execute "service mimedefang start" to start the service. When everything -was correct, MIMEDefang should now do its job... +Use "systemctl restart sendmail.service" to rebuild your /etc/mail/sendmail.cf +file, run "systemctl enable mimedefang.service" to start MIMEDefang during boot +time per default and execute "systemctl enable mimedefang.service" to start the +service. When everything was correct, MIMEDefang should now do its job... For the integration of MIMEDefang and ClamAV, some manual steps are required: diff --git a/mimedefang-multiplexor.service b/mimedefang-multiplexor.service index 305a323..9a03a1b 100644 --- a/mimedefang-multiplexor.service +++ b/mimedefang-multiplexor.service @@ -14,7 +14,6 @@ EnvironmentFile=-/etc/sysconfig/mimedefang ExecStartPre=/usr/libexec/mimedefang-wrapper configtest ExecStart=/usr/libexec/mimedefang-wrapper multiplexor ExecReload=/usr/libexec/mimedefang-wrapper reload -SuccessExitStatus=1 [Install] WantedBy=multi-user.target diff --git a/mimedefang.spec b/mimedefang.spec index 8ac1299..fd2c0f7 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,11 +1,11 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.79 -Release: 4%{?dist} +Version: 2.80 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons -URL: http://www.mimedefang.org/ -Source0: http://www.mimedefang.org/static/%{name}-%{version}.tar.gz +URL: https://mimedefang.org/ +Source0: https://mimedefang.org/static/%{name}-%{version}.tar.gz Source1: README.FEDORA Source2: mimedefang.service Source3: mimedefang-multiplexor.service @@ -78,10 +78,6 @@ sed -e 's/\(-m $MX_SOCKET\)/\1 -y/' -i $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d %endif %endif -# Fix interpreter (without path) of mimedefang-util script -sed -e 's@^#!perl -w@#!%{_bindir}/perl -w@' -i $RPM_BUILD_ROOT%{_bindir}/mimedefang-util -touch -c -r script/mimedefang-util $RPM_BUILD_ROOT%{_bindir}/mimedefang-util - # 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 @@ -156,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Thu Jul 27 2017 Robert Scheck 2.80-1 +- Upgrade to 2.80 (#1474551) + * Wed Jul 26 2017 Fedora Release Engineering - 2.79-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 8018185..f6a1243 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e8e688101d76eac8e623ac321b00f41 mimedefang-2.79.tar.gz +SHA512 (mimedefang-2.80.tar.gz) = 7c0e3233f5e92a61854ea2b3cd5e02e5137dba89ba3db924b1feb11cabe5824719ee5cde9b718b0593e0c159988e8bdd6309991684205d1860eeac3f908b21ed From 7711c566400069a17d139d37dd27edbd4d131e37 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sun, 30 Jul 2017 18:20:52 +0200 Subject: [PATCH 13/65] Rebuild with fixed binutils for ppc64le (#1475636) --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index fd2c0f7..ae4425d 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.80 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: https://mimedefang.org/ @@ -152,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Sun Jul 30 2017 Florian Weimer - 2.80-2 +- Rebuild with binutils fix for ppc64le (#1475636) + * Thu Jul 27 2017 Robert Scheck 2.80-1 - Upgrade to 2.80 (#1474551) From af5b08eb1a247ae10942b587cb4b9d3781eccb4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 03:18:46 +0000 Subject: [PATCH 14/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index ae4425d..6232429 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.80 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: https://mimedefang.org/ @@ -152,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 2.80-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Sun Jul 30 2017 Florian Weimer - 2.80-2 - Rebuild with binutils fix for ppc64le (#1475636) From 92a41edb3d089fead60cbe2469a0fcd76136b8d3 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 3 Sep 2017 23:36:24 +0200 Subject: [PATCH 15/65] Upgrade to 2.81 (#1487543, #1487804) --- mimedefang-2.81-initscript.patch | 33 ++++++++++++++++++++++++++++++++ mimedefang-multiplexor.service | 3 ++- mimedefang-wrapper | 6 ++++-- mimedefang.service | 2 +- mimedefang.spec | 30 +++++++++++++++++------------ sources | 3 ++- 6 files changed, 60 insertions(+), 17 deletions(-) create mode 100644 mimedefang-2.81-initscript.patch diff --git a/mimedefang-2.81-initscript.patch b/mimedefang-2.81-initscript.patch new file mode 100644 index 0000000..2938a2d --- /dev/null +++ b/mimedefang-2.81-initscript.patch @@ -0,0 +1,33 @@ +Patch by Robert Scheck for MIMEDefang 2.81 to unbreak the initscript +after http://lists.roaringpenguin.com/pipermail/mimedefang/2017-August/038085.html which fixes a +privilege escalation via PID file manipulation. + +Patch was proposed to upstream via e-mail at Sun, 3 Sep 2017 22:56:56 +0200 + +--- mimedefang-2.81/redhat/mimedefang-init.in 2017-08-31 22:17:06.000000000 +0200 ++++ mimedefang-2.81/redhat/mimedefang-init.in.initscript 2017-09-03 22:44:36.000000000 +0200 +@@ -217,7 +217,6 @@ + + [ -e $SOCKET ] && rm -f $SOCKET + [ -f /var/run/$prog.pid ] && rm -f /var/run/$prog.pid +- [ -f /var/run/$prog.pid ] && rm -f /var/run/$prog.pid + + # Stop daemon + echo -n "Shutting down $prog-multiplexor: " +@@ -230,7 +229,7 @@ + printf "Waiting for daemons to exit" + WAITPID="" + test -f /var/run/$prog.pid && WAITPID=`cat /var/run/$prog.pid` +- test -f /var/run//prog-multiplexor.pid && WAITPID="$WAITPID `cat /var/run//prog-multiplexor.pid`" ++ test -f /var/run/$prog-multiplexor.pid && WAITPID="$WAITPID `cat /var/run/$prog-multiplexor.pid`" + n=0 + while [ -n "$WAITPID" ] ; do + W2="" +@@ -250,7 +249,6 @@ + fi + + [ -f /var/run/$prog-multiplexor.pid ] && rm -f /var/run/$prog-multiplexor.pid +- [ -f /var/run/$prog-multiplexor.pid ] && rm -f /var/run/$prog-multiplexor.pid + + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog + return $RETVAL diff --git a/mimedefang-multiplexor.service b/mimedefang-multiplexor.service index 9a03a1b..e7b39ae 100644 --- a/mimedefang-multiplexor.service +++ b/mimedefang-multiplexor.service @@ -7,13 +7,14 @@ Documentation=man:mimedefang.pl(8) [Service] Type=forking -PIDFile=/var/spool/MIMEDefang/mimedefang-multiplexor.pid +PIDFile=/run/mimedefang-multiplexor.pid Environment=HOME=/var/spool/MIMEDefang Environment=LANG=C EnvironmentFile=-/etc/sysconfig/mimedefang ExecStartPre=/usr/libexec/mimedefang-wrapper configtest ExecStart=/usr/libexec/mimedefang-wrapper multiplexor ExecReload=/usr/libexec/mimedefang-wrapper reload +SuccessExitStatus=1 [Install] WantedBy=multi-user.target diff --git a/mimedefang-wrapper b/mimedefang-wrapper index 9b1ec63..b935bda 100644 --- a/mimedefang-wrapper +++ b/mimedefang-wrapper @@ -6,7 +6,8 @@ MX_SOCKET=${MX_SOCKET:=/var/spool/MIMEDefang/mimedefang-multiplexor.sock} if [ "$1" = "start" ]; then # Tricky stuff below... "echo -E" won't work, hence the two-step. - exec /usr/bin/mimedefang -P /var/spool/MIMEDefang/mimedefang.pid \ + exec /usr/bin/mimedefang -P /run/mimedefang.pid \ + -o /var/spool/MIMEDefang/mimedefang.lock \ -m $MX_SOCKET -y \ $([ -n "$LOOPBACK_RESERVED_CONNECTIONS" ] && echo "-R $LOOPBACK_RESERVED_CONNECTIONS") \ $([ -n "$MX_USER" ] && echo "-U $MX_USER") \ @@ -39,7 +40,8 @@ fi if [ "$1" = "multiplexor" ]; then # Tricky stuff below... "echo -E" won't work, hence the two-step. - exec /usr/bin/mimedefang-multiplexor -p /var/spool/MIMEDefang/mimedefang-multiplexor.pid \ + exec /usr/bin/mimedefang-multiplexor -p /run/mimedefang-multiplexor.pid \ + -o /var/spool/MIMEDefang/mimedefang-multiplexor.lock \ $([ -n "$FILTER" ] && echo "-f $FILTER") \ $([ -n "$SYSLOG_FACILITY" ] && echo "-S $SYSLOG_FACILITY") \ $([ -n "$SUBFILTER" ] && echo "-F $SUBFILTER") \ diff --git a/mimedefang.service b/mimedefang.service index 5a7c22e..a8c1f04 100644 --- a/mimedefang.service +++ b/mimedefang.service @@ -8,7 +8,7 @@ Documentation=man:mimedefang-multiplexor(8) [Service] Type=forking -PIDFile=/var/spool/MIMEDefang/mimedefang.pid +PIDFile=/run/mimedefang.pid EnvironmentFile=-/etc/sysconfig/mimedefang ExecStart=/usr/libexec/mimedefang-wrapper start ExecReload=/usr/libexec/mimedefang-wrapper reload diff --git a/mimedefang.spec b/mimedefang.spec index 6232429..a29457c 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,16 +1,18 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.80 -Release: 3%{?dist} +Version: 2.81 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: https://mimedefang.org/ Source0: https://mimedefang.org/static/%{name}-%{version}.tar.gz -Source1: README.FEDORA -Source2: mimedefang.service -Source3: mimedefang-multiplexor.service -Source4: mimedefang-wrapper -Source5: mimedefang.tmpfilesd +Source1: https://mimedefang.org/static/%{name}-%{version}.tar.gz.sig +Source2: README.FEDORA +Source3: mimedefang.service +Source4: mimedefang-multiplexor.service +Source5: mimedefang-wrapper +Source6: mimedefang.tmpfilesd +Patch0: mimedefang-2.81-initscript.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 @@ -48,7 +50,8 @@ could cause problems, for example, with encrypted or signed messages. %prep %setup -q -cp -pf %{SOURCE1} . +%patch0 -p1 -b .initscript +cp -pf %{SOURCE2} . %build %configure --with-milterlib=%{_libdir} --with-user=defang --disable-check-perl-modules --disable-anti-virus @@ -65,10 +68,10 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mail/sa-mimedefang.cf.example # Install systemd/tmpfiles or initscript files %if 0%{?rhel} > 6 || 0%{?fedora} > 23 -install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service -install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/%{name}-multiplexor.service -install -D -p -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-wrapper -install -D -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf +install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service +install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/%{name}-multiplexor.service +install -D -p -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-wrapper +install -D -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} %else sed -e 's/2345/-/' -i $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} @@ -152,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Sun Sep 03 2017 Robert Scheck 2.81-1 +- Upgrade to 2.81 (#1487543, #1487804) + * Thu Aug 03 2017 Fedora Release Engineering - 2.80-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index f6a1243..fda685a 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (mimedefang-2.80.tar.gz) = 7c0e3233f5e92a61854ea2b3cd5e02e5137dba89ba3db924b1feb11cabe5824719ee5cde9b718b0593e0c159988e8bdd6309991684205d1860eeac3f908b21ed +SHA512 (mimedefang-2.81.tar.gz) = cb2e207c24a9fdad3d781f5b12001538ea4b2f312851af46ce43ec3356682e3157f87e18f1f91f9687dc9ae6dca9604e9bb4208763718bc3e30dfa4a1a58b573 +SHA512 (mimedefang-2.81.tar.gz.sig) = b6a2460f9b544a8cbb0eb5ddc737ee0f6032ecda143ce47b8ef5c95195190d18ab4e2436edfb967985f5c254ce60c1e9e34c200f43c2dff24f5cd47a92fdaa0b From 1e62caac8396d201cd9de0600b630925df7bc102 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 3 Sep 2017 23:36:56 +0200 Subject: [PATCH 16/65] Ignore signature from sources as well --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f43b1f6..0fa7334 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/mimedefang-?.*.tar.gz +/mimedefang-*.tar.gz +/mimedefang-*.tar.gz.sig From 395d280f215b0d67c3f2394456f48568ba3cbc94 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 9 Oct 2017 22:31:58 +0200 Subject: [PATCH 17/65] Upgrade to 2.82 (#1489992) --- .gitignore | 1 + mimedefang-2.81-initscript.patch | 33 -------------------------------- mimedefang-wrapper | 6 +++--- mimedefang.spec | 32 +++++++++++++++++-------------- sources | 5 +++-- 5 files changed, 25 insertions(+), 52 deletions(-) delete mode 100644 mimedefang-2.81-initscript.patch diff --git a/.gitignore b/.gitignore index 0fa7334..879757e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /mimedefang-*.tar.gz /mimedefang-*.tar.gz.sig +/gpgkey-*.gpg diff --git a/mimedefang-2.81-initscript.patch b/mimedefang-2.81-initscript.patch deleted file mode 100644 index 2938a2d..0000000 --- a/mimedefang-2.81-initscript.patch +++ /dev/null @@ -1,33 +0,0 @@ -Patch by Robert Scheck for MIMEDefang 2.81 to unbreak the initscript -after http://lists.roaringpenguin.com/pipermail/mimedefang/2017-August/038085.html which fixes a -privilege escalation via PID file manipulation. - -Patch was proposed to upstream via e-mail at Sun, 3 Sep 2017 22:56:56 +0200 - ---- mimedefang-2.81/redhat/mimedefang-init.in 2017-08-31 22:17:06.000000000 +0200 -+++ mimedefang-2.81/redhat/mimedefang-init.in.initscript 2017-09-03 22:44:36.000000000 +0200 -@@ -217,7 +217,6 @@ - - [ -e $SOCKET ] && rm -f $SOCKET - [ -f /var/run/$prog.pid ] && rm -f /var/run/$prog.pid -- [ -f /var/run/$prog.pid ] && rm -f /var/run/$prog.pid - - # Stop daemon - echo -n "Shutting down $prog-multiplexor: " -@@ -230,7 +229,7 @@ - printf "Waiting for daemons to exit" - WAITPID="" - test -f /var/run/$prog.pid && WAITPID=`cat /var/run/$prog.pid` -- test -f /var/run//prog-multiplexor.pid && WAITPID="$WAITPID `cat /var/run//prog-multiplexor.pid`" -+ test -f /var/run/$prog-multiplexor.pid && WAITPID="$WAITPID `cat /var/run/$prog-multiplexor.pid`" - n=0 - while [ -n "$WAITPID" ] ; do - W2="" -@@ -250,7 +249,6 @@ - fi - - [ -f /var/run/$prog-multiplexor.pid ] && rm -f /var/run/$prog-multiplexor.pid -- [ -f /var/run/$prog-multiplexor.pid ] && rm -f /var/run/$prog-multiplexor.pid - - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog - return $RETVAL diff --git a/mimedefang-wrapper b/mimedefang-wrapper index b935bda..cff333c 100644 --- a/mimedefang-wrapper +++ b/mimedefang-wrapper @@ -55,9 +55,9 @@ if [ "$1" = "multiplexor" ]; then $([ -n "$MX_QUEUE_TIMEOUT" ] && echo "-Q $MX_QUEUE_TIMEOUT") \ $([ -n "$MX_REQUESTS" ] && echo "-r $MX_REQUESTS") \ $([ -n "$MX_MAP_SOCKET" ] && echo "-N $MX_MAP_SOCKET") \ - $([ -n "$MX_SLAVE_DELAY" ] && echo "-w $MX_SLAVE_DELAY") \ - $([ -n "$MX_MIN_SLAVE_DELAY" ] && echo "-W $MX_MIN_SLAVE_DELAY") \ - $([ -n "$MX_LOG_SLAVE_STATUS_INTERVAL" ] && echo "-L $MX_LOG_SLAVE_STATUS_INTERVAL") \ + $([ -n "$MX_WORKER_DELAY" ] && echo "-w $MX_WORKER_DELAY") \ + $([ -n "$MX_MIN_WORKER_DELAY" ] && echo "-W $MX_MIN_WORKER_DELAY") \ + $([ -n "$MX_LOG_WORKER_STATUS_INTERVAL" ] && echo "-L $MX_LOG_WORKER_STATUS_INTERVAL") \ $([ -n "$MX_MAX_RSS" ] && echo "-R $MX_MAX_RSS") \ $([ -n "$MX_MAX_AS" ] && echo "-M $MX_MAX_AS") \ $([ "$MX_EMBED_PERL" = "yes" ] && (echo -n "-"; echo "E")) \ diff --git a/mimedefang.spec b/mimedefang.spec index a29457c..0659665 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,18 +1,18 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.81 +Version: 2.82 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: https://mimedefang.org/ Source0: https://mimedefang.org/static/%{name}-%{version}.tar.gz Source1: https://mimedefang.org/static/%{name}-%{version}.tar.gz.sig -Source2: README.FEDORA -Source3: mimedefang.service -Source4: mimedefang-multiplexor.service -Source5: mimedefang-wrapper -Source6: mimedefang.tmpfilesd -Patch0: mimedefang-2.81-initscript.patch +Source2: gpgkey-FC2E9B645468698FD7B21655C1842E2A126F42E0.gpg +Source3: README.FEDORA +Source4: mimedefang.service +Source5: mimedefang-multiplexor.service +Source6: mimedefang-wrapper +Source7: mimedefang.tmpfilesd 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 @@ -32,8 +32,9 @@ BuildRequires: sendmail-milter-devel >= 8.12.0 %else BuildRequires: sendmail-devel >= 8.12.0 %endif -BuildRequires: %{_sbindir}/sendmail, perl-devel, perl-generators +BuildRequires: gcc, %{_sbindir}/sendmail, perl-devel, perl-generators BuildRequires: perl(ExtUtils::MakeMaker), perl(ExtUtils::Embed) +BuildRequires: gnupg2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -49,9 +50,9 @@ agreement" that mail transfer agents do not modify message bodies. This could cause problems, for example, with encrypted or signed messages. %prep +gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %setup -q -%patch0 -p1 -b .initscript -cp -pf %{SOURCE2} . +cp -pf %{SOURCE3} . %build %configure --with-milterlib=%{_libdir} --with-user=defang --disable-check-perl-modules --disable-anti-virus @@ -68,10 +69,10 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mail/sa-mimedefang.cf.example # Install systemd/tmpfiles or initscript files %if 0%{?rhel} > 6 || 0%{?fedora} > 23 -install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service -install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/%{name}-multiplexor.service -install -D -p -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-wrapper -install -D -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf +install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service +install -D -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/%{name}-multiplexor.service +install -D -p -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-wrapper +install -D -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} %else sed -e 's/2345/-/' -i $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} @@ -155,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Mon Oct 09 2017 Robert Scheck 2.82-1 +- Upgrade to 2.82 (#1489992) + * Sun Sep 03 2017 Robert Scheck 2.81-1 - Upgrade to 2.81 (#1487543, #1487804) diff --git a/sources b/sources index fda685a..2e2ba75 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -SHA512 (mimedefang-2.81.tar.gz) = cb2e207c24a9fdad3d781f5b12001538ea4b2f312851af46ce43ec3356682e3157f87e18f1f91f9687dc9ae6dca9604e9bb4208763718bc3e30dfa4a1a58b573 -SHA512 (mimedefang-2.81.tar.gz.sig) = b6a2460f9b544a8cbb0eb5ddc737ee0f6032ecda143ce47b8ef5c95195190d18ab4e2436edfb967985f5c254ce60c1e9e34c200f43c2dff24f5cd47a92fdaa0b +SHA512 (mimedefang-2.82.tar.gz) = 253214813e09b5dda99cf6b1416586a52154fbc066c7a07125a43d7daded6d5e11dcaf1ab50a2e83602cae629f6524504c8972f0dc6158e7bd29e6222ce457e8 +SHA512 (mimedefang-2.82.tar.gz.sig) = ebc5574eae2d1557b98d39776e82fba5006ca4ef275e11ee10ee2f9f64118cf44f07a22fc8654180ab4a4127d5d212af03d4d2edfa9a98b839521d1e57031b6d +SHA512 (gpgkey-FC2E9B645468698FD7B21655C1842E2A126F42E0.gpg) = 08e8d5b78d93da5f3c65f74b17feb3fd0f7ad9a1a52bf6545ce3ab690f3f61d99c55619143d5f0ae96be02a38360bb74bd3982f15b0d4b2dfdb9bbb41c783b0f From 306f69c40ed648c21ea6eebe62794158dbfbeba6 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Wed, 1 Nov 2017 02:47:24 +0100 Subject: [PATCH 18/65] Upgrade to 2.83 (#1508217) --- mimedefang.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mimedefang.spec b/mimedefang.spec index 0659665..5aba397 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,6 +1,6 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.82 +Version: 2.83 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons @@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Wed Nov 01 2017 Robert Scheck 2.83-1 +- Upgrade to 2.83 (#1508217) + * Mon Oct 09 2017 Robert Scheck 2.82-1 - Upgrade to 2.82 (#1489992) diff --git a/sources b/sources index 2e2ba75..700a96e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (mimedefang-2.82.tar.gz) = 253214813e09b5dda99cf6b1416586a52154fbc066c7a07125a43d7daded6d5e11dcaf1ab50a2e83602cae629f6524504c8972f0dc6158e7bd29e6222ce457e8 -SHA512 (mimedefang-2.82.tar.gz.sig) = ebc5574eae2d1557b98d39776e82fba5006ca4ef275e11ee10ee2f9f64118cf44f07a22fc8654180ab4a4127d5d212af03d4d2edfa9a98b839521d1e57031b6d +SHA512 (mimedefang-2.83.tar.gz) = aca97af4bdc5ed981bb6e857e4723143499f8a1a0c33c3ff8094346013e01a9f9a8b8f31267d3bc9e9d8a310c5d4ace4cef20574adb667304f72797b78e6df46 +SHA512 (mimedefang-2.83.tar.gz.sig) = 52eaea62308061a57f8a158217cf80e76a82358947899a9e9eebafcf2361479d16b59939b79e6d9d261f8823482c6d4fcbbda72672c1991165a18ff73dc577e0 SHA512 (gpgkey-FC2E9B645468698FD7B21655C1842E2A126F42E0.gpg) = 08e8d5b78d93da5f3c65f74b17feb3fd0f7ad9a1a52bf6545ce3ab690f3f61d99c55619143d5f0ae96be02a38360bb74bd3982f15b0d4b2dfdb9bbb41c783b0f From 03d1a17c3f258cdd14bb08ba0adf1b48fe1770a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 20 Jan 2018 23:07:14 +0100 Subject: [PATCH 19/65] Rebuilt for switch to libxcrypt --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 5aba397..c1ddde0 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.83 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: https://mimedefang.org/ @@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Sat Jan 20 2018 Björn Esser - 2.83-2 +- Rebuilt for switch to libxcrypt + * Wed Nov 01 2017 Robert Scheck 2.83-1 - Upgrade to 2.83 (#1508217) From 365544e1a96d110f0987fc69001d9bb45536a3ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 01:50:46 +0000 Subject: [PATCH 20/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index c1ddde0..872f8d3 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.83 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: https://mimedefang.org/ @@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 2.83-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Jan 20 2018 Björn Esser - 2.83-2 - Rebuilt for switch to libxcrypt From 92c6eb55b0024131c1f9133b801ab8af4ddac2ee Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:49:37 +0100 Subject: [PATCH 21/65] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- mimedefang.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 872f8d3..b7f8f3a 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -35,7 +35,6 @@ BuildRequires: sendmail-devel >= 8.12.0 BuildRequires: gcc, %{_sbindir}/sendmail, perl-devel, perl-generators BuildRequires: perl(ExtUtils::MakeMaker), perl(ExtUtils::Embed) BuildRequires: gnupg2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description MIMEDefang is an e-mail filter program which works with Sendmail 8.12 From 3f1d02b8781d90c05ff66bd72ca642ef96fd7074 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:22:34 +0100 Subject: [PATCH 22/65] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- mimedefang.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/mimedefang.spec b/mimedefang.spec index b7f8f3a..a29b8b8 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -126,9 +126,6 @@ if [ $1 -ne 0 ]; then fi %endif -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} From 9ae7c4be0794803271f964040b02dc5a66f1f8e6 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 22 Mar 2018 13:46:01 +0100 Subject: [PATCH 23/65] Upgrade to 2.84 (#1559208) --- mimedefang.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mimedefang.spec b/mimedefang.spec index a29b8b8..ae64bec 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.83 -Release: 3%{?dist} +Version: 2.84 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: https://mimedefang.org/ @@ -152,6 +152,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Thu Mar 22 2018 Robert Scheck 2.84-1 +- Upgrade to 2.84 (#1559208) + * Thu Feb 08 2018 Fedora Release Engineering - 2.83-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 700a96e..b4fd4e0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (mimedefang-2.83.tar.gz) = aca97af4bdc5ed981bb6e857e4723143499f8a1a0c33c3ff8094346013e01a9f9a8b8f31267d3bc9e9d8a310c5d4ace4cef20574adb667304f72797b78e6df46 -SHA512 (mimedefang-2.83.tar.gz.sig) = 52eaea62308061a57f8a158217cf80e76a82358947899a9e9eebafcf2361479d16b59939b79e6d9d261f8823482c6d4fcbbda72672c1991165a18ff73dc577e0 +SHA512 (mimedefang-2.84.tar.gz) = ffe039654d2e3f649219efc559380e39b21ce910becc36e262356d59d50129f8683ee2e59dd9680aff46478ccebd6b3d9c4567f85ade9a8464077350f4e52f48 +SHA512 (mimedefang-2.84.tar.gz.sig) = 52496f27d966d8101bb5daa145a7d4ac936cd5652c64857b28a98102aec5ca1ed281b6ccb670756028e9bdeab019d1229f3c8cf3f6b5d2c330445dcdb0d7ee77 SHA512 (gpgkey-FC2E9B645468698FD7B21655C1842E2A126F42E0.gpg) = 08e8d5b78d93da5f3c65f74b17feb3fd0f7ad9a1a52bf6545ce3ab690f3f61d99c55619143d5f0ae96be02a38360bb74bd3982f15b0d4b2dfdb9bbb41c783b0f From f6c9f6cf2d652aae2a697e89e1f0d19335f83214 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 28 Jun 2018 03:43:16 +0200 Subject: [PATCH 24/65] Perl 5.28 rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index ae64bec..a7eb296 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.84 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: https://mimedefang.org/ @@ -152,6 +152,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Thu Jun 28 2018 Jitka Plesnikova - 2.84-2 +- Perl 5.28 rebuild + * Thu Mar 22 2018 Robert Scheck 2.84-1 - Upgrade to 2.84 (#1559208) From 415b3210b6959b02c13af1aefd12b0c436acd47e Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 02:01:22 -0500 Subject: [PATCH 25/65] Remove needless use of %defattr --- mimedefang.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index a7eb296..0175f06 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -127,7 +127,6 @@ fi %endif %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license COPYING %doc README README.{NONROOT,SECURITY,SOPHIE,SPAMASSASSIN,VEXIRA,FEDORA} From 9f64a4aa1e9f79c02b2514d8bb8d2d47a184b9fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 10:14:06 +0000 Subject: [PATCH 26/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 0175f06..87dc139 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.84 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: https://mimedefang.org/ @@ -151,6 +151,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.84-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jun 28 2018 Jitka Plesnikova - 2.84-2 - Perl 5.28 rebuild From 1c7ac7d62610c86ca75c64b236f192903dced008 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:54 +0100 Subject: [PATCH 27/65] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- mimedefang.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 87dc139..665d634 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -3,7 +3,6 @@ Name: mimedefang Version: 2.84 Release: 3%{?dist} License: GPLv2+ -Group: System Environment/Daemons URL: https://mimedefang.org/ Source0: https://mimedefang.org/static/%{name}-%{version}.tar.gz Source1: https://mimedefang.org/static/%{name}-%{version}.tar.gz.sig From 3ce14c83b08e03766f336defabfe16b2418b1da6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 10:19:01 +0000 Subject: [PATCH 28/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 665d634..5694f7a 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.84 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/static/%{name}-%{version}.tar.gz @@ -150,6 +150,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.84-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 2.84-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From ef58fea2447b418f3e62169c5ee79e0aaac2726d Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 30 May 2019 14:09:50 +0200 Subject: [PATCH 29/65] Perl 5.30 rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 5694f7a..aee32bb 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.84 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/static/%{name}-%{version}.tar.gz @@ -150,6 +150,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Thu May 30 2019 Jitka Plesnikova - 2.84-5 +- Perl 5.30 rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 2.84-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 52a7e9d5b2b2155d422c9ebab9b93cd7f26b8846 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 16:30:55 +0000 Subject: [PATCH 30/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index aee32bb..15c973a 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.84 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/static/%{name}-%{version}.tar.gz @@ -150,6 +150,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.84-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu May 30 2019 Jitka Plesnikova - 2.84-5 - Perl 5.30 rebuild From 31a741e737a641c17b2fb7adcf32f4b9f83081c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 12:43:26 +0000 Subject: [PATCH 31/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 15c973a..52de88a 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.84 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/static/%{name}-%{version}.tar.gz @@ -150,6 +150,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.84-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 2.84-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 8034bce7dab0fff8c762576b33a06ae70aed42ed Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 22 Jun 2020 18:00:19 +0200 Subject: [PATCH 32/65] Perl 5.32 rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 52de88a..a8f7423 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.84 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/static/%{name}-%{version}.tar.gz @@ -150,6 +150,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Mon Jun 22 2020 Jitka Plesnikova - 2.84-8 +- Perl 5.32 rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 2.84-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 051bca6909f62b2a6ee6cef54c6a2613abc8e8f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 07:23:26 +0000 Subject: [PATCH 33/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index a8f7423..b29fb68 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.84 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/static/%{name}-%{version}.tar.gz @@ -150,6 +150,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.84-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jun 22 2020 Jitka Plesnikova - 2.84-8 - Perl 5.32 rebuild From 203b110da2b9c4176b3c39ca4ee5b41fbd8df73a Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 27 Dec 2020 02:49:04 +0100 Subject: [PATCH 34/65] Remove support for Red Hat Enterprise Linux 6 --- mimedefang.spec | 61 ++++++++++++------------------------------------- 1 file changed, 15 insertions(+), 46 deletions(-) diff --git a/mimedefang.spec b/mimedefang.spec index b29fb68..17cc6cc 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -12,28 +12,28 @@ Source4: mimedefang.service Source5: mimedefang-multiplexor.service Source6: mimedefang-wrapper Source7: mimedefang.tmpfilesd -Requires: perl-MailTools >= 1.15, perl(Mail::SpamAssassin) >= 1.6 -Requires: perl(IO::Stringy) >= 1.212, perl(MIME::Base64) >= 3.03 +Requires: perl-MailTools >= 1.15 +Requires: perl(Mail::SpamAssassin) >= 1.6 +Requires: perl(IO::Stringy) >= 1.212 +Requires: perl(MIME::Base64) >= 3.03 Requires(pre): shadow-utils Requires(post): perl(Digest::SHA1) -%if 0%{?rhel} > 6 || 0%{?fedora} > 23 Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +BuildRequires: gnupg2 BuildRequires: systemd -%else -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/service, /sbin/chkconfig -Requires(postun): /sbin/service -%endif -%if 0%{?rhel} > 7 || 0%{?fedora} > 25 +%if 0%{?rhel} > 7 || 0%{?fedora} BuildRequires: sendmail-milter-devel >= 8.12.0 %else BuildRequires: sendmail-devel >= 8.12.0 %endif -BuildRequires: gcc, %{_sbindir}/sendmail, perl-devel, perl-generators -BuildRequires: perl(ExtUtils::MakeMaker), perl(ExtUtils::Embed) -BuildRequires: gnupg2 +BuildRequires: gcc +BuildRequires: %{_sbindir}/sendmail +BuildRequires: perl-devel +BuildRequires: perl-generators +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::Embed) %description MIMEDefang is an e-mail filter program which works with Sendmail 8.12 @@ -48,16 +48,15 @@ agreement" that mail transfer agents do not modify message bodies. This could cause problems, for example, with encrypted or signed messages. %prep -gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q cp -pf %{SOURCE3} . %build %configure --with-milterlib=%{_libdir} --with-user=defang --disable-check-perl-modules --disable-anti-virus -make %{?_smp_mflags} +%make_build %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' INSTALL_STRIP_FLAG='' install-redhat # Fix config file, create log directory and remove duplicate @@ -65,20 +64,12 @@ sed -e '1d' -i $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mail/sa-mimedefang.cf.example -# Install systemd/tmpfiles or initscript files -%if 0%{?rhel} > 6 || 0%{?fedora} > 23 +# Install systemd unit files and tmpfiles install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service install -D -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/%{name}-multiplexor.service install -D -p -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-wrapper install -D -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} -%else -sed -e 's/2345/-/' -i $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} -# Avoid smfi_setsymlist usage due to memory leaks in Sendmail < 8.14.4 -%if 0%{?rhel} > 5 || 0%{?fedora} > 10 -sed -e 's/\(-m $MX_SOCKET\)/\1 -y/' -i $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} -%endif -%endif # Create a dummy file and install perl script for later executing touch $RPM_BUILD_ROOT%{_sysconfdir}/mail/mimedefang-ip-key @@ -97,36 +88,18 @@ getent passwd defang > /dev/null || %{_sbindir}/useradd -r -g defang -d %{_local exit 0 %post -%if 0%{?rhel} > 6 || 0%{?fedora} > 23 %systemd_post %{name}.service -%else -/sbin/chkconfig --add %{name} -%endif if [ ! -f %{_sysconfdir}/mail/mimedefang-ip-key ]; then %{_bindir}/gen-ip-validator.pl > %{_sysconfdir}/mail/mimedefang-ip-key fi %preun -%if 0%{?rhel} > 6 || 0%{?fedora} > 23 %systemd_preun %{name}.service -%else -if [ $1 -eq 0 ]; then - /sbin/service %{name} stop > /dev/null 2>&1 || : - /sbin/chkconfig --del %{name} -fi -%endif %postun -%if 0%{?rhel} > 6 || 0%{?fedora} > 23 %systemd_postun_with_restart %{name}.service -%else -if [ $1 -ne 0 ]; then - /sbin/service %{name} condrestart > /dev/null 2>&1 || : -fi -%endif %files -%{!?_licensedir:%global license %%doc} %license COPYING %doc README README.{NONROOT,SECURITY,SOPHIE,SPAMASSASSIN,VEXIRA,FEDORA} %doc Changelog contrib/{word-to-html,linuxorg,fang.pl} examples/*filter* @@ -135,14 +108,10 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine %{_bindir}/* %{_mandir}/man?/* -%if 0%{?rhel} > 6 || 0%{?fedora} > 23 %{_unitdir}/%{name}.service %{_unitdir}/%{name}-multiplexor.service %{_libexecdir}/%{name}-wrapper %{_tmpfilesdir}/%{name}.conf -%else -%{_sysconfdir}/rc.d/init.d/%{name} -%endif %config(noreplace) %{_sysconfdir}/mail/mimedefang-filter %config(noreplace) %{_sysconfdir}/mail/sa-mimedefang.cf %ghost %config(noreplace) %{_sysconfdir}/mail/mimedefang-ip-key From 338edbff4f7a1223e6e2c19780c5e8521c6acee4 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 04:00:32 +0000 Subject: [PATCH 35/65] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- mimedefang.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mimedefang.spec b/mimedefang.spec index 17cc6cc..72d1e22 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -21,6 +21,7 @@ Requires(post): perl(Digest::SHA1) Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +BuildRequires: make BuildRequires: gnupg2 BuildRequires: systemd %if 0%{?rhel} > 7 || 0%{?fedora} From 7f4826ee6ccfdc485d50b7bf1e26e9927a7a9248 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 19:45:33 +0000 Subject: [PATCH 36/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 72d1e22..65c48c5 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.84 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/static/%{name}-%{version}.tar.gz @@ -120,6 +120,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.84-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 2.84-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 3ac015212d59769094202bcaeda2383b81dc0849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:28 +0100 Subject: [PATCH 37/65] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- mimedefang.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 65c48c5..371b411 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.84 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/static/%{name}-%{version}.tar.gz @@ -120,6 +120,10 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.84-11 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 2.84-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 870850e1a3351bf77fb1659c594796f1ec15d9ea Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 21 May 2021 12:35:15 +0200 Subject: [PATCH 38/65] Perl 5.34 rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 371b411..528b16a 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.84 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/static/%{name}-%{version}.tar.gz @@ -120,6 +120,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Fri May 21 2021 Jitka Plesnikova - 2.84-12 +- Perl 5.34 rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.84-11 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 0d354070cf9285b99a4ff2cd8d9bf3e0367fa8c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 14:15:52 +0000 Subject: [PATCH 39/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 528b16a..fdd4bd6 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.84 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/static/%{name}-%{version}.tar.gz @@ -120,6 +120,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.84-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri May 21 2021 Jitka Plesnikova - 2.84-12 - Perl 5.34 rebuild From 5584c20c89a9b1aaae14d3510c4d27744207880e Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 29 Aug 2021 21:53:46 +0200 Subject: [PATCH 40/65] Upgrade to 2.85 (#1998443) --- .gitignore | 5 +++-- mimedefang-wrapper | 2 ++ mimedefang.spec | 18 ++++++++++-------- sources | 6 +++--- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 879757e..3a9f0cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ -/mimedefang-*.tar.gz -/mimedefang-*.tar.gz.sig /gpgkey-*.gpg +/mimedefang-*.tar.gz +/mimedefang-*.tar.gz.asc +/mimedefang-*.tar.gz.sig diff --git a/mimedefang-wrapper b/mimedefang-wrapper index cff333c..c04ca95 100644 --- a/mimedefang-wrapper +++ b/mimedefang-wrapper @@ -19,6 +19,7 @@ if [ "$1" = "start" ]; then $([ "$MX_RECIPIENT_CHECK" = "yes" ] && echo "-t") \ $([ "$KEEP_FAILED_DIRECTORIES" = "yes" ] && echo "-k") \ $([ "$MD_ALLOW_GROUP_ACCESS" = "yes" ] && echo "-G") \ + $([ "$MD_SKIP_BAD_RCPTS" = "yes" ] && echo "-N") \ $([ -n "$MD_EXTRA" ] && echo "$MD_EXTRA") \ $([ "$ALLOW_NEW_CONNECTIONS_TO_QUEUE" = "yes" ] && echo "-q") \ -p $SOCKET @@ -60,6 +61,7 @@ if [ "$1" = "multiplexor" ]; then $([ -n "$MX_LOG_WORKER_STATUS_INTERVAL" ] && echo "-L $MX_LOG_WORKER_STATUS_INTERVAL") \ $([ -n "$MX_MAX_RSS" ] && echo "-R $MX_MAX_RSS") \ $([ -n "$MX_MAX_AS" ] && echo "-M $MX_MAX_AS") \ + $([ -n "$MX_MAX_LIFETIME" ] && echo "-V $MX_MAX_LIFETIME") \ $([ "$MX_EMBED_PERL" = "yes" ] && (echo -n "-"; echo "E")) \ $([ "$MX_LOG" = "yes" ] && echo "-l") \ $([ "$MX_STATS" = "yes" ] && echo "-t /var/log/mimedefang/stats") \ diff --git a/mimedefang.spec b/mimedefang.spec index fdd4bd6..60fdbb0 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,12 +1,12 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.84 -Release: 13%{?dist} +Version: 2.85 +Release: 1%{?dist} License: GPLv2+ URL: https://mimedefang.org/ -Source0: https://mimedefang.org/static/%{name}-%{version}.tar.gz -Source1: https://mimedefang.org/static/%{name}-%{version}.tar.gz.sig -Source2: gpgkey-FC2E9B645468698FD7B21655C1842E2A126F42E0.gpg +Source0: https://mimedefang.org/releases/%{name}-%{version}.tar.gz +Source1: https://mimedefang.org/releases/%{name}-%{version}.tar.gz.asc +Source2: gpgkey-9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2.gpg Source3: README.FEDORA Source4: mimedefang.service Source5: mimedefang-multiplexor.service @@ -14,7 +14,6 @@ Source6: mimedefang-wrapper Source7: mimedefang.tmpfilesd Requires: perl-MailTools >= 1.15 Requires: perl(Mail::SpamAssassin) >= 1.6 -Requires: perl(IO::Stringy) >= 1.212 Requires: perl(MIME::Base64) >= 3.03 Requires(pre): shadow-utils Requires(post): perl(Digest::SHA1) @@ -101,8 +100,8 @@ fi %systemd_postun_with_restart %{name}.service %files -%license COPYING -%doc README README.{NONROOT,SECURITY,SOPHIE,SPAMASSASSIN,VEXIRA,FEDORA} +%license LICENSE +%doc README.md README.{NONROOT,SECURITY,SOPHIE,SPAMASSASSIN,FEDORA} %doc Changelog contrib/{word-to-html,linuxorg,fang.pl} examples/*filter* %dir %attr(0750,defang,defang) %{_localstatedir}/log/%{name} %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MIMEDefang @@ -120,6 +119,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Sun Aug 29 2021 Robert Scheck 2.85-1 +- Upgrade to 2.85 (#1998443) + * Thu Jul 22 2021 Fedora Release Engineering - 2.84-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index b4fd4e0..49a8810 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (mimedefang-2.84.tar.gz) = ffe039654d2e3f649219efc559380e39b21ce910becc36e262356d59d50129f8683ee2e59dd9680aff46478ccebd6b3d9c4567f85ade9a8464077350f4e52f48 -SHA512 (mimedefang-2.84.tar.gz.sig) = 52496f27d966d8101bb5daa145a7d4ac936cd5652c64857b28a98102aec5ca1ed281b6ccb670756028e9bdeab019d1229f3c8cf3f6b5d2c330445dcdb0d7ee77 -SHA512 (gpgkey-FC2E9B645468698FD7B21655C1842E2A126F42E0.gpg) = 08e8d5b78d93da5f3c65f74b17feb3fd0f7ad9a1a52bf6545ce3ab690f3f61d99c55619143d5f0ae96be02a38360bb74bd3982f15b0d4b2dfdb9bbb41c783b0f +SHA512 (gpgkey-9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2.gpg) = 0565821ef8519dd53c04215b1d5f5258cd120d6d6ac87325fad4fb698524b61a62680e166db9616cf4f91ca6f633a36f7d7612ecd2423656b6f3949e74ad8e29 +SHA512 (mimedefang-2.85.tar.gz) = 56dc103330a2180b4f02d7edf30523863b7ad629df5cfbaa738e7e836ded0ed7470cba48a664f2bb2d908de3a2678b8f53e260af90b102e17ddb9f9d608ff8a0 +SHA512 (mimedefang-2.85.tar.gz.asc) = ba1f535dd362da3cc6ef634cd12c7d81884612ace70b82646f01d39db85c8f369a126dd903617c045cc71cfa61dac85d1922211341c110499e4d0886c6d25dc5 From 349753bf3f9637c40e4c8d821ae15f4a585928ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 19:13:27 +0000 Subject: [PATCH 41/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 60fdbb0..9a32191 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.85 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/releases/%{name}-%{version}.tar.gz @@ -119,6 +119,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.85-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Aug 29 2021 Robert Scheck 2.85-1 - Upgrade to 2.85 (#1998443) From 5f3634772aaf6bb9576e25f350f7e421360271a2 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Fri, 11 Feb 2022 00:37:56 +0100 Subject: [PATCH 42/65] Upgrade to 2.86 (#2033718, #2053245) --- mimedefang.spec | 70 ++++++++++++++++++++++++------------------------- sources | 4 +-- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/mimedefang.spec b/mimedefang.spec index 9a32191..eeffec9 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,39 +1,36 @@ -Summary: E-Mail filtering framework using Sendmail's Milter interface -Name: mimedefang -Version: 2.85 -Release: 2%{?dist} -License: GPLv2+ -URL: https://mimedefang.org/ -Source0: https://mimedefang.org/releases/%{name}-%{version}.tar.gz -Source1: https://mimedefang.org/releases/%{name}-%{version}.tar.gz.asc -Source2: gpgkey-9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2.gpg -Source3: README.FEDORA -Source4: mimedefang.service -Source5: mimedefang-multiplexor.service -Source6: mimedefang-wrapper -Source7: mimedefang.tmpfilesd -Requires: perl-MailTools >= 1.15 -Requires: perl(Mail::SpamAssassin) >= 1.6 -Requires: perl(MIME::Base64) >= 3.03 -Requires(pre): shadow-utils -Requires(post): perl(Digest::SHA1) -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -BuildRequires: make -BuildRequires: gnupg2 -BuildRequires: systemd -%if 0%{?rhel} > 7 || 0%{?fedora} -BuildRequires: sendmail-milter-devel >= 8.12.0 +Summary: E-Mail filtering framework using Sendmail's Milter interface +Name: mimedefang +Version: 2.86 +Release: 1%{?dist} +License: GPLv2+ +URL: https://mimedefang.org/ +Source0: https://mimedefang.org/releases/%{name}-%{version}.tar.gz +Source1: https://mimedefang.org/releases/%{name}-%{version}.tar.gz.asc +Source2: gpgkey-9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2.gpg +Source3: README.FEDORA +Source4: mimedefang.service +Source5: mimedefang-multiplexor.service +Source6: mimedefang-wrapper +Source7: mimedefang.tmpfilesd +BuildRequires: gnupg2 +BuildRequires: gcc +BuildRequires: make +BuildRequires: perl-generators +BuildRequires: perl-interpreter +BuildRequires: perl(ExtUtils::Embed) +BuildRequires: %{_sbindir}/sendmail +%if 0%{?fedora} || 0%{?rhel} > 7 +BuildRequires: sendmail-milter-devel >= 8.12.0 +BuildRequires: systemd-rpm-macros +Recommends: perl(Mail::SpamAssassin) >= 1.6 %else -BuildRequires: sendmail-devel >= 8.12.0 +BuildRequires: sendmail-devel >= 8.12.0 +BuildRequires: systemd +Requires: perl(Mail::SpamAssassin) >= 1.6 %endif -BuildRequires: gcc -BuildRequires: %{_sbindir}/sendmail -BuildRequires: perl-devel -BuildRequires: perl-generators -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(ExtUtils::Embed) +%{?systemd_requires} +Requires(pre): shadow-utils +Requires(post): perl(Digest::SHA1) %description MIMEDefang is an e-mail filter program which works with Sendmail 8.12 @@ -57,7 +54,7 @@ cp -pf %{SOURCE3} . %make_build %install -make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' INSTALL_STRIP_FLAG='' install-redhat +%make_install %{?el7:INSTALL='install -p'} INSTALL_STRIP_FLAG='' install-redhat # Fix config file, create log directory and remove duplicate sed -e '1d' -i $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} @@ -119,6 +116,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Fri Feb 11 2022 Robert Scheck 2.86-1 +- Upgrade to 2.86 (#2033718, #2053245) + * Thu Jan 20 2022 Fedora Release Engineering - 2.85-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 49a8810..854ee10 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gpgkey-9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2.gpg) = 0565821ef8519dd53c04215b1d5f5258cd120d6d6ac87325fad4fb698524b61a62680e166db9616cf4f91ca6f633a36f7d7612ecd2423656b6f3949e74ad8e29 -SHA512 (mimedefang-2.85.tar.gz) = 56dc103330a2180b4f02d7edf30523863b7ad629df5cfbaa738e7e836ded0ed7470cba48a664f2bb2d908de3a2678b8f53e260af90b102e17ddb9f9d608ff8a0 -SHA512 (mimedefang-2.85.tar.gz.asc) = ba1f535dd362da3cc6ef634cd12c7d81884612ace70b82646f01d39db85c8f369a126dd903617c045cc71cfa61dac85d1922211341c110499e4d0886c6d25dc5 +SHA512 (mimedefang-2.86.tar.gz) = b2543a248a7f19245ab3f479a704575757063d5c96da364e0d9a6cc60f3a761e0981e5d31ff46f9c467832e0b0bf0b855b7ec641bf350c685d4f3867f0041f83 +SHA512 (mimedefang-2.86.tar.gz.asc) = 5e42db7217afc7521bd236713ca4d7aa851611a506cf0b2cc405c11a50c23a366845b3ab5b04c7f83a74d4d35a0725e6009b998543e0455b111fbcd3d60c7faa From 86d736e8ff89b96cf087ae1deb93d6b88ae58794 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 30 May 2022 20:14:53 +0200 Subject: [PATCH 43/65] Perl 5.36 rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index eeffec9..ff18ead 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.86 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/releases/%{name}-%{version}.tar.gz @@ -116,6 +116,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Mon May 30 2022 Jitka Plesnikova - 2.86-2 +- Perl 5.36 rebuild + * Fri Feb 11 2022 Robert Scheck 2.86-1 - Upgrade to 2.86 (#2033718, #2053245) From 6e429a31c4168e61d96bdb01f29ed25042307bf2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 21:05:33 +0000 Subject: [PATCH 44/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index ff18ead..7e43e6a 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.86 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/releases/%{name}-%{version}.tar.gz @@ -116,6 +116,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.86-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon May 30 2022 Jitka Plesnikova - 2.86-2 - Perl 5.36 rebuild From 796fc67a41c26c692a4de556e357865ec93f6e1b Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 31 Jul 2022 22:11:31 +0200 Subject: [PATCH 45/65] Added sysusers.d file to achieve user() and group() provides --- mimedefang.spec | 29 ++++++++++++++++------------- mimedefang.sysusersd | 2 ++ 2 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 mimedefang.sysusersd diff --git a/mimedefang.spec b/mimedefang.spec index 7e43e6a..a7d9b20 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 2.86 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/releases/%{name}-%{version}.tar.gz @@ -12,25 +12,25 @@ Source4: mimedefang.service Source5: mimedefang-multiplexor.service Source6: mimedefang-wrapper Source7: mimedefang.tmpfilesd +Source8: mimedefang.sysusersd BuildRequires: gnupg2 BuildRequires: gcc BuildRequires: make BuildRequires: perl-generators BuildRequires: perl-interpreter BuildRequires: perl(ExtUtils::Embed) +BuildRequires: systemd-rpm-macros BuildRequires: %{_sbindir}/sendmail %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: sendmail-milter-devel >= 8.12.0 -BuildRequires: systemd-rpm-macros Recommends: perl(Mail::SpamAssassin) >= 1.6 %else BuildRequires: sendmail-devel >= 8.12.0 -BuildRequires: systemd Requires: perl(Mail::SpamAssassin) >= 1.6 %endif -%{?systemd_requires} -Requires(pre): shadow-utils Requires(post): perl(Digest::SHA1) +%{?systemd_requires} +%{?sysusers_requires_compat} %description MIMEDefang is an e-mail filter program which works with Sendmail 8.12 @@ -62,16 +62,17 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mail/sa-mimedefang.cf.example # Install systemd unit files and tmpfiles -install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service -install -D -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/%{name}-multiplexor.service -install -D -p -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-wrapper -install -D -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf +install -D -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service +install -D -p -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/%{name}-multiplexor.service +install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-wrapper +install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf +install -D -p -m 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysusersdir}/%{name}.conf rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} # 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 -install -m 755 gen-ip-validator.pl.new $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl +install -m 0755 gen-ip-validator.pl.new $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl touch -c -r gen-ip-validator.pl $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl # Convert everything to UTF-8 @@ -80,9 +81,7 @@ touch -c -r Changelog Changelog.utf8 mv -f Changelog.utf8 Changelog %pre -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 +%sysusers_create_compat %{SOURCE8} %post %systemd_post %{name}.service @@ -108,6 +107,7 @@ fi %{_unitdir}/%{name}.service %{_unitdir}/%{name}-multiplexor.service %{_libexecdir}/%{name}-wrapper +%{_sysusersdir}/%{name}.conf %{_tmpfilesdir}/%{name}.conf %config(noreplace) %{_sysconfdir}/mail/mimedefang-filter %config(noreplace) %{_sysconfdir}/mail/sa-mimedefang.cf @@ -116,6 +116,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Sun Jul 31 2022 Robert Scheck 2.86-4 +- Added sysusers.d file to achieve user() and group() provides + * Thu Jul 21 2022 Fedora Release Engineering - 2.86-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/mimedefang.sysusersd b/mimedefang.sysusersd new file mode 100644 index 0000000..d0307db --- /dev/null +++ b/mimedefang.sysusersd @@ -0,0 +1,2 @@ +#Type Name ID GECOS Home directory Shell +u defang - "MIMEDefang User" /var/spool/MIMEDefang /sbin/nologin From 409037d533e4c6a629b31c28a37c548a0a288ef4 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 6 Aug 2022 00:53:42 +0200 Subject: [PATCH 46/65] Upgrade to 3.0 (#2097136) --- mimedefang-3.0-tests.patch | 166 +++++++++++++++++++++++++++++++++++++ mimedefang.spec | 104 ++++++++++++++++++----- mimedefang.sysusersd | 2 +- sources | 4 +- 4 files changed, 253 insertions(+), 23 deletions(-) create mode 100644 mimedefang-3.0-tests.patch diff --git a/mimedefang-3.0-tests.patch b/mimedefang-3.0-tests.patch new file mode 100644 index 0000000..6ce23da --- /dev/null +++ b/mimedefang-3.0-tests.patch @@ -0,0 +1,166 @@ +From 59196454be5f70868ba0c32d795eef215837600c Mon Sep 17 00:00:00 2001 +From: Giovanni Bechis +Date: Fri, 5 Aug 2022 08:39:08 +0200 +Subject: [PATCH] skip re_match_in_zip_directory test if Archive::Zip is not + detected + +--- + t/utils.t | 62 ++++++++++++++++++++++++++++++------------------------- + 1 file changed, 34 insertions(+), 28 deletions(-) + +diff --git a/t/utils.t b/t/utils.t +index 82fae2b..d94875b 100644 +--- a/t/utils.t ++++ b/t/utils.t +@@ -11,6 +11,8 @@ use MIME::Parser; + use Mail::MIMEDefang; + use Mail::MIMEDefang::Utils; + ++use constant HAS_ARCHIVEZIP => eval { require Archive::Zip; }; ++ + sub t_percent_encode : Test(1) + { + my $pe = percent_encode("foo\r\nbar\tbl%t"); +@@ -78,36 +80,40 @@ sub t_re_match_zip : Test(2) + { + my ($done, @parts); + +- # Set up temporary dir +- system('rm', '-rf', 't/tmp'); +- mkdir('t/tmp', 0755); +- +- # Make a parser +- my $parser = MIME::Parser->new(); +- $parser->extract_nested_messages(1); +- $parser->extract_uuencode(1); +- $parser->output_to_core(0); +- $parser->tmp_to_core(0); +- my $filer = MIME::Parser::FileInto->new('t/tmp'); +- $filer->ignore_filename(1); +- $parser->filer($filer); +- +- detect_and_load_perl_modules(); +- my $entity = $parser->parse_open("t/data/zip.eml"); +- @parts = $entity->parts(); +- foreach my $part (@parts) { +- my $bh = $part->bodyhandle(); +- if (defined($bh)) { +- my $path = $bh->path(); +- if (defined($path)) { +- $done = re_match_in_zip_directory($path, "\.bin"); +- is($done, 0); +- $done = re_match_in_zip_directory($path, "\.txt"); +- is($done, 1); ++ SKIP: { ++ skip "Archive::Zip is needed for this test to work", 1 unless (HAS_ARCHIVEZIP); ++ ++ # Set up temporary dir ++ system('rm', '-rf', 't/tmp'); ++ mkdir('t/tmp', 0755); ++ ++ # Make a parser ++ my $parser = MIME::Parser->new(); ++ $parser->extract_nested_messages(1); ++ $parser->extract_uuencode(1); ++ $parser->output_to_core(0); ++ $parser->tmp_to_core(0); ++ my $filer = MIME::Parser::FileInto->new('t/tmp'); ++ $filer->ignore_filename(1); ++ $parser->filer($filer); ++ ++ detect_and_load_perl_modules(); ++ my $entity = $parser->parse_open("t/data/zip.eml"); ++ @parts = $entity->parts(); ++ foreach my $part (@parts) { ++ my $bh = $part->bodyhandle(); ++ if (defined($bh)) { ++ my $path = $bh->path(); ++ if (defined($path)) { ++ $done = re_match_in_zip_directory($path, "\.bin"); ++ is($done, 0); ++ $done = re_match_in_zip_directory($path, "\.txt"); ++ is($done, 1); ++ } + } + } +- } +- system('rm', '-rf', 't/tmp'); ++ system('rm', '-rf', 't/tmp'); ++ }; + } + + __PACKAGE__->runtests(); +From 5f1e751819bc3cd0e78d39c33c4194a82af89c98 Mon Sep 17 00:00:00 2001 +From: Giovanni Bechis +Date: Fri, 5 Aug 2022 08:39:39 +0200 +Subject: [PATCH] do not run Net tests by default + +--- + t/authres.t | 13 +++++++++---- + t/dkim.t | 25 +++++++++++++++---------- + t/dockerPostfix.sh | 2 +- + t/dockerSendmail.sh | 2 +- + 4 files changed, 26 insertions(+), 16 deletions(-) + +diff --git a/t/authres.t b/t/authres.t +index f009a34..2c6edf9 100644 +--- a/t/authres.t ++++ b/t/authres.t +@@ -12,12 +12,17 @@ use File::Copy; + + sub t_md_authres : Test(1) + { +- copy('t/data/dkim1.eml', './INPUTMSG'); ++ SKIP: { ++ if ( (not defined $ENV{'NET_TEST'}) or ($ENV{'NET_TEST'} ne 'yes' )) { ++ skip "Net test disabled", 1 ++ } ++ copy('t/data/dkim1.eml', './INPUTMSG'); + +- my $header = md_authres('test@sa-test.spamassassin.org', '1.2.3.4', 'sa-test.spamassassin.org'); +- like($header, qr{sa\-test\.spamassassin\.org \(MIMEDefang\);(?:.*)\s+dkim=pass \(768\-bit key\) header\.d=sa-test\.spamassassin\.org header\.b="oRxHoP0Y";(?:.*)\s+spf=none \(domain of test\@sa\-test\.spamassassin\.org doesn't specify if 1\.2\.3\.4 is a permitted sender\) smtp\.mailfrom=test\@sa\-test\.spamassassin\.org;}); ++ my $header = md_authres('test@sa-test.spamassassin.org', '1.2.3.4', 'sa-test.spamassassin.org'); ++ like($header, qr{sa\-test\.spamassassin\.org \(MIMEDefang\);(?:.*)\s+dkim=pass \(768\-bit key\) header\.d=sa-test\.spamassassin\.org header\.b="oRxHoP0Y";(?:.*)\s+spf=none \(domain of test\@sa\-test\.spamassassin\.org doesn't specify if 1\.2\.3\.4 is a permitted sender\) smtp\.mailfrom=test\@sa\-test\.spamassassin\.org;}); + +- unlink('./INPUTMSG'); ++ unlink('./INPUTMSG'); ++ }; + } + + __PACKAGE__->runtests(); +diff --git a/t/dkim.t b/t/dkim.t +index 698d2b0..b34436e 100644 +--- a/t/dkim.t ++++ b/t/dkim.t +@@ -42,16 +42,21 @@ sub dkim_verify : Test(3) + { + my ($result, $domain, $ksize); + +- copy('t/data/dkim1.eml', './INPUTMSG'); +- ($result, $domain, $ksize) = md_dkim_verify(); +- is($result, "pass"); +- is($ksize, 768); +- unlink('./INPUTMSG'); +- +- copy('t/data/dkim2.eml', './INPUTMSG'); +- ($result, $domain, $ksize) = md_dkim_verify(); +- is($result, "fail"); +- unlink('./INPUTMSG'); ++ SKIP: { ++ if ( (not defined $ENV{'NET_TEST'}) or ($ENV{'NET_TEST'} ne 'yes' )) { ++ skip "Net test disabled", 1 ++ } ++ copy('t/data/dkim1.eml', './INPUTMSG'); ++ ($result, $domain, $ksize) = md_dkim_verify(); ++ is($result, "pass"); ++ is($ksize, 768); ++ unlink('./INPUTMSG'); ++ ++ copy('t/data/dkim2.eml', './INPUTMSG'); ++ ($result, $domain, $ksize) = md_dkim_verify(); ++ is($result, "fail"); ++ unlink('./INPUTMSG'); ++ }; + } + + __PACKAGE__->runtests(); diff --git a/mimedefang.spec b/mimedefang.spec index a7d9b20..bc7cf2d 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ -Summary: E-Mail filtering framework using Sendmail's Milter interface +Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.86 -Release: 4%{?dist} +Version: 3.0 +Release: 1%{?dist} License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/releases/%{name}-%{version}.tar.gz @@ -13,12 +13,25 @@ Source5: mimedefang-multiplexor.service Source6: mimedefang-wrapper Source7: mimedefang.tmpfilesd Source8: mimedefang.sysusersd +# https://github.com/The-McGrail-Foundation/MIMEDefang/issues/63 +Patch0: mimedefang-3.0-tests.patch BuildRequires: gnupg2 BuildRequires: gcc BuildRequires: make BuildRequires: perl-generators BuildRequires: perl-interpreter +BuildRequires: perl(Digest::SHA) BuildRequires: perl(ExtUtils::Embed) +BuildRequires: perl(FindBin) +BuildRequires: perl(IO::Socket) +BuildRequires: perl(IO::Socket::SSL) +BuildRequires: perl(Mail::DKIM) +BuildRequires: perl(Mail::SPF) +BuildRequires: perl(MIME::Parser) +BuildRequires: perl(MIME::Tools) >= 5.410 +BuildRequires: perl(MIME::WordDecoder) +BuildRequires: perl(Sys::Hostname) +BuildRequires: perl(Sys::Syslog) BuildRequires: systemd-rpm-macros BuildRequires: %{_sbindir}/sendmail %if 0%{?fedora} || 0%{?rhel} > 7 @@ -28,18 +41,31 @@ Recommends: perl(Mail::SpamAssassin) >= 1.6 BuildRequires: sendmail-devel >= 8.12.0 Requires: perl(Mail::SpamAssassin) >= 1.6 %endif -Requires(post): perl(Digest::SHA1) +Requires(post): perl(Digest::SHA) %{?systemd_requires} %{?sysusers_requires_compat} +# Testsuite in %%check +%if 0%{!?_without_tests:1} +BuildRequires: %{_bindir}/prove +BuildRequires: perl(HTML::Parser) +%if 0%{?fedora} || 0%{?rhel} > 8 +BuildRequires: perl(Mail::DKIM::ARC::Signer) > 1.20200000 +%endif +BuildRequires: perl(Mail::DKIM::Signer) +BuildRequires: perl(Net::SMTP) +BuildRequires: perl(Test::Class) +BuildRequires: perl(Test::Most) +%endif + %description MIMEDefang is an e-mail filter program which works with Sendmail 8.12 -and later. It filters all e-mail messages sent via SMTP. MIMEDefang -splits multi-part MIME messages into their components and potentially -deletes or modifies the various parts. It then reassembles the parts -back into an e-mail message and sends it on its way. +and later or Postfix. It filters all e-mail messages sent via SMTP. +MIMEDefang splits multi-part MIME messages into their components and +potentially deletes or modifies the various parts. It then reassembles +the parts back into an e-mail message and sends it on its way. -There are some caveats you should be aware of before using MIMEDefang. +There are some caveats users should be aware of before using MIMEDefang. MIMEDefang potentially alters e-mail messages. This breaks a "gentleman's agreement" that mail transfer agents do not modify message bodies. This could cause problems, for example, with encrypted or signed messages. @@ -47,10 +73,11 @@ could cause problems, for example, with encrypted or signed messages. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q +%patch0 -p1 -b .tests cp -pf %{SOURCE3} . %build -%configure --with-milterlib=%{_libdir} --with-user=defang --disable-check-perl-modules --disable-anti-virus +%configure --with-milterlib=%{_libdir} --with-user=defang --disable-anti-virus %make_build %install @@ -80,6 +107,21 @@ iconv -f iso-8859-1 -t utf-8 -o Changelog.utf8 Changelog touch -c -r Changelog Changelog.utf8 mv -f Changelog.utf8 Changelog +# Only for regression tests; depends on Test::Class, Test::Most and Net::SMTP +find $RPM_BUILD_ROOT \( -name Unit.pm -o -name "*::Unit.3" \) -exec rm -f {} \; + +# ARC (Authenticated Received Chain) support requires Mail::DKIM >= 1.20200000 +%if 0%{?rhel} && 0%{?rhel} < 9 +rm -f t/arc.t +find $RPM_BUILD_ROOT \( -name ARC.pm -o -name "*::ARC.3" \) -exec rm -f {} \; +find $RPM_BUILD_ROOT%{_prefix} -type d -depth -exec rmdir {} 2> /dev/null \; +%endif + +%if 0%{!?_without_tests:1} +%check +make test +%endif + %pre %sysusers_create_compat %{SOURCE8} @@ -99,23 +141,45 @@ fi %license LICENSE %doc README.md README.{NONROOT,SECURITY,SOPHIE,SPAMASSASSIN,FEDORA} %doc Changelog contrib/{word-to-html,linuxorg,fang.pl} examples/*filter* -%dir %attr(0750,defang,defang) %{_localstatedir}/log/%{name} -%dir %attr(0750,defang,defang) %{_localstatedir}/spool/MIMEDefang -%dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine -%{_bindir}/* -%{_mandir}/man?/* +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%config(noreplace) %{_sysconfdir}/mail/mimedefang-filter +%ghost %config(noreplace) %{_sysconfdir}/mail/mimedefang-ip-key +%config(noreplace) %{_sysconfdir}/mail/sa-mimedefang.cf +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%{_bindir}/gen-ip-validator.pl +%{_bindir}/md-mx-ctrl +%{_bindir}/%{name} +%{_bindir}/%{name}.pl +%{_bindir}/%{name}-multiplexor +%{_bindir}/%{name}-util +%{_bindir}/watch-%{name} +%{_bindir}/watch-multiple-%{name}s.tcl %{_unitdir}/%{name}.service %{_unitdir}/%{name}-multiplexor.service %{_libexecdir}/%{name}-wrapper %{_sysusersdir}/%{name}.conf %{_tmpfilesdir}/%{name}.conf -%config(noreplace) %{_sysconfdir}/mail/mimedefang-filter -%config(noreplace) %{_sysconfdir}/mail/sa-mimedefang.cf -%ghost %config(noreplace) %{_sysconfdir}/mail/mimedefang-ip-key -%config(noreplace) %{_sysconfdir}/sysconfig/%{name} -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%{perl_vendorlib}/Mail/MIMEDefang.pm +%{perl_vendorlib}/Mail/MIMEDefang/ +%{_mandir}/man1/%{name}-util.1* +%{_mandir}/man3/Mail::MIMEDefang*.3* +%{_mandir}/man5/%{name}-filter.5* +%{_mandir}/man7/%{name}-notify.7* +%{_mandir}/man7/%{name}-protocol.7* +%{_mandir}/man8/md-mx-ctrl.8* +%{_mandir}/man8/%{name}.8* +%{_mandir}/man8/%{name}.pl.8* +%{_mandir}/man8/%{name}-multiplexor.8* +%{_mandir}/man8/watch-%{name}.8* +%{_mandir}/man8/watch-multiple-%{name}s.8* +%dir %attr(0750,defang,defang) %{_localstatedir}/log/%{name}/ +%dir %attr(0750,defang,defang) %{_localstatedir}/spool/MIMEDefang/ +%dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Sat Aug 06 2022 Robert Scheck 3.0-1 +- Upgrade to 3.0 (#2097136) + * Sun Jul 31 2022 Robert Scheck 2.86-4 - Added sysusers.d file to achieve user() and group() provides diff --git a/mimedefang.sysusersd b/mimedefang.sysusersd index d0307db..ecce431 100644 --- a/mimedefang.sysusersd +++ b/mimedefang.sysusersd @@ -1,2 +1,2 @@ #Type Name ID GECOS Home directory Shell -u defang - "MIMEDefang User" /var/spool/MIMEDefang /sbin/nologin +u defang - "MIMEDefang user" /var/spool/MIMEDefang - diff --git a/sources b/sources index 854ee10..f61afa7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gpgkey-9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2.gpg) = 0565821ef8519dd53c04215b1d5f5258cd120d6d6ac87325fad4fb698524b61a62680e166db9616cf4f91ca6f633a36f7d7612ecd2423656b6f3949e74ad8e29 -SHA512 (mimedefang-2.86.tar.gz) = b2543a248a7f19245ab3f479a704575757063d5c96da364e0d9a6cc60f3a761e0981e5d31ff46f9c467832e0b0bf0b855b7ec641bf350c685d4f3867f0041f83 -SHA512 (mimedefang-2.86.tar.gz.asc) = 5e42db7217afc7521bd236713ca4d7aa851611a506cf0b2cc405c11a50c23a366845b3ab5b04c7f83a74d4d35a0725e6009b998543e0455b111fbcd3d60c7faa +SHA512 (mimedefang-3.0.tar.gz) = e3b9c56d0e5a1c3c4ae54790a5f67f97c92bee1080126728cadd0d077f0cf879332d300b69acc2ee4c072055777013fe455f27864f1063dc6c46d44398f926de +SHA512 (mimedefang-3.0.tar.gz.asc) = 35f89f0128519cd45b0fd77ba6a9c78e8f5a1d1f118a8417dde8d068b13ca83bf94bab4e8d06fbc1f6c769e957a5377fdea14b9d42bcd64e8a9aa89ba6fc7fee From 321004fb2f1f0a934974a3a7b03e65df98e2198b Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Wed, 24 Aug 2022 22:46:03 +0200 Subject: [PATCH 47/65] Upgrade to 3.1 (#2121227) --- mimedefang-3.0-tests.patch | 166 --------------------------------- mimedefang-3.1-dnsbltest.patch | 32 +++++++ mimedefang.spec | 26 +++--- sources | 4 +- 4 files changed, 46 insertions(+), 182 deletions(-) delete mode 100644 mimedefang-3.0-tests.patch create mode 100644 mimedefang-3.1-dnsbltest.patch diff --git a/mimedefang-3.0-tests.patch b/mimedefang-3.0-tests.patch deleted file mode 100644 index 6ce23da..0000000 --- a/mimedefang-3.0-tests.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 59196454be5f70868ba0c32d795eef215837600c Mon Sep 17 00:00:00 2001 -From: Giovanni Bechis -Date: Fri, 5 Aug 2022 08:39:08 +0200 -Subject: [PATCH] skip re_match_in_zip_directory test if Archive::Zip is not - detected - ---- - t/utils.t | 62 ++++++++++++++++++++++++++++++------------------------- - 1 file changed, 34 insertions(+), 28 deletions(-) - -diff --git a/t/utils.t b/t/utils.t -index 82fae2b..d94875b 100644 ---- a/t/utils.t -+++ b/t/utils.t -@@ -11,6 +11,8 @@ use MIME::Parser; - use Mail::MIMEDefang; - use Mail::MIMEDefang::Utils; - -+use constant HAS_ARCHIVEZIP => eval { require Archive::Zip; }; -+ - sub t_percent_encode : Test(1) - { - my $pe = percent_encode("foo\r\nbar\tbl%t"); -@@ -78,36 +80,40 @@ sub t_re_match_zip : Test(2) - { - my ($done, @parts); - -- # Set up temporary dir -- system('rm', '-rf', 't/tmp'); -- mkdir('t/tmp', 0755); -- -- # Make a parser -- my $parser = MIME::Parser->new(); -- $parser->extract_nested_messages(1); -- $parser->extract_uuencode(1); -- $parser->output_to_core(0); -- $parser->tmp_to_core(0); -- my $filer = MIME::Parser::FileInto->new('t/tmp'); -- $filer->ignore_filename(1); -- $parser->filer($filer); -- -- detect_and_load_perl_modules(); -- my $entity = $parser->parse_open("t/data/zip.eml"); -- @parts = $entity->parts(); -- foreach my $part (@parts) { -- my $bh = $part->bodyhandle(); -- if (defined($bh)) { -- my $path = $bh->path(); -- if (defined($path)) { -- $done = re_match_in_zip_directory($path, "\.bin"); -- is($done, 0); -- $done = re_match_in_zip_directory($path, "\.txt"); -- is($done, 1); -+ SKIP: { -+ skip "Archive::Zip is needed for this test to work", 1 unless (HAS_ARCHIVEZIP); -+ -+ # Set up temporary dir -+ system('rm', '-rf', 't/tmp'); -+ mkdir('t/tmp', 0755); -+ -+ # Make a parser -+ my $parser = MIME::Parser->new(); -+ $parser->extract_nested_messages(1); -+ $parser->extract_uuencode(1); -+ $parser->output_to_core(0); -+ $parser->tmp_to_core(0); -+ my $filer = MIME::Parser::FileInto->new('t/tmp'); -+ $filer->ignore_filename(1); -+ $parser->filer($filer); -+ -+ detect_and_load_perl_modules(); -+ my $entity = $parser->parse_open("t/data/zip.eml"); -+ @parts = $entity->parts(); -+ foreach my $part (@parts) { -+ my $bh = $part->bodyhandle(); -+ if (defined($bh)) { -+ my $path = $bh->path(); -+ if (defined($path)) { -+ $done = re_match_in_zip_directory($path, "\.bin"); -+ is($done, 0); -+ $done = re_match_in_zip_directory($path, "\.txt"); -+ is($done, 1); -+ } - } - } -- } -- system('rm', '-rf', 't/tmp'); -+ system('rm', '-rf', 't/tmp'); -+ }; - } - - __PACKAGE__->runtests(); -From 5f1e751819bc3cd0e78d39c33c4194a82af89c98 Mon Sep 17 00:00:00 2001 -From: Giovanni Bechis -Date: Fri, 5 Aug 2022 08:39:39 +0200 -Subject: [PATCH] do not run Net tests by default - ---- - t/authres.t | 13 +++++++++---- - t/dkim.t | 25 +++++++++++++++---------- - t/dockerPostfix.sh | 2 +- - t/dockerSendmail.sh | 2 +- - 4 files changed, 26 insertions(+), 16 deletions(-) - -diff --git a/t/authres.t b/t/authres.t -index f009a34..2c6edf9 100644 ---- a/t/authres.t -+++ b/t/authres.t -@@ -12,12 +12,17 @@ use File::Copy; - - sub t_md_authres : Test(1) - { -- copy('t/data/dkim1.eml', './INPUTMSG'); -+ SKIP: { -+ if ( (not defined $ENV{'NET_TEST'}) or ($ENV{'NET_TEST'} ne 'yes' )) { -+ skip "Net test disabled", 1 -+ } -+ copy('t/data/dkim1.eml', './INPUTMSG'); - -- my $header = md_authres('test@sa-test.spamassassin.org', '1.2.3.4', 'sa-test.spamassassin.org'); -- like($header, qr{sa\-test\.spamassassin\.org \(MIMEDefang\);(?:.*)\s+dkim=pass \(768\-bit key\) header\.d=sa-test\.spamassassin\.org header\.b="oRxHoP0Y";(?:.*)\s+spf=none \(domain of test\@sa\-test\.spamassassin\.org doesn't specify if 1\.2\.3\.4 is a permitted sender\) smtp\.mailfrom=test\@sa\-test\.spamassassin\.org;}); -+ my $header = md_authres('test@sa-test.spamassassin.org', '1.2.3.4', 'sa-test.spamassassin.org'); -+ like($header, qr{sa\-test\.spamassassin\.org \(MIMEDefang\);(?:.*)\s+dkim=pass \(768\-bit key\) header\.d=sa-test\.spamassassin\.org header\.b="oRxHoP0Y";(?:.*)\s+spf=none \(domain of test\@sa\-test\.spamassassin\.org doesn't specify if 1\.2\.3\.4 is a permitted sender\) smtp\.mailfrom=test\@sa\-test\.spamassassin\.org;}); - -- unlink('./INPUTMSG'); -+ unlink('./INPUTMSG'); -+ }; - } - - __PACKAGE__->runtests(); -diff --git a/t/dkim.t b/t/dkim.t -index 698d2b0..b34436e 100644 ---- a/t/dkim.t -+++ b/t/dkim.t -@@ -42,16 +42,21 @@ sub dkim_verify : Test(3) - { - my ($result, $domain, $ksize); - -- copy('t/data/dkim1.eml', './INPUTMSG'); -- ($result, $domain, $ksize) = md_dkim_verify(); -- is($result, "pass"); -- is($ksize, 768); -- unlink('./INPUTMSG'); -- -- copy('t/data/dkim2.eml', './INPUTMSG'); -- ($result, $domain, $ksize) = md_dkim_verify(); -- is($result, "fail"); -- unlink('./INPUTMSG'); -+ SKIP: { -+ if ( (not defined $ENV{'NET_TEST'}) or ($ENV{'NET_TEST'} ne 'yes' )) { -+ skip "Net test disabled", 1 -+ } -+ copy('t/data/dkim1.eml', './INPUTMSG'); -+ ($result, $domain, $ksize) = md_dkim_verify(); -+ is($result, "pass"); -+ is($ksize, 768); -+ unlink('./INPUTMSG'); -+ -+ copy('t/data/dkim2.eml', './INPUTMSG'); -+ ($result, $domain, $ksize) = md_dkim_verify(); -+ is($result, "fail"); -+ unlink('./INPUTMSG'); -+ }; - } - - __PACKAGE__->runtests(); diff --git a/mimedefang-3.1-dnsbltest.patch b/mimedefang-3.1-dnsbltest.patch new file mode 100644 index 0000000..52a90e9 --- /dev/null +++ b/mimedefang-3.1-dnsbltest.patch @@ -0,0 +1,32 @@ +From bdfa58eef62d61c4b5f07a053ee3f55a78cec204 Mon Sep 17 00:00:00 2001 +From: Robert Scheck +Date: Wed, 24 Aug 2022 22:00:06 +0200 +Subject: [PATCH] Skip DNSBL test without network access (fixes #69) + +--- + t/net.t | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/t/net.t b/t/net.t +index 54e7846..b92ed88 100644 +--- a/t/net.t ++++ b/t/net.t +@@ -54,9 +54,15 @@ sub t_relay_is_blacklisted_multi : Test(1) + my @rbl; + $rbl[0] = "dnsbltest.spamassassin.org"; + my $relayip = "144.137.3.98"; +- detect_and_load_perl_modules(); +- my $res = relay_is_blacklisted_multi($relayip, 10, 1, \@rbl); +- is($res->{"dnsbltest.spamassassin.org"}[0], "127.0.0.2"); ++ ++ SKIP: { ++ if ( (not defined $ENV{'NET_TEST'}) or ($ENV{'NET_TEST'} ne 'yes' )) { ++ skip "Net test disabled", 1 ++ } ++ detect_and_load_perl_modules(); ++ my $res = relay_is_blacklisted_multi($relayip, 10, 1, \@rbl); ++ is($res->{"dnsbltest.spamassassin.org"}[0], "127.0.0.2"); ++ } + } + + __PACKAGE__->runtests(); diff --git a/mimedefang.spec b/mimedefang.spec index bc7cf2d..dda85e4 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,6 +1,6 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 3.0 +Version: 3.1 Release: 1%{?dist} License: GPLv2+ URL: https://mimedefang.org/ @@ -13,8 +13,8 @@ Source5: mimedefang-multiplexor.service Source6: mimedefang-wrapper Source7: mimedefang.tmpfilesd Source8: mimedefang.sysusersd -# https://github.com/The-McGrail-Foundation/MIMEDefang/issues/63 -Patch0: mimedefang-3.0-tests.patch +# https://github.com/The-McGrail-Foundation/MIMEDefang/issues/69 +Patch0: https://github.com/The-McGrail-Foundation/MIMEDefang/commit/bdfa58eef62d61c4b5f07a053ee3f55a78cec204.patch#/mimedefang-3.1-dnsbltest.patch BuildRequires: gnupg2 BuildRequires: gcc BuildRequires: make @@ -49,8 +49,8 @@ Requires(post): perl(Digest::SHA) %if 0%{!?_without_tests:1} BuildRequires: %{_bindir}/prove BuildRequires: perl(HTML::Parser) -%if 0%{?fedora} || 0%{?rhel} > 8 -BuildRequires: perl(Mail::DKIM::ARC::Signer) > 1.20200000 +%if 0%{?fedora} || 0%{?rhel} > 7 +BuildRequires: perl(Mail::DKIM::ARC::Signer) >= 0.44 %endif BuildRequires: perl(Mail::DKIM::Signer) BuildRequires: perl(Net::SMTP) @@ -60,7 +60,7 @@ BuildRequires: perl(Test::Most) %description MIMEDefang is an e-mail filter program which works with Sendmail 8.12 -and later or Postfix. It filters all e-mail messages sent via SMTP. +and later, or Postfix. It filters all e-mail messages sent via SMTP. MIMEDefang splits multi-part MIME messages into their components and potentially deletes or modifies the various parts. It then reassembles the parts back into an e-mail message and sends it on its way. @@ -73,7 +73,7 @@ could cause problems, for example, with encrypted or signed messages. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q -%patch0 -p1 -b .tests +%patch0 -p1 -b .dnsbltest cp -pf %{SOURCE3} . %build @@ -102,16 +102,11 @@ sed -e '1s@^@#!%{_bindir}/perl\n@' gen-ip-validator.pl > gen-ip-validator.pl.new install -m 0755 gen-ip-validator.pl.new $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl touch -c -r gen-ip-validator.pl $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl -# Convert everything to UTF-8 -iconv -f iso-8859-1 -t utf-8 -o Changelog.utf8 Changelog -touch -c -r Changelog Changelog.utf8 -mv -f Changelog.utf8 Changelog - # Only for regression tests; depends on Test::Class, Test::Most and Net::SMTP find $RPM_BUILD_ROOT \( -name Unit.pm -o -name "*::Unit.3" \) -exec rm -f {} \; -# ARC (Authenticated Received Chain) support requires Mail::DKIM >= 1.20200000 -%if 0%{?rhel} && 0%{?rhel} < 9 +# ARC (Authenticated Received Chain) support requires Mail::DKIM >= 0.44 +%if 0%{?rhel} == 7 rm -f t/arc.t find $RPM_BUILD_ROOT \( -name ARC.pm -o -name "*::ARC.3" \) -exec rm -f {} \; find $RPM_BUILD_ROOT%{_prefix} -type d -depth -exec rmdir {} 2> /dev/null \; @@ -177,6 +172,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Wed Aug 24 2022 Robert Scheck 3.1-1 +- Upgrade to 3.1 (#2121227) + * Sat Aug 06 2022 Robert Scheck 3.0-1 - Upgrade to 3.0 (#2097136) diff --git a/sources b/sources index f61afa7..9360d2f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gpgkey-9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2.gpg) = 0565821ef8519dd53c04215b1d5f5258cd120d6d6ac87325fad4fb698524b61a62680e166db9616cf4f91ca6f633a36f7d7612ecd2423656b6f3949e74ad8e29 -SHA512 (mimedefang-3.0.tar.gz) = e3b9c56d0e5a1c3c4ae54790a5f67f97c92bee1080126728cadd0d077f0cf879332d300b69acc2ee4c072055777013fe455f27864f1063dc6c46d44398f926de -SHA512 (mimedefang-3.0.tar.gz.asc) = 35f89f0128519cd45b0fd77ba6a9c78e8f5a1d1f118a8417dde8d068b13ca83bf94bab4e8d06fbc1f6c769e957a5377fdea14b9d42bcd64e8a9aa89ba6fc7fee +SHA512 (mimedefang-3.1.tar.gz) = 392c2bfa1f4e6bb2503ba6887d79696ccc861ded17a780d3ff44bd12c14ae248536aa8f056ec4679bf9c76b6a82d0357d5fdfe467b664b8992a0c11056c5180f +SHA512 (mimedefang-3.1.tar.gz.asc) = 4670a8737477feeb434a77de198484232c0d824a55d03aceb1a0852760084fda57d9ace5b68f501f15e78a41771e16d227a5b87fce1a1c4a4a839a6153322523 From f039875daeef22358dc0e30611040e54ad41b946 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 2 Oct 2022 22:21:29 +0200 Subject: [PATCH 48/65] Switch to keys.openpgp.org --- .gitignore | 2 - 9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2 | 55 ++++++++++++++++++++++++ mimedefang.spec | 2 +- sources | 1 - 4 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2 diff --git a/.gitignore b/.gitignore index 3a9f0cb..fe416fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -/gpgkey-*.gpg /mimedefang-*.tar.gz /mimedefang-*.tar.gz.asc -/mimedefang-*.tar.gz.sig diff --git a/9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2 b/9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2 new file mode 100644 index 0000000..eba97e6 --- /dev/null +++ b/9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2 @@ -0,0 +1,55 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: 9F9B 5640 03DF F9E4 D904 301E 3B6D DB11 E78F EBD2 +Comment: MIMEDefang Project Management Committee (Code Signing K + +xsFNBGD63LQBEACvn4KlJJfQpR0scXmdPExppUKYGq2WWDEqtFo7MZu3uO2aL5OA +zT6lWst+7Xnt5BPGekp7sSjXtxxWTsQrkP7iz1dfSIWx0w9morxgyrLea3SOyp6m +s5FSW+1seVyNZXpytWY1L1VFvmGmFNRTWIeV6rVr6vvwSY2X4cMaW9w879OB+iTW +oIRbUrl1T188YzCZnY138CbsGAfmlCMLTraZ6x6LBrrb2TwD52d/qOC2tk0fTm7D +ze0W+jYq1IDcTPH8nwwU1Vvo18l6X+yoqGvinTkBIEKtEewXlp1GG+SxQO8xVuOS +4eSW4VThiS2/9ZsaYW68UbLwu0FJOpM7PWoB/EXXjstJuhzh/6xrFyYtnHiqkN1P +1tJMLkaJG48yyCil5t3WkV+TVIoJoNbzzLb/DAY+aXQwbFxjKxn9nwfy247uDOQE +aEIHzQksDd2clJHn0/27Np8MHmeRiYbYAWJ6SWbZsFwIRqA7C0hS4AoRa/3tkLPZ +j9sULJc7PbbKAu2UPbKzQvn86r212P+L5C8pw9EsDHDR/eZl83q9Apz/IgQYFRmZ +n0P5eWW6fi3zoWfAFkHpGgommoCCsoFjVLDqp/TcUaUHqoO8gMo6rfwgmt1mkYBV +EYpIdywhIK5BXH4UW8z1l8WOByx60RLC/GuCue/2r+NaMz4XPj08s10uEQARAQAB +zVlNSU1FRGVmYW5nIFByb2plY3QgTWFuYWdlbWVudCBDb21taXR0ZWUgKENvZGUg +U2lnbmluZyBLZXkpIDxwcml2YXRlQGxpc3RzLm1pbWVkZWZhbmcub3JnPsLBjgQT +AQoAOBYhBJ+bVkAD3/nk2QQwHjtt2xHnj+vSBQJg+ty0AhsDBQsJCAcDBRUKCQgL +BRYCAwEAAh4BAheAAAoJEDtt2xHnj+vScOYP/iwpsAFVIiDpdHnaKSxjdNzXQpJh +fHXTJOauQw/raMzTdR2V+/HC/PSL25dkdTvEb52xTMOlZfdKKREeaW2XuAtshkw3 +h/8+AwjrvZ8RD05P64BIcBKu/j/YF7c7XU0l7gRTzPNBSzSCPXhLiv9sxQXc6OSt +eXPljp3dk7dfxGy2i8/0/zsw4uAD4Tr+leC0p/RmyosX8Gz5Ih5H1yG2bJDvMu8P +ZOnUaaYfykUNn+8MQfhmTsM9rjbuEbQdwQG/TNvPJCloYLjTUGjYhmZfkeWLaxRi ++C1tDDJKFl2i/GoOo8ADccBwuW11xmHC2AvRFu01Gr+nyJLU+BvD5XQ0LOpXM1uO +O9VE6n0WPoqJDHy4E3DGt47gzZYJV09W8qj4t5G3DF/GDdDYyxNS4pjmgHyrQMSN +4DGhULBRfuJ0igCgjYbhBszFOTasynMkG63R5Bd1e4tmYWljybz8EuPLFkiXsuxD +thjAbjH6byOMo3qY7qmrXYHG1NRrBwBk9Pa+3LycZ4t9ncFH0eQiT5Wqk/TgVDH1 +g2PPtJ7fLsBzDR5BglVfKTJpayw5D/nK4XCEQgxnc1MuTR8UiX7euYU6aRClYFDb +d2zzbMf1k4zzMFRIDoD/P13/Sc96uNtBMIveNrWwlxxf4X79QOaFpR/+j0RQXn79 +bG94RFddKWGHcU8SzsFNBGD63LQBEAC/5VwLagipEcFQ9Y14F1omIvk/GdY9F6jf +lHkv4J3HP6/oFrkT/76iK/3PugRxip423nV/E2M4oDwcU1KU2CCjqDCf6NbAEHOh +BAz5HLxt1TsDGrK8f4fcPpAJ3qMIuaTXSGmZVS11QMTzcBgei785V2gatWnmVM9H +HQ1olLqIDcT0Ki+ZxkXnqJH0Hg9k0Iu3TRthWHjTRaJHSUGPXQyfFu+5Y7NXZgMG +/2BdotS9lASd6SDZToxmlLVXxQven7SDJrReWYdV6PWRb99jOeeEo57EarRpaHMt +n8vfi3c5igvn7Vz0+RC+l5l8SB1Io32KZ2kKjM9o083A6FlSAIHseegTHyFJCHYS +ce/jjBfOxgHxIjqFhB1ApKs4z0KbqvBAGpULOpWrK+jC01/wz+9mdtHRhxuW0yeM +WOXSi6d8LUczrUSp+pk/ArPbOYfB1Wg/mn8ICZ1eR7jEsPA6EQigkn4eFb5xNqSM +luE/IlJjSYQhM9h/X84nkS009urGrVu10nKD1Ju6T6nTXNlfb8lBUcpe1Htp/JRQ +ZXEsgqpFePW9/TYIH57ABJUEEnvG8IimE/wWLBJtuaUEZNCxpYBwQDxFhAejC1AC +cpl5GJaa+cs33JaqlkD86Hl5aaoAi2IHTO//fJNgVUdj7M9aMIHL8PA1DV5xhMy5 +ngzb7moO7wARAQABwsF2BBgBCgAgFiEEn5tWQAPf+eTZBDAeO23bEeeP69IFAmD6 +3LQCGwwACgkQO23bEeeP69KCBw//ZNqN+rw+EVZ3jixxFCmUoIN79u1u1yHHHjgl +gMZskPV2sklXukoFcHaBpEb8seISHKW0tbz4saAM3C1khobo3oY+QX5q0J/MQe9b +iGmkf83xNBDLv59TNgLQYS1YjMvLBHnDB1h2XvGN4GudOmR7a4N+MTupx5dHqRrp +yhNup7xP4HmkpJLkxqIAtmKd3xGXLRfNcokHn0C0+xrjfUBxheLR1Fkb0EjSk7FF +NZn865dxIBCVDZXS07e1EgWL1ZoxsjbFwKRN1gDqakC3CixbuSfuLrw88YGS3ND5 +dZsl1mBluze3n4jb0fPqfbq/lH0Eo7m458V1rT5XkmxDZqlTdMTmPpE/cCSoU1Xv +5bCvmmWJPDi+sgh/hpB5rWL8fD9rapSaSnUnwxJMxL8lSDDEfQ3Wlty+gQPfU0HO +DOWbOjtPU5BxaV6+TkX4LP3tlXXyekqxNexQVEOjLNtJAtzVbLu4w1g79oJ6p8+n +tFwGa8CG+/40ibiqPtpaKDiwWGsNbTepj61908cMvYPGYK//VqfxkL4wSY3cDZB3 +PhIoCmh2vGQlrc8mMIZe7G+T2cqbuSZjqX6GgQ1XF/JA34jRdeGXoLWEvTcx1qHm +75ds7RTESAcWMatY3dvnsc5/CIra8XC7HkMv70fyt6hYVW9Vj++FAFJj9Lz1SFfN +E7Fo/uo= +=BedK +-----END PGP PUBLIC KEY BLOCK----- diff --git a/mimedefang.spec b/mimedefang.spec index dda85e4..8537457 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -6,7 +6,7 @@ License: GPLv2+ URL: https://mimedefang.org/ Source0: https://mimedefang.org/releases/%{name}-%{version}.tar.gz Source1: https://mimedefang.org/releases/%{name}-%{version}.tar.gz.asc -Source2: gpgkey-9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2.gpg +Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2 Source3: README.FEDORA Source4: mimedefang.service Source5: mimedefang-multiplexor.service diff --git a/sources b/sources index 9360d2f..23eba01 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (gpgkey-9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2.gpg) = 0565821ef8519dd53c04215b1d5f5258cd120d6d6ac87325fad4fb698524b61a62680e166db9616cf4f91ca6f633a36f7d7612ecd2423656b6f3949e74ad8e29 SHA512 (mimedefang-3.1.tar.gz) = 392c2bfa1f4e6bb2503ba6887d79696ccc861ded17a780d3ff44bd12c14ae248536aa8f056ec4679bf9c76b6a82d0357d5fdfe467b664b8992a0c11056c5180f SHA512 (mimedefang-3.1.tar.gz.asc) = 4670a8737477feeb434a77de198484232c0d824a55d03aceb1a0852760084fda57d9ace5b68f501f15e78a41771e16d227a5b87fce1a1c4a4a839a6153322523 From 837c76e6f624b54075c43a9016ce102aa37404d4 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 24 Oct 2022 15:26:43 +0200 Subject: [PATCH 49/65] Upgrade to 3.2 (#2136815) --- .gitignore | 1 + mimedefang-3.1-dnsbltest.patch | 32 -------------------------------- mimedefang.spec | 13 +++++++------ sources | 4 ++-- 4 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 mimedefang-3.1-dnsbltest.patch diff --git a/.gitignore b/.gitignore index fe416fe..93cc45e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /mimedefang-*.tar.gz /mimedefang-*.tar.gz.asc +/mimedefang-*.tar.gz.sig diff --git a/mimedefang-3.1-dnsbltest.patch b/mimedefang-3.1-dnsbltest.patch deleted file mode 100644 index 52a90e9..0000000 --- a/mimedefang-3.1-dnsbltest.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bdfa58eef62d61c4b5f07a053ee3f55a78cec204 Mon Sep 17 00:00:00 2001 -From: Robert Scheck -Date: Wed, 24 Aug 2022 22:00:06 +0200 -Subject: [PATCH] Skip DNSBL test without network access (fixes #69) - ---- - t/net.t | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/t/net.t b/t/net.t -index 54e7846..b92ed88 100644 ---- a/t/net.t -+++ b/t/net.t -@@ -54,9 +54,15 @@ sub t_relay_is_blacklisted_multi : Test(1) - my @rbl; - $rbl[0] = "dnsbltest.spamassassin.org"; - my $relayip = "144.137.3.98"; -- detect_and_load_perl_modules(); -- my $res = relay_is_blacklisted_multi($relayip, 10, 1, \@rbl); -- is($res->{"dnsbltest.spamassassin.org"}[0], "127.0.0.2"); -+ -+ SKIP: { -+ if ( (not defined $ENV{'NET_TEST'}) or ($ENV{'NET_TEST'} ne 'yes' )) { -+ skip "Net test disabled", 1 -+ } -+ detect_and_load_perl_modules(); -+ my $res = relay_is_blacklisted_multi($relayip, 10, 1, \@rbl); -+ is($res->{"dnsbltest.spamassassin.org"}[0], "127.0.0.2"); -+ } - } - - __PACKAGE__->runtests(); diff --git a/mimedefang.spec b/mimedefang.spec index 8537457..f7e6d85 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,11 +1,12 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 3.1 +Version: 3.2 Release: 1%{?dist} -License: GPLv2+ +# {event{,_tcp}.{c,h},eventpriv.h} are GPL-2.0-or-later, rest is GPL-2.0-only +License: GPL-2.0-only AND GPL-2.0-or-later URL: https://mimedefang.org/ Source0: https://mimedefang.org/releases/%{name}-%{version}.tar.gz -Source1: https://mimedefang.org/releases/%{name}-%{version}.tar.gz.asc +Source1: https://mimedefang.org/releases/%{name}-%{version}.tar.gz.sig Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/9F9B564003DFF9E4D904301E3B6DDB11E78FEBD2 Source3: README.FEDORA Source4: mimedefang.service @@ -13,8 +14,6 @@ Source5: mimedefang-multiplexor.service Source6: mimedefang-wrapper Source7: mimedefang.tmpfilesd Source8: mimedefang.sysusersd -# https://github.com/The-McGrail-Foundation/MIMEDefang/issues/69 -Patch0: https://github.com/The-McGrail-Foundation/MIMEDefang/commit/bdfa58eef62d61c4b5f07a053ee3f55a78cec204.patch#/mimedefang-3.1-dnsbltest.patch BuildRequires: gnupg2 BuildRequires: gcc BuildRequires: make @@ -73,7 +72,6 @@ could cause problems, for example, with encrypted or signed messages. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q -%patch0 -p1 -b .dnsbltest cp -pf %{SOURCE3} . %build @@ -172,6 +170,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Mon Oct 24 2022 Robert Scheck 3.2-1 +- Upgrade to 3.2 (#2136815) + * Wed Aug 24 2022 Robert Scheck 3.1-1 - Upgrade to 3.1 (#2121227) diff --git a/sources b/sources index 23eba01..976bb59 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (mimedefang-3.1.tar.gz) = 392c2bfa1f4e6bb2503ba6887d79696ccc861ded17a780d3ff44bd12c14ae248536aa8f056ec4679bf9c76b6a82d0357d5fdfe467b664b8992a0c11056c5180f -SHA512 (mimedefang-3.1.tar.gz.asc) = 4670a8737477feeb434a77de198484232c0d824a55d03aceb1a0852760084fda57d9ace5b68f501f15e78a41771e16d227a5b87fce1a1c4a4a839a6153322523 +SHA512 (mimedefang-3.2.tar.gz) = ec0a83b10db1ccea50fa86fd1f2f944743c393c244cee00a6e33ee25c90b797153c16229f0c6e971359ff0f5d8b6f05d0fdaf77ca4b130a4d2044dcb729d4e94 +SHA512 (mimedefang-3.2.tar.gz.sig) = a146655b1458f6ee552cfc4087ffe19f83678ee5e0f2e9e0ec202017292a38724c47a10e878acfb3788b6b8b309e0e65b8b063ac26cd359908282d0ca0428b75 From 0b8ba050b3ac27a78aa802be9f063d64f2371ab2 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Wed, 18 Jan 2023 00:01:01 +0100 Subject: [PATCH 50/65] Upgrade to 3.3 (#2161362) --- mimedefang.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mimedefang.spec b/mimedefang.spec index f7e6d85..164251e 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,6 +1,6 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 3.2 +Version: 3.3 Release: 1%{?dist} # {event{,_tcp}.{c,h},eventpriv.h} are GPL-2.0-or-later, rest is GPL-2.0-only License: GPL-2.0-only AND GPL-2.0-or-later @@ -170,6 +170,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Wed Jan 18 2023 Robert Scheck 3.3-1 +- Upgrade to 3.3 (#2161362) + * Mon Oct 24 2022 Robert Scheck 3.2-1 - Upgrade to 3.2 (#2136815) diff --git a/sources b/sources index 976bb59..dc48c8a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (mimedefang-3.2.tar.gz) = ec0a83b10db1ccea50fa86fd1f2f944743c393c244cee00a6e33ee25c90b797153c16229f0c6e971359ff0f5d8b6f05d0fdaf77ca4b130a4d2044dcb729d4e94 -SHA512 (mimedefang-3.2.tar.gz.sig) = a146655b1458f6ee552cfc4087ffe19f83678ee5e0f2e9e0ec202017292a38724c47a10e878acfb3788b6b8b309e0e65b8b063ac26cd359908282d0ca0428b75 +SHA512 (mimedefang-3.3.tar.gz) = f973d6bf8e5bb5043f6d255961dcf3f4f8208c7fb159694f5d62884e4dd480ab2d04cf6b71c8f48f56f368aa31b7ce54ec499503a4a3f55b9bf0696299a240ef +SHA512 (mimedefang-3.3.tar.gz.sig) = 24b88fe446697cfa4d862af4c7d0c9b48da376a36307b3e1e6a77efa1c373c536f125cc2e9068c9ba4bae875c5a1c7a55a8975ff498e324c930dcf1e9e0dbe03 From 252e2dfef4064ad00a936fed2c1ab6473579b435 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 19:30:16 +0000 Subject: [PATCH 51/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 164251e..3263d16 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 3.3 -Release: 1%{?dist} +Release: 2%{?dist} # {event{,_tcp}.{c,h},eventpriv.h} are GPL-2.0-or-later, rest is GPL-2.0-only License: GPL-2.0-only AND GPL-2.0-or-later URL: https://mimedefang.org/ @@ -170,6 +170,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 18 2023 Robert Scheck 3.3-1 - Upgrade to 3.3 (#2161362) From 755a77cfe3b9ad03e1b5fd0e94e0bb3a57ac35ba Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 27 Apr 2023 22:59:33 +0200 Subject: [PATCH 52/65] Upgrade to 3.4 (#2189708) --- mimedefang-3.4-arc-wrong.eml | 44 ++++++++++++++++++++++++++++++++++++ mimedefang.spec | 11 +++++++-- sources | 4 ++-- 3 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 mimedefang-3.4-arc-wrong.eml diff --git a/mimedefang-3.4-arc-wrong.eml b/mimedefang-3.4-arc-wrong.eml new file mode 100644 index 0000000..7ceb4d1 --- /dev/null +++ b/mimedefang-3.4-arc-wrong.eml @@ -0,0 +1,44 @@ +From mickey@dkim.org Mon Oct 3 23:34:13 2005 +Return-Path: +Received: from sj-iport-5.cisco.com (sj-iport-5.cisco.com [171.68.10.87]) + by testing.dkim.org (8.12.11/8.12.10) with ESMTP id j946YDQp007981 + for ; Mon, 3 Oct 2005 23:34:13 -0700 +Received: from sj-core-4.cisco.com ([171.68.223.138]) + by sj-iport-5.cisco.com with ESMTP; 04 Oct 2005 00:32:01 -0700 +X-IronPort-AV: i="3.97,171,1125903600"; + d="scan'208"; a="216807210:sNHT21216320" +Received: from localhost.localdomain ([171.71.17.133]) + by sj-core-4.cisco.com (8.12.10/8.12.6) with ESMTP id j947Vwuk003169 + for ; Tue, 4 Oct 2005 00:31:58 -0700 (PDT) +Message-Id: <200510040731.j947Vwuk003169@sj-core-4.cisco.com> +Date: Thu, 31 May 2001 07:13:26 -0700 (PDT) +From: mickey@dkim.org +To: andy.zipper@enron.com, david.berberian@enron.com, rex.shelby@enron.com, + s..palmer@enron.com, david.forster@enron.com, marc.eichmann@enron.com +Subject: GM - Very Promising Beginning +Cc: john.pavetto@enron.com, leonardo.pacheco@enron.com +Mime-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Transfer-Encoding: 7bit +X-bcc: +X-Folder: \ExMerge - Zipper, Andy\origination +X-Origin: ZIPPER-A +X-FileName: andy zipper 6-26-02.PST +Status: RO +Lines: 29 +X-PMX-Version: 4.7.1.128075 +X-from-outside-Cisco: [171.71.17.133] +DKIM-Signature: a=rsa-sha1; q=dns; l=86; t=1128407653; x=-1019075996; + c=nowsp; s=testing1234; h=Subject:From:To:Cc:Date:Content-Type:Content-Transfer-Encoding:MIME-Version:X-DKIM; + d=dkim.org; i=mickey@dkim.org; z=From:mickey@dkim.org| + Subject:GM=20-=20Very=20Promising=20Beginning; + b=arNPPGvmpIRG9XQP8qDp1L9AW8pSAphkFmLlN4fMjOHHfdU1vsWfBOzWgcAcBkvSnlYBvpRK + 7W1xBb+SOrBCvQ==; +Authentication-Results: gc.mta2vsmtp.cc.prd.sparkpost smtp.user=test; auth=pass (PLAIN) + +Team + +I think this is good news. We can cover this with Derrick on our conference call this morning. + +-John + diff --git a/mimedefang.spec b/mimedefang.spec index 3263d16..e637f68 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 3.3 -Release: 2%{?dist} +Version: 3.4 +Release: 1%{?dist} # {event{,_tcp}.{c,h},eventpriv.h} are GPL-2.0-or-later, rest is GPL-2.0-only License: GPL-2.0-only AND GPL-2.0-or-later URL: https://mimedefang.org/ @@ -14,6 +14,7 @@ Source5: mimedefang-multiplexor.service Source6: mimedefang-wrapper Source7: mimedefang.tmpfilesd Source8: mimedefang.sysusersd +Source9: https://raw.githubusercontent.com/The-McGrail-Foundation/MIMEDefang/master/t/data/arc-wrong.eml#/mimedefang-3.4-arc-wrong.eml BuildRequires: gnupg2 BuildRequires: gcc BuildRequires: make @@ -72,6 +73,7 @@ could cause problems, for example, with encrypted or signed messages. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q +cp -pf %{SOURCE9} t/data/arc-wrong.eml cp -pf %{SOURCE3} . %build @@ -144,6 +146,7 @@ fi %{_bindir}/%{name} %{_bindir}/%{name}.pl %{_bindir}/%{name}-multiplexor +%{_bindir}/%{name}-release.pl %{_bindir}/%{name}-util %{_bindir}/watch-%{name} %{_bindir}/watch-multiple-%{name}s.tcl @@ -163,6 +166,7 @@ fi %{_mandir}/man8/%{name}.8* %{_mandir}/man8/%{name}.pl.8* %{_mandir}/man8/%{name}-multiplexor.8* +%{_mandir}/man8/%{name}-release.8* %{_mandir}/man8/watch-%{name}.8* %{_mandir}/man8/watch-multiple-%{name}s.8* %dir %attr(0750,defang,defang) %{_localstatedir}/log/%{name}/ @@ -170,6 +174,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Thu Apr 27 2023 Robert Scheck 3.4-1 +- Upgrade to 3.4 (#2189708) + * Thu Jan 19 2023 Fedora Release Engineering - 3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index dc48c8a..ee9aba6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (mimedefang-3.3.tar.gz) = f973d6bf8e5bb5043f6d255961dcf3f4f8208c7fb159694f5d62884e4dd480ab2d04cf6b71c8f48f56f368aa31b7ce54ec499503a4a3f55b9bf0696299a240ef -SHA512 (mimedefang-3.3.tar.gz.sig) = 24b88fe446697cfa4d862af4c7d0c9b48da376a36307b3e1e6a77efa1c373c536f125cc2e9068c9ba4bae875c5a1c7a55a8975ff498e324c930dcf1e9e0dbe03 +SHA512 (mimedefang-3.4.tar.gz) = 6c0e6a62baef77a883b064a295ce7cb296becae65e337a7208d123b526e6889a14327b5ffc1a0e838ccacc4c3f7d55b4d0979c4bc180f662237743a9772471e5 +SHA512 (mimedefang-3.4.tar.gz.sig) = 7af04180b7a38f80ac33ac487362960b79345a5e141949701977144a021c48a7cdcb28344b754329489793af20dee08d3096ddbddf64939216af4c1eab42700a From 4a6e24166e83dce00ed2ea4899a3e1f40f2beda4 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 15 May 2023 20:17:48 +0200 Subject: [PATCH 53/65] Upgrade to 3.4.1 (#2203877) --- mimedefang-3.4-arc-wrong.eml | 44 ------------------------------------ mimedefang.spec | 9 ++++---- sources | 4 ++-- 3 files changed, 7 insertions(+), 50 deletions(-) delete mode 100644 mimedefang-3.4-arc-wrong.eml diff --git a/mimedefang-3.4-arc-wrong.eml b/mimedefang-3.4-arc-wrong.eml deleted file mode 100644 index 7ceb4d1..0000000 --- a/mimedefang-3.4-arc-wrong.eml +++ /dev/null @@ -1,44 +0,0 @@ -From mickey@dkim.org Mon Oct 3 23:34:13 2005 -Return-Path: -Received: from sj-iport-5.cisco.com (sj-iport-5.cisco.com [171.68.10.87]) - by testing.dkim.org (8.12.11/8.12.10) with ESMTP id j946YDQp007981 - for ; Mon, 3 Oct 2005 23:34:13 -0700 -Received: from sj-core-4.cisco.com ([171.68.223.138]) - by sj-iport-5.cisco.com with ESMTP; 04 Oct 2005 00:32:01 -0700 -X-IronPort-AV: i="3.97,171,1125903600"; - d="scan'208"; a="216807210:sNHT21216320" -Received: from localhost.localdomain ([171.71.17.133]) - by sj-core-4.cisco.com (8.12.10/8.12.6) with ESMTP id j947Vwuk003169 - for ; Tue, 4 Oct 2005 00:31:58 -0700 (PDT) -Message-Id: <200510040731.j947Vwuk003169@sj-core-4.cisco.com> -Date: Thu, 31 May 2001 07:13:26 -0700 (PDT) -From: mickey@dkim.org -To: andy.zipper@enron.com, david.berberian@enron.com, rex.shelby@enron.com, - s..palmer@enron.com, david.forster@enron.com, marc.eichmann@enron.com -Subject: GM - Very Promising Beginning -Cc: john.pavetto@enron.com, leonardo.pacheco@enron.com -Mime-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -Content-Transfer-Encoding: 7bit -X-bcc: -X-Folder: \ExMerge - Zipper, Andy\origination -X-Origin: ZIPPER-A -X-FileName: andy zipper 6-26-02.PST -Status: RO -Lines: 29 -X-PMX-Version: 4.7.1.128075 -X-from-outside-Cisco: [171.71.17.133] -DKIM-Signature: a=rsa-sha1; q=dns; l=86; t=1128407653; x=-1019075996; - c=nowsp; s=testing1234; h=Subject:From:To:Cc:Date:Content-Type:Content-Transfer-Encoding:MIME-Version:X-DKIM; - d=dkim.org; i=mickey@dkim.org; z=From:mickey@dkim.org| - Subject:GM=20-=20Very=20Promising=20Beginning; - b=arNPPGvmpIRG9XQP8qDp1L9AW8pSAphkFmLlN4fMjOHHfdU1vsWfBOzWgcAcBkvSnlYBvpRK - 7W1xBb+SOrBCvQ==; -Authentication-Results: gc.mta2vsmtp.cc.prd.sparkpost smtp.user=test; auth=pass (PLAIN) - -Team - -I think this is good news. We can cover this with Derrick on our conference call this morning. - --John - diff --git a/mimedefang.spec b/mimedefang.spec index e637f68..b625af9 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,6 +1,6 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 3.4 +Version: 3.4.1 Release: 1%{?dist} # {event{,_tcp}.{c,h},eventpriv.h} are GPL-2.0-or-later, rest is GPL-2.0-only License: GPL-2.0-only AND GPL-2.0-or-later @@ -14,7 +14,6 @@ Source5: mimedefang-multiplexor.service Source6: mimedefang-wrapper Source7: mimedefang.tmpfilesd Source8: mimedefang.sysusersd -Source9: https://raw.githubusercontent.com/The-McGrail-Foundation/MIMEDefang/master/t/data/arc-wrong.eml#/mimedefang-3.4-arc-wrong.eml BuildRequires: gnupg2 BuildRequires: gcc BuildRequires: make @@ -73,7 +72,6 @@ could cause problems, for example, with encrypted or signed messages. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q -cp -pf %{SOURCE9} t/data/arc-wrong.eml cp -pf %{SOURCE3} . %build @@ -146,7 +144,7 @@ fi %{_bindir}/%{name} %{_bindir}/%{name}.pl %{_bindir}/%{name}-multiplexor -%{_bindir}/%{name}-release.pl +%{_bindir}/%{name}-release %{_bindir}/%{name}-util %{_bindir}/watch-%{name} %{_bindir}/watch-multiple-%{name}s.tcl @@ -174,6 +172,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Mon May 15 2023 Robert Scheck 3.4.1-1 +- Upgrade to 3.4.1 (#2203877) + * Thu Apr 27 2023 Robert Scheck 3.4-1 - Upgrade to 3.4 (#2189708) diff --git a/sources b/sources index ee9aba6..dd1079d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (mimedefang-3.4.tar.gz) = 6c0e6a62baef77a883b064a295ce7cb296becae65e337a7208d123b526e6889a14327b5ffc1a0e838ccacc4c3f7d55b4d0979c4bc180f662237743a9772471e5 -SHA512 (mimedefang-3.4.tar.gz.sig) = 7af04180b7a38f80ac33ac487362960b79345a5e141949701977144a021c48a7cdcb28344b754329489793af20dee08d3096ddbddf64939216af4c1eab42700a +SHA512 (mimedefang-3.4.1.tar.gz) = 2734834774c44d53a4e5632d113385e13e4e2ae8e94d5a766dca4f5a08b974373dbd6ee8a815a5b12d967b485154344ddbc9b70eb5ffe4988f061523e60ac0ab +SHA512 (mimedefang-3.4.1.tar.gz.sig) = a0bd1fdd9d3b7037329347673f85ed74ee7071e118081c1eb40a47a056ebce4cc4fc7a1374ed85aa7ee4aaff30b13b6686716737db22eae6e59288ef6c2ca6ea From 9f9489034e0d6b8f9ae53bd46a23c96b7e729819 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 11 Jul 2023 15:40:12 +0200 Subject: [PATCH 54/65] Perl 5.38 rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index b625af9..d0d6842 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 3.4.1 -Release: 1%{?dist} +Release: 2%{?dist} # {event{,_tcp}.{c,h},eventpriv.h} are GPL-2.0-or-later, rest is GPL-2.0-only License: GPL-2.0-only AND GPL-2.0-or-later URL: https://mimedefang.org/ @@ -172,6 +172,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Tue Jul 11 2023 Jitka Plesnikova - 3.4.1-2 +- Perl 5.38 rebuild + * Mon May 15 2023 Robert Scheck 3.4.1-1 - Upgrade to 3.4.1 (#2203877) From b0df03deb4c3130e073905cded306432f5ec1525 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 14:23:28 +0000 Subject: [PATCH 55/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index d0d6842..906d9e4 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 3.4.1 -Release: 2%{?dist} +Release: 3%{?dist} # {event{,_tcp}.{c,h},eventpriv.h} are GPL-2.0-or-later, rest is GPL-2.0-only License: GPL-2.0-only AND GPL-2.0-or-later URL: https://mimedefang.org/ @@ -172,6 +172,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 3.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 Jitka Plesnikova - 3.4.1-2 - Perl 5.38 rebuild From 65ff4fb381fe28a033226d54427e52da7203ee03 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 07:28:14 +0000 Subject: [PATCH 56/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 906d9e4..dd84124 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 3.4.1 -Release: 3%{?dist} +Release: 4%{?dist} # {event{,_tcp}.{c,h},eventpriv.h} are GPL-2.0-or-later, rest is GPL-2.0-only License: GPL-2.0-only AND GPL-2.0-or-later URL: https://mimedefang.org/ @@ -172,6 +172,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 3.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 3.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 1696f13c8501f7f10449ed11cd81ddce950d4307 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 06:20:28 +0000 Subject: [PATCH 57/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index dd84124..e0c2753 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 3.4.1 -Release: 4%{?dist} +Release: 5%{?dist} # {event{,_tcp}.{c,h},eventpriv.h} are GPL-2.0-or-later, rest is GPL-2.0-only License: GPL-2.0-only AND GPL-2.0-or-later URL: https://mimedefang.org/ @@ -172,6 +172,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 3.4.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 3.4.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 10d92ba2fd6387fadcb7429fa348486636b984f8 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 11 Jun 2024 06:07:15 +0200 Subject: [PATCH 58/65] Perl 5.40 rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index e0c2753..a52f19b 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 3.4.1 -Release: 5%{?dist} +Release: 6%{?dist} # {event{,_tcp}.{c,h},eventpriv.h} are GPL-2.0-or-later, rest is GPL-2.0-only License: GPL-2.0-only AND GPL-2.0-or-later URL: https://mimedefang.org/ @@ -172,6 +172,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Tue Jun 11 2024 Jitka Plesnikova - 3.4.1-6 +- Perl 5.40 rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 3.4.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 435afb7eaf212096521f10b3ba36e66cb1a34703 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 17:20:40 +0000 Subject: [PATCH 59/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index a52f19b..874255b 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 3.4.1 -Release: 6%{?dist} +Release: 7%{?dist} # {event{,_tcp}.{c,h},eventpriv.h} are GPL-2.0-or-later, rest is GPL-2.0-only License: GPL-2.0-only AND GPL-2.0-or-later URL: https://mimedefang.org/ @@ -172,6 +172,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 3.4.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jun 11 2024 Jitka Plesnikova - 3.4.1-6 - Perl 5.40 rebuild From 7e87b23a68c87a3fe5acab2ec2e6783302045795 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 17:37:17 +0000 Subject: [PATCH 60/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index 874255b..5b7ee82 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 3.4.1 -Release: 7%{?dist} +Release: 8%{?dist} # {event{,_tcp}.{c,h},eventpriv.h} are GPL-2.0-or-later, rest is GPL-2.0-only License: GPL-2.0-only AND GPL-2.0-or-later URL: https://mimedefang.org/ @@ -172,6 +172,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 3.4.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 3.4.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d5afef6ce223468ab5a3e19b84c9bc92a28a7373 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 1 Mar 2025 13:20:19 +0100 Subject: [PATCH 61/65] Remove support for Red Hat Enterprise Linux 7 --- mimedefang.spec | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/mimedefang.spec b/mimedefang.spec index 5b7ee82..2cc6464 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -33,13 +33,8 @@ BuildRequires: perl(Sys::Hostname) BuildRequires: perl(Sys::Syslog) BuildRequires: systemd-rpm-macros BuildRequires: %{_sbindir}/sendmail -%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: sendmail-milter-devel >= 8.12.0 Recommends: perl(Mail::SpamAssassin) >= 1.6 -%else -BuildRequires: sendmail-devel >= 8.12.0 -Requires: perl(Mail::SpamAssassin) >= 1.6 -%endif Requires(post): perl(Digest::SHA) %{?systemd_requires} %{?sysusers_requires_compat} @@ -48,9 +43,7 @@ Requires(post): perl(Digest::SHA) %if 0%{!?_without_tests:1} BuildRequires: %{_bindir}/prove BuildRequires: perl(HTML::Parser) -%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: perl(Mail::DKIM::ARC::Signer) >= 0.44 -%endif BuildRequires: perl(Mail::DKIM::Signer) BuildRequires: perl(Net::SMTP) BuildRequires: perl(Test::Class) @@ -79,7 +72,7 @@ cp -pf %{SOURCE3} . %make_build %install -%make_install %{?el7:INSTALL='install -p'} INSTALL_STRIP_FLAG='' install-redhat +%make_install INSTALL_STRIP_FLAG='' install-redhat # Fix config file, create log directory and remove duplicate sed -e '1d' -i $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} @@ -103,13 +96,6 @@ touch -c -r gen-ip-validator.pl $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl # Only for regression tests; depends on Test::Class, Test::Most and Net::SMTP find $RPM_BUILD_ROOT \( -name Unit.pm -o -name "*::Unit.3" \) -exec rm -f {} \; -# ARC (Authenticated Received Chain) support requires Mail::DKIM >= 0.44 -%if 0%{?rhel} == 7 -rm -f t/arc.t -find $RPM_BUILD_ROOT \( -name ARC.pm -o -name "*::ARC.3" \) -exec rm -f {} \; -find $RPM_BUILD_ROOT%{_prefix} -type d -depth -exec rmdir {} 2> /dev/null \; -%endif - %if 0%{!?_without_tests:1} %check make test From 065775a47287d500555a58409e7ad6586eb2b16d Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 1 Mar 2025 13:33:29 +0100 Subject: [PATCH 62/65] Upgrade to 3.6 (#2301647) --- mimedefang-3.6-tests.patch | 89 ++++++++++++++++++++++++++++++++++++++ mimedefang.spec | 14 ++++-- sources | 4 +- 3 files changed, 102 insertions(+), 5 deletions(-) create mode 100644 mimedefang-3.6-tests.patch diff --git a/mimedefang-3.6-tests.patch b/mimedefang-3.6-tests.patch new file mode 100644 index 0000000..d8f9835 --- /dev/null +++ b/mimedefang-3.6-tests.patch @@ -0,0 +1,89 @@ +From 3f5e9dbf0ef53152507476d0ec874dfb62009813 Mon Sep 17 00:00:00 2001 +From: Robert Scheck +Date: Sat, 1 Mar 2025 13:03:49 +0100 +Subject: [PATCH] Skip DNS tests without network access + +$ make test +prove -It/lib --recurse t +t/actions.t ... ok +t/antispam.t .. ok +t/arc.t ....... ok +t/authres.t ... ok +t/core.t ...... ok +t/critic.t .... skipped: Author test. Set $ENV{TEST_AUTHOR} to a true value to run. +t/dates.t ..... ok +t/dkim.t ...... ok +t/headers.t ... ok +t/mime.t ...... ok +t/net.t ....... +Dubious, test returned 3 (wstat 768, 0x300) +Failed 3/15 subtests + (less 3 skipped subtests: 9 okay) +t/relay.t ..... ok +t/sender.t .... ok +t/smtp.t ...... ok +t/spf.t ....... ok +t/utils.t ..... ok +Test Summary Report +------------------- +t/net.t (Wstat: 768 (exited 3) Tests: 15 Failed: 3) + Failed tests: 5-6, 11 + Non-zero exit status: 3 +Files=16, Tests=130, 680 wallclock secs ( 0.05 usr 0.03 sys + 3.91 cusr 0.71 csys = 4.70 CPU) +Result: FAIL +make: *** [Makefile:365: test] Error 1 +--- + t/net.t | 28 +++++++++++++++++++++++----- + 1 file changed, 23 insertions(+), 5 deletions(-) + +diff --git a/t/net.t b/t/net.t +index 4710ce2..69e1877 100644 +--- a/t/net.t ++++ b/t/net.t +@@ -55,7 +55,13 @@ sub t_reverse_ip : Test(2) + sub t_get_ptr_record : Test(1) + { + my $ipv4 = '1.1.1.1'; +- is(Mail::MIMEDefang::Net::get_ptr_record($ipv4), 'one.one.one.one'); ++ ++ SKIP: { ++ if ( (not defined $ENV{'NET_TEST'}) or ($ENV{'NET_TEST'} ne 'yes' )) { ++ skip "Net test disabled", 1 ++ } ++ is(Mail::MIMEDefang::Net::get_ptr_record($ipv4), 'one.one.one.one'); ++ } + } + + sub t_relay_is_blacklisted_multi : Test(1) +@@ -107,15 +113,27 @@ sub t_email_is_blacklisted : Test(1) + sub t_md_get_bogus_mx_hosts : Test(1) + { + my $domain = 'multihomed.dnsbltest.spamassassin.org'; +- my @res = md_get_bogus_mx_hosts($domain); +- is(scalar @res, 1); ++ ++ SKIP: { ++ if ( (not defined $ENV{'NET_TEST'}) or ($ENV{'NET_TEST'} ne 'yes' )) { ++ skip "Net test disabled", 1 ++ } ++ my @res = md_get_bogus_mx_hosts($domain); ++ is(scalar @res, 1); ++ } + } + + sub t_get_mx_ip_addresses : Test(1) + { + my $domain = 'mimedefang.org'; +- my @res = get_mx_ip_addresses($domain); +- is(scalar @res, 2); ++ ++ SKIP: { ++ if ( (not defined $ENV{'NET_TEST'}) or ($ENV{'NET_TEST'} ne 'yes' )) { ++ skip "Net test disabled", 1 ++ } ++ my @res = get_mx_ip_addresses($domain); ++ is(scalar @res, 2); ++ } + } + + __PACKAGE__->runtests(); diff --git a/mimedefang.spec b/mimedefang.spec index 2cc6464..0bf1e2f 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 3.4.1 -Release: 8%{?dist} +Version: 3.6 +Release: 1%{?dist} # {event{,_tcp}.{c,h},eventpriv.h} are GPL-2.0-or-later, rest is GPL-2.0-only License: GPL-2.0-only AND GPL-2.0-or-later URL: https://mimedefang.org/ @@ -14,6 +14,7 @@ Source5: mimedefang-multiplexor.service Source6: mimedefang-wrapper Source7: mimedefang.tmpfilesd Source8: mimedefang.sysusersd +Patch0: https://github.com/The-McGrail-Foundation/MIMEDefang/pull/83.patch#/mimedefang-3.6-tests.patch BuildRequires: gnupg2 BuildRequires: gcc BuildRequires: make @@ -64,10 +65,14 @@ could cause problems, for example, with encrypted or signed messages. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%setup -q +%autosetup -p1 cp -pf %{SOURCE3} . %build +%if 0%{?fedora} > 41 || 0%{?rhel} > 10 +export CFLAGS="$CFLAGS -std=gnu17" # RHBZ#2336394, comment #4 +%endif + %configure --with-milterlib=%{_libdir} --with-user=defang --disable-anti-virus %make_build @@ -158,6 +163,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Sat Mar 01 2025 Robert Scheck 3.6-1 +- Upgrade to 3.6 (#2301647) + * Fri Jan 17 2025 Fedora Release Engineering - 3.4.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index dd1079d..c1d72d5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (mimedefang-3.4.1.tar.gz) = 2734834774c44d53a4e5632d113385e13e4e2ae8e94d5a766dca4f5a08b974373dbd6ee8a815a5b12d967b485154344ddbc9b70eb5ffe4988f061523e60ac0ab -SHA512 (mimedefang-3.4.1.tar.gz.sig) = a0bd1fdd9d3b7037329347673f85ed74ee7071e118081c1eb40a47a056ebce4cc4fc7a1374ed85aa7ee4aaff30b13b6686716737db22eae6e59288ef6c2ca6ea +SHA512 (mimedefang-3.6.tar.gz) = ceaf3b4b0d49d04b81e2280217aba5cf6873ec816cd664b379f3f32c10ba01560541cbbf0c269fcee0adc9265b18fb178e3232de3ca83c6b13440d7bd3aab34a +SHA512 (mimedefang-3.6.tar.gz.sig) = 177e6bebbae246531bbc56cd76b20fdfd958cee7a3f3081dd78840523afd9cc291478da11d9a6c4bbd9bb3f10e4f68cce25d236abaf4b29433b9c34743996488 From f5c4fe68e8ab268cb46eda7d7a54bb0673066c8a Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 1 Mar 2025 20:01:14 +0100 Subject: [PATCH 63/65] Update patch URL after merge into upstream --- mimedefang-3.6-tests.patch | 8 ++++---- mimedefang.spec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mimedefang-3.6-tests.patch b/mimedefang-3.6-tests.patch index d8f9835..575a663 100644 --- a/mimedefang-3.6-tests.patch +++ b/mimedefang-3.6-tests.patch @@ -1,7 +1,7 @@ -From 3f5e9dbf0ef53152507476d0ec874dfb62009813 Mon Sep 17 00:00:00 2001 -From: Robert Scheck -Date: Sat, 1 Mar 2025 13:03:49 +0100 -Subject: [PATCH] Skip DNS tests without network access +From 7379afce07b19c04a1927172ddd2ebb9213d87fa Mon Sep 17 00:00:00 2001 +From: Robert Scheck +Date: Sat, 1 Mar 2025 15:29:17 +0100 +Subject: [PATCH] Skip DNS tests without network access (#83) $ make test prove -It/lib --recurse t diff --git a/mimedefang.spec b/mimedefang.spec index 0bf1e2f..d613dbb 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -14,7 +14,7 @@ Source5: mimedefang-multiplexor.service Source6: mimedefang-wrapper Source7: mimedefang.tmpfilesd Source8: mimedefang.sysusersd -Patch0: https://github.com/The-McGrail-Foundation/MIMEDefang/pull/83.patch#/mimedefang-3.6-tests.patch +Patch0: https://github.com/The-McGrail-Foundation/MIMEDefang/commit/7379afce07b19c04a1927172ddd2ebb9213d87fa.patch#/mimedefang-3.6-tests.patch BuildRequires: gnupg2 BuildRequires: gcc BuildRequires: make From babbcd29c11214ecdbb5e2e0710cd39797c3e4d9 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 7 Jul 2025 16:24:18 +0200 Subject: [PATCH 64/65] Perl 5.42 rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index d613dbb..bee7bb0 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 3.6 -Release: 1%{?dist} +Release: 2%{?dist} # {event{,_tcp}.{c,h},eventpriv.h} are GPL-2.0-or-later, rest is GPL-2.0-only License: GPL-2.0-only AND GPL-2.0-or-later URL: https://mimedefang.org/ @@ -163,6 +163,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Mon Jul 07 2025 Jitka Plesnikova - 3.6-2 +- Perl 5.42 rebuild + * Sat Mar 01 2025 Robert Scheck 3.6-1 - Upgrade to 3.6 (#2301647) From 9470d9791e59b7a09e20fe063d3bf4094d09c7ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:37:37 +0000 Subject: [PATCH 65/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- mimedefang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mimedefang.spec b/mimedefang.spec index bee7bb0..b044cee 100644 --- a/mimedefang.spec +++ b/mimedefang.spec @@ -1,7 +1,7 @@ Summary: E-mail filtering framework using Sendmail's Milter interface Name: mimedefang Version: 3.6 -Release: 2%{?dist} +Release: 3%{?dist} # {event{,_tcp}.{c,h},eventpriv.h} are GPL-2.0-or-later, rest is GPL-2.0-only License: GPL-2.0-only AND GPL-2.0-or-later URL: https://mimedefang.org/ @@ -163,6 +163,9 @@ fi %dir %attr(0750,defang,defang) %{_localstatedir}/spool/MD-Quarantine/ %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 3.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 07 2025 Jitka Plesnikova - 3.6-2 - Perl 5.42 rebuild