[moodle/el5: 63/63] Merge branch 'f15' into el5
Jon Ciesla
limb at fedoraproject.org
Mon Jul 23 23:53:05 UTC 2012
commit c672e1d1203a29fd8fe0fd76b03a3cea5cf04bcd
Merge: 4e85795 d2943e6
Author: Jon Ciesla <limburgher at gmail.com>
Date: Mon Jul 23 18:52:32 2012 -0500
Merge branch 'f15' into el5
Conflicts:
.gitignore
moodle.spec
sources
.gitignore | 187 ++++++++++++++++++-
moodle-1.9.3-rce-texed.patch | 6 +
moodle-1.9.4-CVE-2009-1171-1.patch | 39 ++++
moodle-1.9.4-CVE-2009-1171-2.patch | 107 +++++++++++
moodle-1.9.9-htmlpurifier-4.1.1.patch | 339 +++++++++++++++++++++++++++++++++
moodle.init | 15 ++-
moodle.spec | 321 +++++++++++++++++++++++---------
sources | 100 ++++++++++-
8 files changed, 1023 insertions(+), 91 deletions(-)
---
diff --cc .gitignore
index 5348423,77be90e..c36ba36
--- a/.gitignore
+++ b/.gitignore
@@@ -77,3 -77,187 +77,188 @@@ uz_utf8.zi
vi_utf8.zip
zh_cn_utf8.zip
zh_tw_utf8.zip
+ /moodle-1.9.10.tgz
+ /af_utf8.zip
+ /ar_utf8.zip
+ /be_utf8.zip
+ /bg_utf8.zip
+ /bs_utf8.zip
+ /ca_utf8.zip
+ /cs_utf8.zip
+ /cy_utf8.zip
+ /da_utf8.zip
+ /de_du_utf8.zip
+ /de_utf8.zip
+ /el_utf8.zip
+ /en_us_utf8.zip
+ /en_utf8.zip
+ /es_utf8.zip
+ /et_utf8.zip
+ /eu_utf8.zip
+ /fa_utf8.zip
+ /fil_utf8.zip
+ /fi_utf8.zip
+ /fr_ca_utf8.zip
+ /fr_utf8.zip
+ /ga_utf8.zip
+ /gl_utf8.zip
+ /gu_utf8.zip
+ /he_utf8.zip
+ /hi_utf8.zip
+ /hr_utf8.zip
+ /hu_utf8.zip
+ /hy_utf8.zip
+ /id_utf8.zip
+ /is_utf8.zip
+ /it_utf8.zip
+ /ja_utf8.zip
+ /ka_utf8.zip
+ /km_utf8.zip
+ /kn_utf8.zip
+ /ko_utf8.zip
+ /lo_utf8.zip
+ /lt_utf8.zip
+ /lv_utf8.zip
+ /mi_tn_utf8.zip
+ /mi_wwow_utf8.zip
+ /mk_utf8.zip
+ /ml_utf8.zip
+ /mn_utf8.zip
+ /ms_utf8.zip
+ /nl_utf8.zip
+ /nn_utf8.zip
+ /no_gr_utf8.zip
+ /no_utf8.zip
+ /pl_utf8.zip
+ /pt_br_utf8.zip
+ /pt_utf8.zip
+ /ro_utf8.zip
+ /ru_utf8.zip
+ /si_utf8.zip
+ /sk_utf8.zip
+ /sl_utf8.zip
+ /sm_utf8.zip
+ /so_utf8.zip
+ /sq_utf8.zip
+ /sr_cr_bo_utf8.zip
+ /sr_cr_utf8.zip
+ /sr_lt_utf8.zip
+ /sv_utf8.zip
+ /ta_lk_utf8.zip
+ /ta_utf8.zip
+ /th_utf8.zip
+ /tl_utf8.zip
+ /to_utf8.zip
+ /tr_utf8.zip
+ /uk_utf8.zip
+ /ur_utf8.zip
+ /uz_utf8.zip
+ /vi_utf8.zip
+ /zh_cn_utf8.zip
+ /zh_tw_utf8.zip
+ /moodle-1.9.11.tgz
+ /moodle-1.9.14.tgz
+ /af.zip
+ /am.zip
+ /ar.zip
+ /ast.zip
+ /az.zip
+ /be.zip
+ /bg.zip
+ /bn.zip
+ /bs.zip
+ /ca.zip
+ /ckb.zip
+ /cs.zip
+ /cy.zip
+ /da.zip
+ /de_du.zip
+ /de_kids.zip
+ /de.zip
+ /dv.zip
+ /el.zip
+ /en_us.zip
+ /en.zip
+ /es_ar.zip
+ /es_es.zip
+ /es_mx.zip
+ /es.zip
+ /et.zip
+ /eu.zip
+ /fa.zip
+ /fil.zip
+ /fi.zip
+ /fj.zip
+ /fr_ca.zip
+ /fr.zip
+ /ga.zip
+ /gd.zip
+ /gl.zip
+ /gu.zip
+ /he.zip
+ /hi.zip
+ /hr.zip
+ /hu.zip
+ /hy.zip
+ /id.zip
+ /is.zip
+ /it.zip
+ /ja.zip
+ /ka.zip
+ /kk.zip
+ /km.zip
+ /kn.zip
+ /ko.zip
+ /la.zip
+ /lo.zip
+ /lt.zip
+ /lv.zip
+ /mi_tn.zip
+ /mi_wwow.zip
+ /mk.zip
+ /ml.zip
+ /mn.zip
+ /mr.zip
+ /ms.zip
+ /nl.zip
+ /nn.zip
+ /no_gr.zip
+ /no.zip
+ /pl.zip
+ /pt_br.zip
+ /pt.zip
+ /ro.zip
+ /ru.zip
+ /si.zip
+ /sk.zip
+ /sl.zip
+ /sm.zip
+ /so.zip
+ /sq.zip
+ /sr_cr_bo.zip
+ /sr_cr.zip
+ /sr_lt.zip
+ /sr.zip
+ /sv.zip
+ /sw.zip
+ /ta_lk.zip
+ /ta.zip
+ /te.zip
+ /th.zip
+ /ti.zip
+ /tl.zip
+ /to.zip
+ /tr.zip
+ /uk.zip
+ /ur.zip
+ /uz.zip
+ /vi.zip
+ /zh_cn.zip
+ /zh_tw.zip
+ /zu.zip
+ /moodle-1.9.15.tgz
+ /la_utf8.zip
+ /moodle-1.9.16.tgz
+ /moodle-1.9.17.tgz
+ /moodle-1.9.18.tgz
++>>>>>>> f15
diff --cc moodle.spec
index f0e81f5,456061c..06fccee
--- a/moodle.spec
+++ b/moodle.spec
@@@ -7,16 -7,16 +7,14 @@@
%define __perl_provides %{nil}
Name: moodle
- Version: 1.8.13
- Release: 4%{?dist}
-Version: 1.9.18
++Version: 1.9.19
+ Release: 1%{?dist}
Summary: A Course Management System
Group: Applications/Publishing
License: GPLv2+
URL: http://moodle.org/
- Source0: http://download.moodle.org/stable18/%{name}-%{version}.tgz
- #Using weekly snapshot downloaded 11/7/08 to fix snoopy CVE-2008-4796
- #Source0: http://download.moodle.org/stable18/moodle-weekly-18.tgz
+ Source0: http://download.moodle.org/stable19/%{name}-%{version}.tgz
-#Using weekly snapshot downloaded 09/23/2009 for new PHP, BZ 525120
-#Source0: http://download.moodle.org/stable19/moodle-weekly-19.tgz
Source1: moodle.conf
Source2: moodle-config.php
Source3: moodle.cron
@@@ -1184,6 -1206,6 +1204,7 @@@ This package contains the files needed
%package sr_cr
Summary: Moodle language pack for Serbian (Cyrillic)
++
Group: Applications/Publishing
Requires: moodle = %{version}-%{release}
Obsoletes: moodle-sr <= 1.6.3-3
@@@ -1738,45 -1805,120 +1804,123 @@@ f
%exclude %{moodlewebdir}/COPYING.txt
%changelog
- * Mon May 14 2012 Jon Ciesla <limburgher at gmail.com> - 1.8.13-4
- - Fixed CAS unbundling per rcollet.
++* Mon Jul 23 2012 Jon Ciesla <limburgher at gmail.com> - 1.9.19-1
++- New upstream, security fixes, 824482, 841954.
++
+ * Wed May 23 2012 Jon Ciesla <limburgher at gmail.com> - 1.9.18-1
+ - New upstream, security fixes, 824481.
- * Tue Oct 12 2010 Jon Ciesla <limb at jcomserv.net> - 1.8.13-3
- - Fix CAS typo.
+ * Mon Apr 02 2012 Jon Ciesla <limburgher at gmail.com> - 1.9.17-1
+ - New upstream, security fixes, 809226.
- * Fri Aug 20 2010 Jon Ciesla <limb at jcomserv.net> - 1.8.13-2
+ * Tue Jan 24 2012 Jon Ciesla <limburgher at gmail.com> - 1.9.16-1
+ - New upstream, security fixes, 783534.
+
+ * Fri Dec 09 2011 Jon Ciesla <limburgher at gmail.com> - 1.9.15-1
+ - New upstream, security fixes, 761249.
+
+ * Fri Oct 21 2011 Jon Ciesla <limb at jcomserv.net> - 1.9.14-1
+ - New upstream, security fixes, 747445.
+
+ * Tue Feb 22 2011 Jon Ciesla <limb at jcomserv.net> - 1.9.11-1
+ - New upstream, security fixes.
+
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.10-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+ * Tue Oct 26 2010 Jon Ciesla <limb at jcomserv.net> - 1.9.10-1
+ - New upstream, MSA-10-0017.
+ - htmlpurifier patch upstreamed.
+
+ * Mon Oct 04 2010 Jon Ciesla <limb at jcomserv.net> - 1.9.9-3
+ - Correction of CAS symlink typo.
+
+ * Thu Aug 19 2010 Jon Ciesla <limb at jcomserv.net> - 1.9.9-2
- Switch to system php-pear-CAS, BZ 577467, 620772.
+ - Patching htmlpurifier, BZ 624754.
+
+ * Tue Jun 22 2010 Jon Ciesla <limb at jcomserv.net> - 1.9.9-1
+ - Update to 1.9.9, BZ 605810.
+
+ * Thu Mar 25 2010 Jon Ciesla <limb at jcomserv.net> - 1.9.8-1
+ - Update to 1.9.8, BZ 575905.
+
+ * Tue Dec 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.7-1
+ - Update to 1.9.7, BZ 544766.
+
+ * Thu Nov 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.6-2
+ - Reverted erroneous cron fix.
+
+ * Thu Nov 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.6-1
+ - Update to 1.9.6.
+ - Make moodle-cron honor lock, BZ 533171.
- * Tue Jun 22 2010 Jon Ciesla <limb at jcomserv.net> - 1.8.13-1
- - 1.8.13, BZ 605810.
+ * Wed Sep 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.5-3
+ - Using weekly snapshot downloaded 09/23/2009 for new PHP, BZ 525120
+ - Added Urdu installer.
- * Thu Apr 01 2010 Jon Ciesla <limb at jcomserv.net> - 1.8.12-1
- - 1.8.12, BZ 578811.
+ * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.5-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
- * Tue Dec 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.11-1
- - 1.8.11, BZ 544766.
+ * Thu May 14 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.5-1
+ - Move symlink scripts from pretrans to post, pre.
+ - 1.9.5.
- * Thu Nov 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.8-4
- - moodle-cron fix, BZ 533171.
+ * Fri Apr 03 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-7
+ - Move symlink scripts from pre to pretrans.
+ - Corrented moodle-cron BZ 494090.
- * Thu Apr 02 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.8-3
+ * Wed Apr 01 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-6
- Patch for CVE-2009-1171, BZ 493109.
- * Mon Feb 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.8-2
- - Fixed cron.
+ * Tue Mar 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-5
+ - Update for freefont->gnu-free-fonts change.
- * Tue Feb 10 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.8-1
- - Update to 1.8.8. to fix CVE-2009-0499,0500,0501,0502.
- - Backported some fonts fixes.
+ * Thu Feb 26 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-4
+ - Fix for symlink dir replacement.
- * Fri Nov 07 2008 Jon Ciesla <limb at jcomserv.net> - 1.8.7-1
+ * Mon Feb 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-2
+ - Putting back bundled MagpieRSS due to incompatibility, BZ 486777.
+ - Corrected moodle-cron.
+
+ * Tue Feb 10 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-1
+ - Update to 1.9.4 to fix CVE-2009-0499,0500,0501,0502.
+
+ * Tue Jan 27 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.3-6
+ - Dropped and symlinked to khmeros-base-fonts.
+
+ * Thu Jan 20 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.3-5
+ - Dropped and symlinked illegal sm and to fonts.
+ - Symlinking to FreeSans.
+ - Drop spell-check-logic.cgi, CVE-2008-5153, per upstream, BZ 472117, 472119, 472120.
+
+ * Wed Dec 17 2008 Jon Ciesla <limb at jcomserv.net> - 1.9.3-4
+ - Texed fix, BZ 476709.
+
+ * Fri Nov 07 2008 Jon Ciesla <limb at jcomserv.net> - 1.9.3-3
- Moved to weekly downloaded 11/7/08 to fix Snoopy CVE-2008-4796.
+
+ * Fri Oct 31 2008 Jon Ciesla <limb at jcomserv.net> - 1.9.3-2
- Fix for BZ 468929, overactive cron job.
- - Updated to 1.8.7.
+
+ * Wed Oct 22 2008 Jon Ciesla <limb at jcomserv.net> - 1.9.3-1
+ - Updated to 1.9.3.
- Updated language packs to 22 Oct 2008 versions.
- * Mon Jul 07 2008 Jon Ciesla <limb at jcomserv.net> - 1.8.5-1
+ * Wed Aug 06 2008 Jon Ciesla <limb at jcomserv.net> - 1.9.2-2
+ - Remove bundled adodb, use system php-adodb. BZ 457886.
+ - Remove bundled magpie, use system php-magpierss. BZ 457886.
+
+ * Wed Aug 06 2008 Jon Ciesla <limb at jcomserv.net> - 1.9.2-1
+ - Updated to 1.9.2.
+ - Remove bundled Smarty, use system php-Smarty. BZ 457886.
+ - Updated language packs to 06 Aug 2008 versions.
+
+ * Mon Jun 23 2008 Jon Ciesla <limb at jcomserv.net> - 1.9.1-2
- Add php Requires, BZ 452341.
+
+ * Thu May 22 2008 Jon Ciesla <limb at jcomserv.net> - 1.9.1-1
+ - Update to 1.9.1.
- Updated language packs to 22 May 2008 versions.
- Added Welsh, Uzbek support.
- Added php-xmlrpc Requires.
More information about the scm-commits
mailing list