[moodle/f20] 2.6.10

[Jon Ciesla]

commit 8f181b01d0ef71f67b1bc80fedf2b52e36bfea88
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Mar 24 09:05:29 2015 -0500

    2.6.10

 .gitignore                      |  1 +
 moodle-2.5-unbundle-tcpdf.patch | 21 ++++++---------------
 moodle.spec                     |  5 ++++-
 sources                         |  2 +-
 4 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4bc8163..0d1c5b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -280,3 +280,4 @@ zh_tw_utf8.zip
 /moodle-2.5.7.tgz
 /moodle-2.5.8.tgz
 /moodle-2.5.9.tgz
+/moodle-2.6.10.tgz
diff --git a/moodle-2.5-unbundle-tcpdf.patch b/moodle-2.5-unbundle-tcpdf.patch
index 5abab8c..22bdfaf 100644
--- a/moodle-2.5-unbundle-tcpdf.patch
+++ b/moodle-2.5-unbundle-tcpdf.patch
@@ -1,7 +1,7 @@
---- lib/pdflib.php.orig	2013-05-14 04:27:22.000000000 -0500
-+++ lib/pdflib.php	2013-05-20 11:16:24.852733525 -0500
-@@ -58,10 +58,10 @@
- // The configuration constants needed by tcpdf follow
+--- lib/pdflib.php~	2014-11-14 07:46:56.000000000 -0600
++++ lib/pdflib.php	2014-11-14 07:49:13.742507548 -0600
+@@ -123,10 +123,10 @@
+ tcpdf_init_k_font_path();
  
  /** tcpdf installation path */
 -define('K_PATH_MAIN', $CFG->dirroot.'/lib/tcpdf/');
@@ -11,14 +11,5 @@
 -define('K_PATH_URL', $CFG->wwwroot . '/lib/tcpdf/');
 +define('K_PATH_URL', '/usr/share/php/tcpdf/');
  
- /** path for PDF fonts */
- define('K_PATH_FONTS', K_PATH_MAIN . 'fonts/');
-@@ -81,7 +81,7 @@
- /** reduction factor for small font */
- define('K_SMALL_RATIO', 2/3);
- 
--require_once(dirname(__FILE__).'/tcpdf/tcpdf.php');
-+require_once('/usr/share/php/tcpdf/tcpdf.php');
- 
- /**
-  * Wrapper class that extends TCPDF (lib/tcpdf/tcpdf.php).
+ /** cache directory for temporary files (full path) */
+ define('K_PATH_CACHE', $CFG->cachedir . '/tcpdf/');
diff --git a/moodle.spec b/moodle.spec
index 61311d9..7d19b5b 100644
--- a/moodle.spec
+++ b/moodle.spec
@@ -6,7 +6,7 @@
 %define __perl_provides %{nil}
 
 Name:           moodle
-Version:        2.5.9
+Version:        2.6.10
 Release:       	1%{?dist}
 Summary:        A Course Management System
 
@@ -239,6 +239,9 @@ fi
 %exclude %{moodlewebdir}/COPYING.txt
 
 %changelog
+* Tue Mar 24 2015 Jon Ciesla <limburgher at gmail.com> - 2.6.10-1
+- 2.6.10, fix for security issues, 2.5.x EOL.
+
 * Fri Nov 14 2014 Jon Ciesla <limburgher at gmail.com> - 2.5.9-1
 - 2.5.9, fix for security issues.
 
diff --git a/sources b/sources
index ecaa758..0a72dea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b43ce18641bdb4a2d36f5804e8f96ced  moodle-2.5.9.tgz
+c3d042f6d50456092b16c683583e9525  moodle-2.6.10.tgz