- 3.3.0-rc1

- Bug #103401: portreserve protect spamd port 783 on F-10+

.cvsignore

@@ -1,2 +1,2 @@
-Mail-SpamAssassin-3.3.0-beta1.tar.bz2
-Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz
+Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz
+Mail-SpamAssassin-3.3.0-rc1.proposed1.tar.bz2

sources

@@ -1,2 +1,2 @@
-9b39e4e4fad09cfe9eff974f3d5a01ea  Mail-SpamAssassin-3.3.0-beta1.tar.bz2
-cbd092c4e0e71b531f7aca81d4eb2781  Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz
+0bf1e2c0fc70dc05104acec8a723cbdb  Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz
+fabccde7f09dcdf4c06afbd4cc0687c2  Mail-SpamAssassin-3.3.0-rc1.proposed1.tar.bz2

spamassassin.spec

@@ -36,6 +36,12 @@
 %define perl_devel 1
 %endif
 
+%if 0%{?fedora} >= 10
+# We use portreserve to prevent our TCP port being stolen.
+# Require the package here so that we know /etc/portreserve/ exists.
+Requires: portreserve
+%endif
+
 # Mail::DKIM by default (F11+)
 %if 0%{?fedora} >= 11
 %define dkim_deps 1
@@ -47,13 +53,14 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.0
-%define prename beta1
-Release: 0.22.%{prename}%{?dist}
+%define prename rc1
+%define proposed .proposed1
+Release: 0.23.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
-Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
-Source1: Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz
+Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}%{proposed}.tar.bz2
+Source1: Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz 
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -199,6 +206,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/spamassassin
 install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/
 install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/
 
+# Tell portreserve which port we want it to protect.
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve
+echo 783 > $RPM_BUILD_ROOT%{_sysconfdir}/portreserve/spamd
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
@@ -212,6 +222,7 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/
 %dir %{_localstatedir}/run/spamassassin
 %dir %{_localstatedir}/lib/spamassassin
 %config(noreplace) %{_sysconfdir}/logrotate.d/sa-update
+%config(noreplace) %{_sysconfdir}/portreserve/spamd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -250,6 +261,10 @@ fi
 exit 0
 
 %changelog
+* Fri Dec 18 2009 Warren Togami <wtogami@redhat.com> - 3.3.0-0.23.rc1
+- 3.3.0-rc1
+- Bug #103401: portreserve protect spamd port 783 on F-10+
+
 * Thu Dec 03 2009 Warren Togami <wtogami@redhat.com> - 3.3.0-0.21.beta1
 - 3.3.0-beta1