From 5050824e3097318ac33665be4eb5d36b5bfe7713 Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limburgher@gmail.com>
Date: Sep 11 2013 14:01:04 +0000
Subject: 2.3.9.


---

diff --git a/.gitignore b/.gitignore
index 187726a..e30cdf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -271,3 +271,4 @@ zh_tw_utf8.zip
 /moodle-2.3.6.tgz
 /moodle-2.3.7.tgz
 /moodle-2.3.8.tgz
+/moodle-2.3.9.tgz
diff --git a/moodle.spec b/moodle.spec
index 7511bc1..781cacd 100644
--- a/moodle.spec
+++ b/moodle.spec
@@ -6,8 +6,8 @@
 %define __perl_provides %{nil}
 
 Name:           moodle
-Version:        2.3.8
-Release:       	2%{?dist}
+Version:        2.3.9
+Release:       	1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -20,7 +20,7 @@ Source3:        moodle.cron
 Source4:        moodle-cron
 Source5:        moodle.init
 Source6:        moodle-README-rpm
-Patch0:         moodle-CVE-2012-6087.patch
+#Patch0:         moodle-CVE-2012-6087.patch
 Patch1:		moodle-QuickForm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -56,7 +56,7 @@ effective online learning communities.
 %setup -q -n %{name}
 cp %{SOURCE6} README-rpm
 
-%patch0 -p0
+#%patch0 -p0
 %patch1 -p0
 
 find . -type f \! -name \*.pl -exec chmod a-x {} \;
@@ -226,6 +226,10 @@ fi
 %exclude %{moodlewebdir}/COPYING.txt
 
 %changelog
+* Wed Sep 11 2013 Jon Ciesla <limburgher@gmail.com> - 2.3.9-1
+- 2.3.9, multiple securty fixes, BZ 1006678.
+- CVE-2012-6087 patch upstreamed.
+
 * Fri Jul 12 2013 Jon Ciesla <limburgher@gmail.com> - 2.3.8-2
 - Include two non-upstream additions to HTML-Quickform.
 
diff --git a/sources b/sources
index 7690a60..a776434 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a31db3f1d7dff5097177228361b3df5f  moodle-2.3.8.tgz
+42f1b89e7f6c4ebd8944429288ed51b3  moodle-2.3.9.tgz