[moodle/el6: 18/18] Merge branch 'f19' into el6

[Jon Ciesla]

commit 35ca52630a7b905a4232007dce756e4e4e127548
Merge: 7a58006 13ea8e4
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Jan 22 08:28:15 2014 -0600

    Merge branch 'f19' into el6
    
    Conflicts:
    	.gitignore
    	moodle.spec
    	sources

 .gitignore  |   14 +++++++-------
 moodle.conf |   26 ++++++++++++++++++++++----
 moodle.spec |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 sources     |    2 +-
 4 files changed, 81 insertions(+), 14 deletions(-)
---
diff --cc moodle.spec
index 166f0cc,99f93a2..77ae3b5
--- a/moodle.spec
+++ b/moodle.spec
@@@ -233,34 -229,52 +236,80 @@@ f
  - 2.4.7, BZ 1025655,6, 1030084,5.
  
  * Wed Sep 11 2013 Jon Ciesla <limburgher at gmail.com> - 2.4.6-1
 +- 2.4.6, multiple securty fixes, BZ 1006679.
 +- CVE-2012-6087 patch upstreamed.
 +
 +* Tue Sep 03 2013 Jon Ciesla <limburgher at gmail.com> - 2.4.5-1
 +- Update to 2.4.5.
 +- Requires fixes.
 +
 +* Fri Jul 12 2013 Jon Ciesla <limburgher at gmail.com> - 2.3.8-1
 +- 2.2.x EOL, update to 2.3.8.
 +- Include two non-upstream additions to HTML-Quickform.
 +
 +* Mon May 20 2013 Jon Ciesla <limburgher at gmail.com> - 2.2.10-1
 +- Latest upstream, patch for multiple CVEs.
 +
 +* Mon Mar 25 2013 Jon Ciesla <limburgher at gmail.com> - 2.2.9-1
 +- Latest upstream, patch for multiple CVEs.
 +
 +* Tue Jan 15 2013 Jon Ciesla <limburgher at gmail.com> - 2.2.7-1
 +- Latest upstream, patch for CVE-2012-6087,
 +
 +* Mon Nov 19 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.6-1
 +- Security update, BZ 878132.
 +
 +* Mon Sep 17 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.5-1
 +- Security update.
 +
 +* Mon Jun 25 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.4-1
 +- Security update, BZ 841954.
+ - 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.
+ 
+ * Fri Jul 12 2013 Jon Ciesla <limburgher at gmail.com> - 2.4.5-1
+ - Latest upstream.
+ 
+ * Mon May 20 2013 Jon Ciesla <limburgher at gmail.com> - 2.4.4-1
+ - Latest upstream.
+ 
+ * Mon Mar 25 2013 Jon Ciesla <limburgher at gmail.com> - 2.4.3-1
+ - Latest upstream.
+ - Fixes for multiple CVEs.
+ 
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
+ * Tue Jan 15 2013 Jon Ciesla <limburgher at gmail.com> - 2.4.1-1
+ - Patch for CVE-2012-6087.
+ 
+ * Tue Jan 15 2013 Jon Ciesla <limburgher at gmail.com> - 2.4.1-1
+ - Latest upstream.
+ 
+ * Fri Nov 23 2012 Marcela Mašláňová <mmaslano at redhat.com> - 2.3.3-2
+ - The requirement on vixie-cron is not correct anymore. The dailyjobs will be
+   used as virtual requirement since now. #879550
+ 
+ * Mon Nov 19 2012 Jon Ciesla <limburgher at gmail.com> - 2.3.3-1
+ - Latest upstream, BZ 878132.
+ 
+ * Wed Oct 31 2012 Jon Ciesla <limburgher at gmail.com> - 2.3.2-3
+ - Fix conf.
+ 
+ * Tue Oct 30 2012 Jon Ciesla <limburgher at gmail.com> - 2.3.2-2
+ - Fix for httpd 2.4, BZ 871431.
+ 
+ * Mon Sep 17 2012 Jon Ciesla <limburgher at gmail.com> - 2.3.2-1
+ - Latest upstream.
+ 
+ * Mon Jul 23 2012 Jon Ciesla <limburgher at gmail.com> - 2.3.1-1
+ - Latest upstream, BZ 841954.
+ 
+ * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
  
  * Wed May 23 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.3-1
  - Security update, BZ 824481.