[pkgsrc/pkgsrc-2011Q2]: pkgsrc/www/moodle Pullup ticket #3495 - requested by gls

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a87c3725c405
branches:  pkgsrc-2011Q2
changeset: 590259:a87c3725c405
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Aug 14 11:15:39 2011 +0000

description:
Pullup ticket #3495 - requested by gls
www/moodle: security update

Revisions pulled up:
- www/moodle/Makefile                                           1.5
- www/moodle/PLIST                                              1.4
- www/moodle/distinfo                                           1.4

---
   Module Name: pkgsrc
   Committed By:        gls
   Date:                Tue Aug  9 18:59:23 UTC 2011

   Modified Files:
        pkgsrc/www/moodle: Makefile PLIST distinfo

   Log Message:
   Update www/moodle to 2.1.1

   pkgsrc changes:
   - replace bash with sh in a script.

   Upstream changes:

   Many, many changes, including security fixes.

   Highlights from version 2.1:

   - New question engine
   - Ability to restore the course contents from Moodle 1.9 backup files
   - Support for mobile devices

   For complete changelog, please refer to:

   http://docs.moodle.org/dev/Moodle_2.0.3_release_notes
   http://docs.moodle.org/dev/Moodle_2.0.4_release_notes
   http://docs.moodle.org/dev/Moodle_2.1_release_notes
   http://docs.moodle.org/dev/Moodle_2.1.1_release_notes

   Fixes SA45487 (MSA-11-0021, MSA-11-0022), among others.

diffstat:

 www/moodle/Makefile |    27 +-
 www/moodle/PLIST    |  1207 +++++++++++++++++++++++++++++++++++++-------------
 www/moodle/distinfo |     8 +-
 3 files changed, 902 insertions(+), 340 deletions(-)

diffs (truncated from 2191 to 300 lines):

diff -r ee443f7e198f -r a87c3725c405 www/moodle/Makefile
--- a/www/moodle/Makefile       Mon Aug 08 19:59:12 2011 +0000
+++ b/www/moodle/Makefile       Sun Aug 14 11:15:39 2011 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2011/03/07 21:32:47 gls Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2011/08/14 11:15:39 tron Exp $
 
-DISTNAME=      moodle-2.0.2
+DISTNAME=      moodle-2.1.1
 CATEGORIES=    www
-MASTER_SITES=  http://download.moodle.org/stable20/ \
-               http://download2.moodle.org/stable20/ \
-               http://download3.moodle.org/stable20/ \
-               http://download4.moodle.org/stable20/
+MASTER_SITES=  http://download.moodle.org/stable21/ \
+               http://download2.moodle.org/stable21/ \
+               http://download3.moodle.org/stable21/ \
+               http://download4.moodle.org/stable21/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    wenheping%gmail.com@localhost
@@ -50,6 +50,12 @@
 NO_CONFIGURE=          YES
 NO_BUILD=              YES
 
+SUBST_CLASSES+=                        bash
+SUBST_MESSAGE.bash=            Replacing /bin/bash with ${SH}
+SUBST_STAGE.bash=              post-patch
+SUBST_FILES.bash=              lib/editor/tinymce/extra/tools/download_langs.sh
+SUBST_SED.bash=                        -e "s,/bin/bash,${SH},g"
+
 SUBST_CLASSES+=                conf
 SUBST_MESSAGE.conf=    Fixing pathnames in configuration file.
 SUBST_STAGE.conf=      post-patch
@@ -60,7 +66,14 @@
 SUBST_CLASSES+=                php
 SUBST_MESSAGE.php=     Fixing the path of php.
 SUBST_STAGE.php=       post-patch
-SUBST_FILES.php=       admin/mailout-debugger.php admin/process_email.php mod/chat/chatd.php
+SUBST_FILES.php=       admin/cli/mysql_engine.php admin/cli/maintenance.php admin/cli/cron.php
+SUBST_FILES.php+=      admin/cli/reset_password.php admin/cli/automated_backups.php
+SUBST_FILES.php+=      admin/cli/install.php admin/cli/install_database.php admin/cli/upgrade.php
+SUBST_FILES.php+=      admin/mailout-debugger.php admin/process_email.php
+SUBST_FILES.php+=      auth/ldap/cli/sync_users.php auth/cas/cli/sync_users.php auth/db/cli/sync_users.php
+SUBST_FILES.php+=      enrol/ldap/cli/sync.php enrol/database/cli/sync.php enrol/category/cli/sync.php
+SUBST_FILES.php+=      lib/pear/PHP/runsniffer lib/spikephpcoverage/src/cli/instrument.php
+SUBST_FILES.php+=      mod/chat/chatd.php
 SUBST_SED.php=         -e "s,/usr/bin/php,${PREFIX}/bin/php,g"
 
 SUBST_CLASSES+=                perl
diff -r ee443f7e198f -r a87c3725c405 www/moodle/PLIST
--- a/www/moodle/PLIST  Mon Aug 08 19:59:12 2011 +0000
+++ b/www/moodle/PLIST  Sun Aug 14 11:15:39 2011 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2011/03/07 21:32:47 gls Exp $
+@comment $NetBSD: PLIST,v 1.3.4.1 2011/08/14 11:15:39 tron Exp $
 share/examples/moodle/moodle.conf
 share/moodle/COPYING.txt
 share/moodle/README.txt
@@ -35,9 +35,11 @@
 share/moodle/admin/index.php
 share/moodle/admin/innodb.php
 share/moodle/admin/langimport.php
+share/moodle/admin/lib.php
 share/moodle/admin/licenses.php
 share/moodle/admin/localplugins.php
 share/moodle/admin/mailout-debugger.php
+share/moodle/admin/message.php
 share/moodle/admin/mnet/access_control.php
 share/moodle/admin/mnet/delete.php
 share/moodle/admin/mnet/index.php
@@ -55,9 +57,11 @@
 share/moodle/admin/multilangupgrade.php
 share/moodle/admin/oacleanup.php
 share/moodle/admin/phpinfo.php
+share/moodle/admin/plugins.php
 share/moodle/admin/portfolio.php
 share/moodle/admin/process_email.php
 share/moodle/admin/purgecaches.php
+share/moodle/admin/qbehaviours.php
 share/moodle/admin/qtypes.php
 share/moodle/admin/registration/confirmregistration.php
 share/moodle/admin/registration/forms.php
@@ -67,6 +71,7 @@
 share/moodle/admin/registration/register.php
 share/moodle/admin/registration/renderer.php
 share/moodle/admin/registration/renewregistration.php
+share/moodle/admin/renderer.php
 share/moodle/admin/replace.php
 share/moodle/admin/report/backups/index.php
 share/moodle/admin/report/backups/settings.php
@@ -172,6 +177,7 @@
 share/moodle/admin/uploadpicture_form.php
 share/moodle/admin/uploaduser.php
 share/moodle/admin/uploaduser_form.php
+share/moodle/admin/uploaduserlib.php
 share/moodle/admin/user.php
 share/moodle/admin/user/lib.php
 share/moodle/admin/user/user_bulk.php
@@ -309,7 +315,9 @@
 share/moodle/auth/ldap/version.php
 share/moodle/auth/manual/auth.php
 share/moodle/auth/manual/config.html
+share/moodle/auth/manual/db/upgrade.php
 share/moodle/auth/manual/lang/en/auth_manual.php
+share/moodle/auth/manual/version.php
 share/moodle/auth/mnet/auth.php
 share/moodle/auth/mnet/config.html
 share/moodle/auth/mnet/db/install.php
@@ -467,16 +475,25 @@
 share/moodle/backup/controller/backup_controller.class.php
 share/moodle/backup/controller/restore_controller.class.php
 share/moodle/backup/controller/simpletest/testcontroller.php
+share/moodle/backup/converter/convertlib.php
+share/moodle/backup/converter/moodle1/handlerlib.php
+share/moodle/backup/converter/moodle1/lib.php
+share/moodle/backup/converter/moodle1/simpletest/files/icon.gif
+share/moodle/backup/converter/moodle1/simpletest/files/moodle.xml
+share/moodle/backup/converter/moodle1/simpletest/files/questions.xml
+share/moodle/backup/converter/moodle1/simpletest/testlib.php
 share/moodle/backup/import.php
 share/moodle/backup/lib.php
 share/moodle/backup/log.php
 share/moodle/backup/moodle2/backup_activity_task.class.php
 share/moodle/backup/moodle2/backup_block_task.class.php
 share/moodle/backup/moodle2/backup_course_task.class.php
+share/moodle/backup/moodle2/backup_coursereport_plugin.class.php
 share/moodle/backup/moodle2/backup_custom_fields.php
 share/moodle/backup/moodle2/backup_default_block_task.class.php
 share/moodle/backup/moodle2/backup_final_task.class.php
 share/moodle/backup/moodle2/backup_format_plugin.class.php
+share/moodle/backup/moodle2/backup_plagiarism_plugin.class.php
 share/moodle/backup/moodle2/backup_plan_builder.class.php
 share/moodle/backup/moodle2/backup_plugin.class.php
 share/moodle/backup/moodle2/backup_qtype_plugin.class.php
@@ -485,13 +502,16 @@
 share/moodle/backup/moodle2/backup_settingslib.php
 share/moodle/backup/moodle2/backup_stepslib.php
 share/moodle/backup/moodle2/backup_subplugin.class.php
+share/moodle/backup/moodle2/backup_theme_plugin.class.php
 share/moodle/backup/moodle2/backup_xml_transformer.class.php
 share/moodle/backup/moodle2/restore_activity_task.class.php
 share/moodle/backup/moodle2/restore_block_task.class.php
 share/moodle/backup/moodle2/restore_course_task.class.php
+share/moodle/backup/moodle2/restore_coursereport_plugin.class.php
 share/moodle/backup/moodle2/restore_default_block_task.class.php
 share/moodle/backup/moodle2/restore_final_task.class.php
 share/moodle/backup/moodle2/restore_format_plugin.class.php
+share/moodle/backup/moodle2/restore_plagiarism_plugin.class.php
 share/moodle/backup/moodle2/restore_plan_builder.class.php
 share/moodle/backup/moodle2/restore_plugin.class.php
 share/moodle/backup/moodle2/restore_qtype_plugin.class.php
@@ -500,6 +520,7 @@
 share/moodle/backup/moodle2/restore_settingslib.php
 share/moodle/backup/moodle2/restore_stepslib.php
 share/moodle/backup/moodle2/restore_subplugin.class.php
+share/moodle/backup/moodle2/restore_theme_plugin.class.php
 share/moodle/backup/restore.php
 share/moodle/backup/restorefile.php
 share/moodle/backup/restorefile_form.php
@@ -517,6 +538,7 @@
 share/moodle/backup/util/dbops/simpletest/testdbops.php
 share/moodle/backup/util/destinations/simpletest/testdestination.php
 share/moodle/backup/util/factories/backup_factory.class.php
+share/moodle/backup/util/factories/convert_factory.class.php
 share/moodle/backup/util/factories/restore_factory.class.php
 share/moodle/backup/util/factories/simpletest/testfactory.php
 share/moodle/backup/util/helper/backup_anonymizer_helper.class.php
@@ -526,6 +548,7 @@
 share/moodle/backup/util/helper/backup_general_helper.class.php
 share/moodle/backup/util/helper/backup_helper.class.php
 share/moodle/backup/util/helper/backup_null_iterator.class.php
+share/moodle/backup/util/helper/convert_helper.class.php
 share/moodle/backup/util/helper/restore_decode_content.class.php
 share/moodle/backup/util/helper/restore_decode_processor.class.php
 share/moodle/backup/util/helper/restore_decode_rule.class.php
@@ -538,9 +561,11 @@
 share/moodle/backup/util/helper/restore_roles_parser_processor.class.php
 share/moodle/backup/util/helper/restore_structure_parser_processor.class.php
 share/moodle/backup/util/helper/restore_users_parser_processor.class.php
+share/moodle/backup/util/helper/simpletest/testconverthelper.php
 share/moodle/backup/util/helper/simpletest/testdecode.php
 share/moodle/backup/util/helper/simpletest/testhelper.php
 share/moodle/backup/util/includes/backup_includes.php
+share/moodle/backup/util/includes/convert_includes.php
 share/moodle/backup/util/includes/restore_includes.php
 share/moodle/backup/util/interfaces/annotable.class.php
 share/moodle/backup/util/interfaces/checksumable.class.php
@@ -633,6 +658,7 @@
 share/moodle/backup/util/xml/parser/simpletest/fixtures/test2.xml
 share/moodle/backup/util/xml/parser/simpletest/fixtures/test3.xml
 share/moodle/backup/util/xml/parser/simpletest/fixtures/test4.xml
+share/moodle/backup/util/xml/parser/simpletest/fixtures/test5.xml
 share/moodle/backup/util/xml/parser/simpletest/testparser.php
 share/moodle/backup/util/xml/simpletest/fixtures/test1.xml
 share/moodle/backup/util/xml/simpletest/testwriter.php
@@ -665,6 +691,7 @@
 share/moodle/blocks/calendar_upcoming/version.php
 share/moodle/blocks/comments/block_comments.php
 share/moodle/blocks/comments/lang/en/block_comments.php
+share/moodle/blocks/comments/lib.php
 share/moodle/blocks/comments/version.php
 share/moodle/blocks/community/block_community.php
 share/moodle/blocks/community/communitycourse.php
@@ -916,6 +943,7 @@
 share/moodle/course/lib.php
 share/moodle/course/loginas.php
 share/moodle/course/mod.php
+share/moodle/course/modduplicate.php
 share/moodle/course/modedit.php
 share/moodle/course/moodleform_mod.php
 share/moodle/course/pending.php
@@ -937,6 +965,7 @@
 share/moodle/course/report/completion/mod.php
 share/moodle/course/report/completion/textrotate.js
 share/moodle/course/report/completion/version.php
+share/moodle/course/report/lib.php
 share/moodle/course/report/log/db/access.php
 share/moodle/course/report/log/graph.php
 share/moodle/course/report/log/index.php
@@ -1004,6 +1033,8 @@
 share/moodle/enrol/authorize/locallib.php
 share/moodle/enrol/authorize/uploadcsv.php
 share/moodle/enrol/authorize/version.php
+share/moodle/enrol/bulkchange.php
+share/moodle/enrol/bulkchange_forms.php
 share/moodle/enrol/category/cli/sync.php
 share/moodle/enrol/category/db/access.php
 share/moodle/enrol/category/db/events.php
@@ -1015,6 +1046,7 @@
 share/moodle/enrol/category/version.php
 share/moodle/enrol/cohort/addinstance.php
 share/moodle/enrol/cohort/addinstance_form.php
+share/moodle/enrol/cohort/ajax.php
 share/moodle/enrol/cohort/db/access.php
 share/moodle/enrol/cohort/db/events.php
 share/moodle/enrol/cohort/lang/en/enrol_cohort.php
@@ -1022,9 +1054,13 @@
 share/moodle/enrol/cohort/locallib.php
 share/moodle/enrol/cohort/settings.php
 share/moodle/enrol/cohort/version.php
+share/moodle/enrol/cohort/yui/quickenrolment/assets/skins/sam/quickenrolment.css
+share/moodle/enrol/cohort/yui/quickenrolment/assets/skins/sam/sprite.png
+share/moodle/enrol/cohort/yui/quickenrolment/quickenrolment.js
 share/moodle/enrol/database/cli/sync.php
 share/moodle/enrol/database/db/access.php
 share/moodle/enrol/database/db/install.php
+share/moodle/enrol/database/db/upgrade.php
 share/moodle/enrol/database/lang/en/enrol_database.php
 share/moodle/enrol/database/lib.php
 share/moodle/enrol/database/settings.php
@@ -1071,17 +1107,27 @@
 share/moodle/enrol/ldap/settingslib.php
 share/moodle/enrol/ldap/version.php
 share/moodle/enrol/locallib.php
+share/moodle/enrol/manual/ajax.php
+share/moodle/enrol/manual/bulkchangeforms.php
 share/moodle/enrol/manual/db/access.php
 share/moodle/enrol/manual/db/install.php
+share/moodle/enrol/manual/db/services.php
 share/moodle/enrol/manual/edit.php
 share/moodle/enrol/manual/edit_form.php
+share/moodle/enrol/manual/editenrolment.php
+share/moodle/enrol/manual/editenrolment_form.php
+share/moodle/enrol/manual/externallib.php
 share/moodle/enrol/manual/lang/en/enrol_manual.php
 share/moodle/enrol/manual/lib.php
 share/moodle/enrol/manual/locallib.php
 share/moodle/enrol/manual/manage.php
 share/moodle/enrol/manual/settings.php
 share/moodle/enrol/manual/unenrolself.php
+share/moodle/enrol/manual/unenroluser.php
 share/moodle/enrol/manual/version.php
+share/moodle/enrol/manual/yui/quickenrolment/assets/skins/sam/quickenrolment.css
+share/moodle/enrol/manual/yui/quickenrolment/assets/skins/sam/sprite.png
+share/moodle/enrol/manual/yui/quickenrolment/quickenrolment.js
 share/moodle/enrol/meta/addinstance.php
 share/moodle/enrol/meta/addinstance_form.php
 share/moodle/enrol/meta/db/access.php
@@ -1121,6 +1167,8 @@
 share/moodle/enrol/self/db/install.php
 share/moodle/enrol/self/edit.php
 share/moodle/enrol/self/edit_form.php
+share/moodle/enrol/self/editenrolment.php
+share/moodle/enrol/self/editenrolment_form.php
 share/moodle/enrol/self/lang/en/enrol_self.php
 share/moodle/enrol/self/lib.php
 share/moodle/enrol/self/locallib.php
@@ -1128,21 +1176,16 @@
 share/moodle/enrol/self/pix/withoutkey.gif
 share/moodle/enrol/self/settings.php
 share/moodle/enrol/self/unenrolself.php
+share/moodle/enrol/self/unenroluser.php
 share/moodle/enrol/self/version.php
 share/moodle/enrol/users.php
 share/moodle/enrol/users_forms.php
-share/moodle/enrol/yui/enrolmentmanager/assets/skins/sam/enrolmentmanager.css
-share/moodle/enrol/yui/enrolmentmanager/assets/skins/sam/sprite.png
-share/moodle/enrol/yui/enrolmentmanager/enrolmentmanager.js
 share/moodle/enrol/yui/notification/assets/skins/sam/notification.css