[moodle/el6: 16/16] Merge branch 'f17' into el6
Jon Ciesla
limb at fedoraproject.org
Wed Feb 27 20:17:13 UTC 2013
commit f9ab01659e2a7094a81370ec27ccc7b6709f58b6
Merge: a0add4a 017b8c2
Author: Jon Ciesla <limburgher at gmail.com>
Date: Wed Feb 27 14:14:00 2013 -0600
Merge branch 'f17' into el6
Conflicts:
.gitignore
moodle-CVE-2012-6087.patch
moodle.spec
sources
.gitignore | 280 ++++++++++++++++++++++++++++++++++++++++++--
moodle-CVE-2012-6087.patch | 20 ++--
moodle.spec | 83 +++++++++++---
sources | 2 +-
4 files changed, 348 insertions(+), 37 deletions(-)
---
diff --cc .gitignore
index 9617ae7,1307303..59f4326
--- a/.gitignore
+++ b/.gitignore
@@@ -1,9 -1,270 +1,271 @@@
- /moodle-2.0.5.tgz
- /moodle-2.0.6.tgz
- /moodle-2.0.7.tgz
- /moodle-2.0.8.tgz
- /moodle-2.0.9.tgz
- /moodle-2.0.10.tgz
- /moodle-2.1.8.tgz
- /moodle-2.1.9.tgz
- /moodle-2.1.10.tgz
+ moodle-1.9.9.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.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-2.0.2.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-2.0.3.tgz
+ /moodle-2.1.1.tgz
+ /moodle-2.1.2.tgz
+ /moodle-2.1.3.tgz
+ /moodle-2.2.tgz
+ /moodle-2.2.1.tgz
+ /moodle-2.2.2.tgz
+ /moodle-2.2.3.tgz
+ /moodle-2.2.4.tgz
+ /moodle-2.2.5.tgz
+ /moodle-2.2.6.tgz
+ /moodle-2.2.7.tgz
++
diff --cc moodle.spec
index 342f440,0b0ebe4..739c086
--- a/moodle.spec
+++ b/moodle.spec
@@@ -145,11 -180,11 +180,15 @@@ f
if [ -h /var/www/moodle/web/lib/magpie ]; then
rm -f /var/www/moodle/web/lib/magpie
fi
+if [ -L /var/www/moodle/web/auth/cas ]; then
+ rm -f /var/www/moodle/web/auth/cas
+fi
+
+ if [ -L /var/www/moodle/web/auth/cas ]; then
+ rm -f /var/www/moodle/web/auth/cas
+ fi
+
%files
%defattr(-,root,root,-)
%doc README* COPYING.txt TRADEMARK.txt local/readme.txt
@@@ -188,36 -222,59 +226,47 @@@
%exclude %{moodlewebdir}/COPYING.txt
%changelog
- * Tue Jan 15 2013 Jon Ciesla <limburgher at gmail.com> - 2.1.10-1
- - Latest upstream, patch for CVE-2012-6087.
+ * 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.1.9-1
+ * 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.1.8-1
+ * Mon Sep 17 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.5-1
- Security update.
- * Mon Jul 23 2012 Jon Ciesla <limburgher at gmail.com> - 2.0.10-1
- - 2.0.10, security fixes, BZ 841954.
+ * Mon Jun 23 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.4-1
+ - Security update, BZ 841954.
+
+ * Wed May 23 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.3-1
+ - Security update, BZ 824481.
- * Wed May 23 2012 Jon Ciesla <limburgher at gmail.com> - 2.0.9-1
- - 2.0.9, security fixes, BZ 824481.
+ * Wed May 09 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.2-3
+ - Unbundled php-markdown.
+ - Unbundled php-pear-Auth-RADIUS.
+ - Unbundled php-pear-Crypt-CHAP.
+ - Unbundled php-pear-HTML-Common.
+ - Unbundled php-pear-HTML-QuickForm.
+ - Unbundled php-pear-OLE.
- * Wed May 09 2012 Jon Ciesla <limburgher at gmail.com> - 2.0.8-2
+ * Wed May 09 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.2-2
- Dropped bundled language packs, BZ 748958.
- * Mon Apr 02 2012 Jon Ciesla <limburgher at gmail.com> - 2.0.8-1
- - New upstream, BZ 809226.
+ * Tue Mar 13 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.2-1
+ - Latest upstream.
+
+ * Tue Mar 13 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.1-2
+ - Fixed CAS unbundling per rcollet.
- * Tue Jan 24 2012 Jon Ciesla <limburgher at gmail.com> - 2.0.7-1
+ * Tue Jan 24 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.1-1
- New upstream, BZ 783534.
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Dec 22 2011 Jon Ciesla <limburgher at gmail.com> - 2.2-1
-- New upstream.
-
-* Thu Dec 08 2011 Jon Ciesla <limburgher at gmail.com> - 2.1.3-1
+* Fri Dec 09 2011 Jon Ciesla <limburgher at gmail.com> - 2.0.6-1
- New upstream, BZ 761249.
-* Fri Oct 21 2011 Jon Ciesla <limb at jcomserv.net> - 2.1.2-1
+* Fri Oct 21 2011 Jon Ciesla <limb at jcomserv.net> - 2.0.5-1
- New upstream, BZ 747445.
-* Tue Sep 27 2011 Jon Ciesla <limb at jcomserv.net> - 2.1.1-2
-- Switched to cli cron script, BZ 733957.
-
-* Tue Aug 16 2011 Jon Ciesla <limb at jcomserv.net> - 2.1.1-1
-- New upstream.
-
* Mon May 09 2011 Jon Ciesla <limb at jcomserv.net> - 2.0.3-1
- New upstream.
More information about the scm-commits
mailing list