[moodle/f19] 2.4.6.

[Jon Ciesla]

commit 52a766add3fc96f56e347fca789275dee8170e61
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Sep 11 08:51:28 2013 -0500

    2.4.6.

 .gitignore  |    1 +
 moodle.spec |   12 ++++++++----
 sources     |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4825965..73743c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -271,3 +271,4 @@ zh_tw_utf8.zip
 /moodle-2.4.3.tgz
 /moodle-2.4.4.tgz
 /moodle-2.4.5.tgz
+/moodle-2.4.6.tgz
diff --git a/moodle.spec b/moodle.spec
index 9cf4202..6e63385 100644
--- a/moodle.spec
+++ b/moodle.spec
@@ -6,8 +6,8 @@
 %define __perl_provides %{nil}
 
 Name:           moodle
-Version:        2.4.5
-Release:       	2%{?dist}
+Version:        2.4.6
+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 {} \;
@@ -222,6 +222,10 @@ fi
 %exclude %{moodlewebdir}/COPYING.txt
 
 %changelog
+* Wed Sep 11 2013 Jon Ciesla <limburgher at gmail.com> - 2.4.6-1
+- 2.4.6, multiple securty fixes, BZ 1006678.
+- CVE-2012-6087 patch upstreamed.
+
 * Fri Jul 12 2013 Jon Ciesla <limburgher at gmail.com> - 2.4.5-2
 - Include two non-upstream additions to HTML-Quickform.
 
diff --git a/sources b/sources
index 81b82f4..e0027a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e0fbf15446b79c5811f6cc4e079f801  moodle-2.4.5.tgz
+5973867eaa736031dc0d7b9992978f4f  moodle-2.4.6.tgz