CVS commit: pkgsrc/www/moodle

["Jean-Yves Migeon" <jym%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jym
Date:           Wed Mar  6 23:09:32 UTC 2024

Modified Files:
        pkgsrc/www/moodle: MESSAGE Makefile options.mk
        pkgsrc/www/moodle/files: moodle.conf

Log Message:
- Disable support for versions of PHP below 8.x, per Moodle documentation;
- Set 'max_input_vars' to 5000 as required by Moodle since 4.2, and
  reference it within MESSAGE;

ok wen@


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/www/moodle/MESSAGE
cvs rdiff -u -r1.100 -r1.101 pkgsrc/www/moodle/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/moodle/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/moodle/files/moodle.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/moodle/MESSAGE
diff -u pkgsrc/www/moodle/MESSAGE:1.1.1.1 pkgsrc/www/moodle/MESSAGE:1.2
--- pkgsrc/www/moodle/MESSAGE:1.1.1.1   Fri Jun  4 09:20:00 2010
+++ pkgsrc/www/moodle/MESSAGE   Wed Mar  6 23:09:32 2024
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2010/06/04 09:20:00 wiz Exp $
+$NetBSD: MESSAGE,v 1.2 2024/03/06 23:09:32 jym Exp $
 
 Add the following line to httpd.conf to make Moodle accessible
 through your HTTP server:
@@ -15,6 +15,22 @@ its tables in (or choose an existing dat
 
 For more information, see the INSTALL DOCUMENTATION:
 
-   http://docs.moodle.org/en/Installing_Moodle
+       https://docs.moodle.org/en/Installing_Moodle
+
+# NOTE: `max_input_vars' requirement
+
+Starting with PHP 8.0, Moodle requires a minimal value of 5000 for the
+`max_input_vars' environment variable. This can be directly set within
+the php.ini file, usually found under:
+
+       ${PKG_SYSCONFBASE}/php.ini
+
+Or overriden through the Apache configuration file; see example in:
+
+       ${PKG_SYSCONFDIR}/moodle.conf
+
+More details are available via the Moodle documentation:
+
+       https://docs.moodle.org/403/en/Environment_-_max_input_vars
 
 ===========================================================================

Index: pkgsrc/www/moodle/Makefile
diff -u pkgsrc/www/moodle/Makefile:1.100 pkgsrc/www/moodle/Makefile:1.101
--- pkgsrc/www/moodle/Makefile:1.100    Mon Mar  4 00:38:28 2024
+++ pkgsrc/www/moodle/Makefile  Wed Mar  6 23:09:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2024/03/04 00:38:28 wen Exp $
+# $NetBSD: Makefile,v 1.101 2024/03/06 23:09:32 jym Exp $
 
 DISTNAME=      moodle-4.3.3
 CATEGORIES=    www
@@ -7,7 +7,7 @@ MASTER_SITES=   https://sourceforge.net/pr
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    wen%NetBSD.org@localhost
-HOMEPAGE=      http://www.moodle.org/
+HOMEPAGE=      https://moodle.org/
 COMMENT=       Course management system based on social constructionism
 LICENSE=       gnu-gpl-v3
 
@@ -31,21 +31,21 @@ INSTALLATION_DIRS=  ${EGDIR} share/moodle
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-PHP_VERSIONS_ACCEPTED=         80 81
+PHP_VERSIONS_INCOMPATIBLE=     56 74
 
 PKG_GROUPS_VARS=       APACHE_GROUP
 PKG_USERS_VARS=                APACHE_USER
-BUILD_DEFS+=           APACHE_USER APACHE_GROUP
+BUILD_DEFS+=           APACHE_USER APACHE_GROUP PKG_SYSCONFBASE
 
 PKG_SYSCONFSUBDIR=     httpd
-MESSAGE_SUBST+=                PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+MESSAGE_SUBST+=                PKG_SYSCONFBASE=${PKG_SYSCONFBASE:Q}
+MESSAGE_SUBST+=                PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 
 CONF_FILES=            ${PREFIX}/${EGDIR}/moodle.conf \
                        ${PKG_SYSCONFDIR}/moodle.conf
 OWN_DIRS_PERMS+=       ${MOODLEDATADIR} ${APACHE_USER} ${APACHE_GROUP} 0750
 
 USE_TOOLS+=            pax
-#NO_CONFIGURE=         yes
 NO_BUILD=              yes
 
 PLIST_SRC+=            ${PKGDIR}/PLIST ${WRKDIR}/PLIST.AUTO

Index: pkgsrc/www/moodle/options.mk
diff -u pkgsrc/www/moodle/options.mk:1.6 pkgsrc/www/moodle/options.mk:1.7
--- pkgsrc/www/moodle/options.mk:1.6    Sat Nov 25 13:27:10 2017
+++ pkgsrc/www/moodle/options.mk        Wed Mar  6 23:09:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2017/11/25 13:27:10 wen Exp $
+# $NetBSD: options.mk,v 1.7 2024/03/06 23:09:32 jym Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.moodle
 
@@ -12,7 +12,7 @@ PKG_SUGGESTED_OPTIONS=                mysql
 ### Use mysql or postgresql backend
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=7.0.0:../../databases/php-mysqli
+DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=8.0:../../databases/php-mysqli
 .elif !empty(PKG_OPTIONS:Mpgsql)
-DEPENDS+=      ${PHP_PKG_PREFIX}-pgsql>=7.0.0:../../databases/php-pgsql
+DEPENDS+=      ${PHP_PKG_PREFIX}-pgsql>=8.0:../../databases/php-pgsql
 .endif

Index: pkgsrc/www/moodle/files/moodle.conf
diff -u pkgsrc/www/moodle/files/moodle.conf:1.2 pkgsrc/www/moodle/files/moodle.conf:1.3
--- pkgsrc/www/moodle/files/moodle.conf:1.2     Tue Jun 15 08:16:12 2010
+++ pkgsrc/www/moodle/files/moodle.conf Wed Mar  6 23:09:32 2024
@@ -5,6 +5,10 @@
 </IfModule>
 
 <Directory "@MOODLEDIR@">
+    <IfModule mod_php.c>
+        # Moodle requires a value of 5000 for `max_input_vars'
+        php_value max_input_vars 5000
+    </IfModule>
     Options Indexes
     DirectoryIndex index.php index.html
     AllowOverride None