Tue Sep 23 07:06:10 2014 UTC ()
Update to 2.7.2(security update)

Upstream changes:
Highlights
MDL-45780 - Atto now working with form change checker and quiz autosave
MDL-46748 - Mathjax address that changed, that caused Atto to fail to load, has been updated in Moodle
MDL-35984 - Gradebook Sum of grades shows correct total if items are hidden
Functional changes
MDL-45724 - Warning given when the same memcached instance is used for both sessions and MUC
MDL-46681 - For Multiple choices questions in the quiz / question bank, the options "Clear incorrect responses" and "Show the number of correct responses" did not make sense for "One answer only" questions. It is now impossible to select that combination of options on the form.
Security issues
MSA-14-0033 URL parameter injection in CAS authentication
MSA-14-0034 Identity information revealed early in Q&A forum
Fixes and improvements
MDL-37509 - Description of assignment hidden in calendar if "always show description" = NO
MDL-46545 - Weekly stats now working again
MDL-46589 - Automatic emails now sent after users import from CSV
MDL-43197 - Parent role only sees course total and no longer individual grades
MDL-46236 - Start New Attempt option is now followed if SCORM is set to appear in a popup

Approved by:	wiz@


(wen)
diff -r1.30 -r1.31 pkgsrc/www/moodle/Makefile
diff -r1.21 -r1.22 pkgsrc/www/moodle/distinfo
cvs diff -r1.30 -r1.31 pkgsrc/www/moodle/Makefile (switch to unified diff)

--- pkgsrc/www/moodle/Makefile 2014/07/18 13:34:17 1.30
+++ pkgsrc/www/moodle/Makefile 2014/09/23 07:06:10 1.31
@@ -1,101 +1,101 @@ @@ -1,101 +1,101 @@
1# $NetBSD: Makefile,v 1.30 2014/07/18 13:34:17 wen Exp $ 1# $NetBSD: Makefile,v 1.31 2014/09/23 07:06:10 wen Exp $
2 2
3DISTNAME= moodle-2.7.1 3DISTNAME= moodle-2.7.2
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=moodle/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=moodle/}
6EXTRACT_SUFX= .tgz 6EXTRACT_SUFX= .tgz
7 7
8MAINTAINER= wenheping@gmail.com 8MAINTAINER= wenheping@gmail.com
9HOMEPAGE= http://www.moodle.org/ 9HOMEPAGE= http://www.moodle.org/
10COMMENT= Course management system based on social constructionism 10COMMENT= Course management system based on social constructionism
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.4.4:../../graphics/php-gd 13DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.4.4:../../graphics/php-gd
14DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=5.4.4:../../converters/php-iconv 14DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=5.4.4:../../converters/php-iconv
15DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.4.4:../../converters/php-mbstring 15DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.4.4:../../converters/php-mbstring
16DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.4.4:../../www/php-curl 16DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.4.4:../../www/php-curl
17DEPENDS+= ${PHP_PKG_PREFIX}-xmlrpc>=5.4.4:../../net/php-xmlrpc 17DEPENDS+= ${PHP_PKG_PREFIX}-xmlrpc>=5.4.4:../../net/php-xmlrpc
18DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.4.4:../../textproc/php-dom 18DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.4.4:../../textproc/php-dom
19DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.4.4:../../net/php-soap 19DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.4.4:../../net/php-soap
20DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.4.4:../../textproc/php-json 20DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.4.4:../../textproc/php-json
21DEPENDS+= ${PHP_PKG_PREFIX}-intl>=5.4.4:../../textproc/php-intl 21DEPENDS+= ${PHP_PKG_PREFIX}-intl>=5.4.4:../../textproc/php-intl
22DEPENDS+= ${PHP_PKG_PREFIX}-zip>=5.4.4:../../archivers/php-zip 22DEPENDS+= ${PHP_PKG_PREFIX}-zip>=5.4.4:../../archivers/php-zip
23DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.4.4:../../archivers/php-zlib 23DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.4.4:../../archivers/php-zlib
24 24
25EGDIR= share/examples/moodle 25EGDIR= share/examples/moodle
26MOODLEDIR= ${PREFIX}/share/moodle 26MOODLEDIR= ${PREFIX}/share/moodle
27MOODLEDATADIR= ${PREFIX}/moodledata 27MOODLEDATADIR= ${PREFIX}/moodledata
28 28
29PKG_DESTDIR_SUPPORT= destdir 29PKG_DESTDIR_SUPPORT= destdir
30INSTALLATION_DIRS= ${EGDIR} share/moodle 30INSTALLATION_DIRS= ${EGDIR} share/moodle
31 31
32.include "../../mk/bsd.prefs.mk" 32.include "../../mk/bsd.prefs.mk"
33.include "options.mk" 33.include "options.mk"
34 34
35PKG_INSTALLATION_TYPES= overwrite pkgviews 35PKG_INSTALLATION_TYPES= overwrite pkgviews
36 36
37PKG_GROUPS_VARS= APACHE_GROUP 37PKG_GROUPS_VARS= APACHE_GROUP
38PKG_USERS_VARS= APACHE_USER 38PKG_USERS_VARS= APACHE_USER
39BUILD_DEFS+= APACHE_USER APACHE_GROUP 39BUILD_DEFS+= APACHE_USER APACHE_GROUP
40 40
41PKG_SYSCONFSUBDIR= httpd 41PKG_SYSCONFSUBDIR= httpd
42MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 42MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
43 43
44CONF_FILES= ${PREFIX}/${EGDIR}/moodle.conf \ 44CONF_FILES= ${PREFIX}/${EGDIR}/moodle.conf \
45 ${PKG_SYSCONFDIR}/moodle.conf 45 ${PKG_SYSCONFDIR}/moodle.conf
46OWN_DIRS_PERMS+= ${MOODLEDATADIR} ${APACHE_USER} ${APACHE_GROUP} 0750 46OWN_DIRS_PERMS+= ${MOODLEDATADIR} ${APACHE_USER} ${APACHE_GROUP} 0750
47 47
48USE_TOOLS+= pax 48USE_TOOLS+= pax
49NO_CONFIGURE= yes 49NO_CONFIGURE= yes
50NO_BUILD= yes 50NO_BUILD= yes
51 51
52PLIST_SRC+= ${PKGDIR}/PLIST ${WRKDIR}/PLIST.AUTO 52PLIST_SRC+= ${PKGDIR}/PLIST ${WRKDIR}/PLIST.AUTO
53 53
54.include "../../mk/apache.mk" 54.include "../../mk/apache.mk"
55 55
56SUBST_CLASSES+= conf 56SUBST_CLASSES+= conf
57SUBST_MESSAGE.conf= Fixing pathnames in configuration file. 57SUBST_MESSAGE.conf= Fixing pathnames in configuration file.
58SUBST_STAGE.conf= post-patch 58SUBST_STAGE.conf= post-patch
59SUBST_FILES.conf= ../moodle.conf 59SUBST_FILES.conf= ../moodle.conf
60SUBST_SED.conf= -e "s,@MOODLEDIR@,${MOODLEDIR},g" 60SUBST_SED.conf= -e "s,@MOODLEDIR@,${MOODLEDIR},g"
61SUBST_SED.conf+= -e "s,@MOODLEDATADIR@,${MOODLEDATADIR},g" 61SUBST_SED.conf+= -e "s,@MOODLEDATADIR@,${MOODLEDATADIR},g"
62.if ${PKG_APACHE} == "apache24" 62.if ${PKG_APACHE} == "apache24"
63SUBST_SED.conf+= -e "/Order allow,deny/d" 63SUBST_SED.conf+= -e "/Order allow,deny/d"
64SUBST_SED.conf+= -e "s,Allow from all,Require all granted,g" 64SUBST_SED.conf+= -e "s,Allow from all,Require all granted,g"
65.endif 65.endif
66 66
67SUBST_CLASSES+= php 67SUBST_CLASSES+= php
68SUBST_MESSAGE.php= Fixing the path of php. 68SUBST_MESSAGE.php= Fixing the path of php.
69SUBST_STAGE.php= post-patch 69SUBST_STAGE.php= post-patch
70SUBST_FILES.php= admin/cli/mysql_engine.php admin/cli/maintenance.php admin/cli/cron.php 70SUBST_FILES.php= admin/cli/mysql_engine.php admin/cli/maintenance.php admin/cli/cron.php
71SUBST_FILES.php+= admin/cli/reset_password.php admin/cli/automated_backups.php 71SUBST_FILES.php+= admin/cli/reset_password.php admin/cli/automated_backups.php
72SUBST_FILES.php+= admin/cli/install.php admin/cli/install_database.php admin/cli/upgrade.php 72SUBST_FILES.php+= admin/cli/install.php admin/cli/install_database.php admin/cli/upgrade.php
73SUBST_FILES.php+= admin/mailout-debugger.php admin/process_email.php 73SUBST_FILES.php+= admin/mailout-debugger.php admin/process_email.php
74SUBST_FILES.php+= auth/ldap/cli/sync_users.php auth/cas/cli/sync_users.php auth/db/cli/sync_users.php 74SUBST_FILES.php+= auth/ldap/cli/sync_users.php auth/cas/cli/sync_users.php auth/db/cli/sync_users.php
75SUBST_FILES.php+= enrol/ldap/cli/sync.php enrol/database/cli/sync.php enrol/category/cli/sync.php 75SUBST_FILES.php+= enrol/ldap/cli/sync.php enrol/database/cli/sync.php enrol/category/cli/sync.php
76SUBST_SED.php= -e "s,/usr/bin/php,${PREFIX}/bin/php,g" 76SUBST_SED.php= -e "s,/usr/bin/php,${PREFIX}/bin/php,g"
77 77
78SUBST_CLASSES+= perl 78SUBST_CLASSES+= perl
79SUBST_MESSAGE.perl= Fixing the path of perl. 79SUBST_MESSAGE.perl= Fixing the path of perl.
80SUBST_STAGE.perl= post-patch 80SUBST_STAGE.perl= post-patch
81SUBST_FILES.perl= filter/algebra/algebra2tex.pl 81SUBST_FILES.perl= filter/algebra/algebra2tex.pl
82SUBST_SED.perl= -e "s,/usr/bin/perl,${PREFIX}/bin/perl,g" 82SUBST_SED.perl= -e "s,/usr/bin/perl,${PREFIX}/bin/perl,g"
83 83
84WRKSRC= ${WRKDIR}/moodle 84WRKSRC= ${WRKDIR}/moodle
85 85
86post-extract: 86post-extract:
87 ${CP} ${FILESDIR}/moodle.conf ${WRKDIR}/moodle.conf 87 ${CP} ${FILESDIR}/moodle.conf ${WRKDIR}/moodle.conf
88 88
89do-install: 89do-install:
90 cd ${WRKDIR} && ${FIND} moodle -type f -print \ 90 cd ${WRKDIR} && ${FIND} moodle -type f -print \
91 | ${SED} -e 's,^,share/,' > ${WRKDIR}/PLIST.AUTO 91 | ${SED} -e 's,^,share/,' > ${WRKDIR}/PLIST.AUTO
92 cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${MOODLEDIR}/ 92 cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${MOODLEDIR}/
93 ${INSTALL_DATA} ${WRKDIR}/moodle.conf \ 93 ${INSTALL_DATA} ${WRKDIR}/moodle.conf \
94 ${DESTDIR}${PREFIX}/${EGDIR}/moodle.conf 94 ${DESTDIR}${PREFIX}/${EGDIR}/moodle.conf
95 95
96post-install: 96post-install:
97 ${INSTALL_DATA_DIR} ${DESTDIR}${MOODLEDATADIR} 97 ${INSTALL_DATA_DIR} ${DESTDIR}${MOODLEDATADIR}
98 ${CHOWN} ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MOODLEDATADIR} 98 ${CHOWN} ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MOODLEDATADIR}
99 99
100.include "../../lang/php/phpversion.mk" 100.include "../../lang/php/phpversion.mk"
101.include "../../mk/bsd.pkg.mk" 101.include "../../mk/bsd.pkg.mk"
cvs diff -r1.21 -r1.22 pkgsrc/www/moodle/distinfo (switch to unified diff)

--- pkgsrc/www/moodle/distinfo 2014/07/18 13:34:17 1.21
+++ pkgsrc/www/moodle/distinfo 2014/09/23 07:06:10 1.22
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.21 2014/07/18 13:34:17 wen Exp $ 1$NetBSD: distinfo,v 1.22 2014/09/23 07:06:10 wen Exp $
2 2
3SHA1 (moodle-2.7.1.tgz) = b0474b2cac4d05897b181f1db7d921586a771903 3SHA1 (moodle-2.7.2.tgz) = 396d985a12d6b34bc25028ecd34e5e1ab6fc2faf
4RMD160 (moodle-2.7.1.tgz) = deed447a568a71a5b137ee97356900f8a3707eb9 4RMD160 (moodle-2.7.2.tgz) = 96decaf48c3659c49a3db4f30e895b4d944ad9e2
5Size (moodle-2.7.1.tgz) = 34818166 bytes 5Size (moodle-2.7.2.tgz) = 34850996 bytes