[mlmmj] - Update to latest upstream - Drop CVE fix, merged upstream

[Michael Fleming]

commit 38f0d0c6c3396077dba4d589ba516d71dd6c361d
Author: Michael Fleming <mfleming at thatfleminggent.com>
Date:   Fri Aug 27 19:28:05 2010 +1000

    - Update to latest upstream
    - Drop CVE fix, merged upstream

 .gitignore |    1 +
 mlmmj.spec |   14 +++++++++-----
 sources    |    2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3fe6306..73f9b51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 mlmmj-1.2.17.tar.bz2
+/mlmmj-1.2.17.1.tar.bz2
diff --git a/mlmmj.spec b/mlmmj.spec
index 85eb2de..ff27df1 100644
--- a/mlmmj.spec
+++ b/mlmmj.spec
@@ -2,13 +2,13 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.17
-Release: 2%{?dist}
+Version: 1.2.17.1
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.mlmmj.org/
-Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2
-Patch: patch-mlmmj-php-admin-dirtravfix.diff
+Source: http://mlmmj.org/releases/mlmmj-%{version}.tar.bz2
+#Patch: patch-mlmmj-php-admin-dirtravfix.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: server(smtp)
 
@@ -21,7 +21,7 @@ license and mailserver independence.
 %prep
 
 %setup -q
-%patch -p1 -b .dirtravfix
+#%patch -p1 -b .dirtravfix
 
 %build
 %configure --enable-recieve-strip
@@ -50,6 +50,10 @@ rm -rf %{buildroot}
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Fri Aug 27 2010 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 1.2.17.1-1
+- Update to latest upstream
+- Drop CVE fix, merged upstream
+
 * Sun Jun 27 2010 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 1.2.17-2
 - Fix for CVE-2009-4896 (lack of input validation in php-admin contrib scripts)
 
diff --git a/sources b/sources
index 5366de8..61e772d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bff8050f14f2084d661421135be685ad  mlmmj-1.2.17.tar.bz2
+f989933cedefcfafe4fe18d8737b7c4b  mlmmj-1.2.17.1.tar.bz2