[pkgsrc/trunk]: pkgsrc/www/php-glpi Upgrade www/php-glpi from 9.4.6 to 10.0.2

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bcf96cfe903f
branches:  trunk
changeset: 383258:bcf96cfe903f
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Tue Aug 16 13:52:48 2022 +0000

description:
Upgrade www/php-glpi from 9.4.6 to 10.0.2

This is a major update, providing fixes to multiple security
vulnerabilities, compatibility with current PHP and MySQL/Mariadb
versions. An extensive changelog is at
<https://github.com/glpi-project/glpi/blob/10.0/bugfixes/CHANGELOG.md>.

diffstat:

 www/php-glpi/MESSAGE  |     5 +-
 www/php-glpi/Makefile |    56 +-
 www/php-glpi/PLIST    |  7240 ++++++++++++++++++++++++++++++++++--------------
 www/php-glpi/distinfo |     8 +-
 4 files changed, 5123 insertions(+), 2186 deletions(-)

diffs (truncated from 8171 to 300 lines):

diff -r 90349cf78574 -r bcf96cfe903f www/php-glpi/MESSAGE
--- a/www/php-glpi/MESSAGE      Tue Aug 16 13:02:56 2022 +0000
+++ b/www/php-glpi/MESSAGE      Tue Aug 16 13:52:48 2022 +0000
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.7 2020/05/19 14:39:56 hauke Exp $
+$NetBSD: MESSAGE,v 1.8 2022/08/16 13:52:48 hauke Exp $
 
 GLPI requires a web server set up to run PHP scripts;
 ${PREFIX}/share/examples/glpi/http-glpi.conf is a sample
@@ -32,6 +32,7 @@
 
 Alternatively, you can upgrade from the commandline, by running
 
-su -m ${APACHE_USER} -c '${PREFIX}/share/glpi/bin/console --config-dir=${PKG_SYSCONFDIR} db:update'
+su -m ${APACHE_USER} -c '${PREFIX}/share/glpi/bin/console \
+       --config-dir=${PKG_SYSCONFDIR} db:update'
 
 ===========================================================================
diff -r 90349cf78574 -r bcf96cfe903f www/php-glpi/Makefile
--- a/www/php-glpi/Makefile     Tue Aug 16 13:02:56 2022 +0000
+++ b/www/php-glpi/Makefile     Tue Aug 16 13:52:48 2022 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2021/12/29 06:05:19 taca Exp $
+# $NetBSD: Makefile,v 1.17 2022/08/16 13:52:48 hauke Exp $
 
 DISTNAME=      glpi-${GLPI_VERSION}
-GLPI_VERSION=  9.4.6
-PKGREVISION=   1
+GLPI_VERSION=  10.0.2
 CATEGORIES=    www
 
-MASTER_SITES=  https://github.com/glpi-project/glpi/releases/download/${GLPI_VERSION}/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=glpi-project/}glpi/releases/download/${GLPI_VERSION}/
+#MASTER_SITES= https://github.com/glpi-project/glpi/releases/download/${GLPI_VERSION}/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    hauke%NetBSD.org@localhost
@@ -13,19 +13,29 @@
 COMMENT=       IT inventory management software
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=5.4:../../archivers/php-zlib
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=5.4:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=5.4:../../databases/php-ldap
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=5.4:../../databases/php-mysqli
-DEPENDS+=      ${PHP_PKG_PREFIX}-opcache>=5.4:../../devel/php-opcache
-DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=5.4:../../graphics/php-exif
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.4:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-imap>=5.4:../../mail/php-imap
-DEPENDS+=      ${PHP_PKG_PREFIX}-xmlrpc>=5.4:../../net/php-xmlrpc
-DEPENDS+=      ${PHP_PKG_PREFIX}-json>=5.4:../../textproc/php-json
-DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=5.4:../../www/php-curl
+DEPENDS+=      ${PHP_PKG_PREFIX}-bz2>=7.4:../../archivers/php-bz2
+DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=7.4:../../www/php-curl
+DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=7.4:../../graphics/php-exif
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=7.4:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=7.4:../../converters/php-iconv
+DEPENDS+=      ${PHP_PKG_PREFIX}-imap>=7.4:../../mail/php-imap
+DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=7.4:../../textproc/php-intl
+DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=7.4:../../databases/php-ldap
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=7.4:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=7.4:../../databases/php-mysqli
+DEPENDS+=      ${PHP_PKG_PREFIX}-opcache>=7.4:../../devel/php-opcache
+DEPENDS+=      ${PHP_PKG_PREFIX}-sodium>=7.4:../../security/php-sodium
+DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=7.4:../../archivers/php-zip
+DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=7.4:../../archivers/php-zlib
+
 DEPENDS+=      freefont-ttf-[0-9]*:../../fonts/freefont-ttf
 
+.include "../../lang/php/phpversion.mk"
+
+.if ${PKG_PHP_VERSION} == 74
+DEPENDS+=      ${PHP_PKG_PREFIX}-json>=7.4:../../textproc/php-json
+.endif
+
 NO_BUILD=      yes
 USE_LANGUAGES= # none
 
@@ -35,8 +45,6 @@
 
 MESSAGE_SUBST+=        APACHE_USER="${APACHE_USER}"
 
-PHP_VERSIONS_ACCEPTED= 56 74
-
 .include "../../mk/bsd.prefs.mk"
 
 WRKSRC=                ${WRKDIR}/glpi
@@ -81,15 +89,10 @@
 REPLACE_FILES.php+=    vendor/sabre/vobject/bin/${ddd}
 .endfor
 
-INSTALLATION_DIRS+=    ${GLPI_DIR} ${EGDIR}
-
-.include "../../lang/php/phpversion.mk"
+OWN_DIRS_PERMS+=       ${GLPI_DIR}/marketplace ${APACHE_USER} \
+                               ${APACHE_GROUP} 0750
 
-.if ${PKG_PHP_VERSION} == 56
-DEPENDS+=      ${PHP_PKG_PREFIX}-apcu>=4.0:../../www/php-apcu4
-.else
-DEPENDS+=      ${PHP_PKG_PREFIX}-apcu_bc>=1.0:../../www/php-apcu_bc
-.endif
+INSTALLATION_DIRS+=    ${EGDIR} ${GLPI_DIR} ${GLPI_DIR}/marketplace
 
 post-extract:
        for ddd in local_define.php crontab.sample httpd-glpi.conf ; do \
@@ -100,11 +103,10 @@
                find ${WRKSRC}/$${ddd} -type f -exec ${CHMOD} ugo-x \{\} \; ; \
        done
        cd ${WRKSRC}/install && ${MV} install.php install.php.disabled
-       ${CHMOD} ugo-x ${WRKSRC}/scripts/.htaccess
 
 do-install:
        cd ${WRKSRC}/config && ${PAX} -rw * ${DESTDIR}${PREFIX}/${EGDIR}
-       cd ${WRKSRC}/files && cp .htaccess \
+       ${INSTALL_DATA} ${WRKSRC}/files/.htaccess \
                ${DESTDIR}${PREFIX}/${EGDIR}/var_glpi.htaccess
        # Sub-tree will be re-created in VARBASE/glpi
        cd ${WRKSRC} && rm -r files
diff -r 90349cf78574 -r bcf96cfe903f www/php-glpi/PLIST
--- a/www/php-glpi/PLIST        Tue Aug 16 13:02:56 2022 +0000
+++ b/www/php-glpi/PLIST        Tue Aug 16 13:52:48 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2020/05/19 14:21:13 hauke Exp $
+@comment $NetBSD: PLIST,v 1.9 2022/08/16 13:52:48 hauke Exp $
 share/examples/glpi/crontab.sample
 share/examples/glpi/httpd-glpi.conf
 share/examples/glpi/local_define.php
@@ -6,16 +6,23 @@
 share/glpi/.htaccess
 share/glpi/CHANGELOG.md
 share/glpi/CONTRIBUTING.md
-share/glpi/COPYING.txt
+share/glpi/INSTALL.md
+share/glpi/LICENSE
 share/glpi/README.md
 share/glpi/SECURITY.md
 share/glpi/SUPPORT.md
-share/glpi/ajax/autocompletion.php
+share/glpi/ajax/actorinformation.php
+share/glpi/ajax/actors.php
+share/glpi/ajax/agent.php
+share/glpi/ajax/cable.php
+share/glpi/ajax/central.php
 share/glpi/ajax/comments.php
 share/glpi/ajax/common.tabs.php
 share/glpi/ajax/compareKbRevisions.php
+share/glpi/ajax/dashboard.php
 share/glpi/ajax/dcroom_size.php
 share/glpi/ajax/displayMessageAfterRedirect.php
+share/glpi/ajax/domainrecord_data_form.php
 share/glpi/ajax/dropdownAllItems.php
 share/glpi/ajax/dropdownConnect.php
 share/glpi/ajax/dropdownConnectNetworkPort.php
@@ -43,15 +50,14 @@
 share/glpi/ajax/dropdownUnicityFields.php
 share/glpi/ajax/dropdownValidator.php
 share/glpi/ajax/dropdownValuesBlacklist.php
-share/glpi/ajax/entitytree.php
-share/glpi/ajax/entitytreesearch.php
+share/glpi/ajax/entityCustomCssCode.php
 share/glpi/ajax/entitytreesons.php
 share/glpi/ajax/fileupload.php
 share/glpi/ajax/fuzzysearch.php
 share/glpi/ajax/genericdate.php
+share/glpi/ajax/getAbstractRightDropdownValue.php
 share/glpi/ajax/getDropdownConnect.php
 share/glpi/ajax/getDropdownFindNum.php
-share/glpi/ajax/getDropdownNetpoint.php
 share/glpi/ajax/getDropdownNumber.php
 share/glpi/ajax/getDropdownUsers.php
 share/glpi/ajax/getDropdownValue.php
@@ -60,18 +66,27 @@
 share/glpi/ajax/getKbRevision.php
 share/glpi/ajax/getKnowbaseItemAnswer.php
 share/glpi/ajax/getMapPoint.php
+share/glpi/ajax/getShareDashboardDropdownValue.php
+share/glpi/ajax/getUserPicture.php
 share/glpi/ajax/helpdesk_observer.php
+share/glpi/ajax/impact.php
 share/glpi/ajax/index.php
 share/glpi/ajax/inputtext.php
 share/glpi/ajax/itemTicket.php
 share/glpi/ajax/item_rack.php
+share/glpi/ajax/itilfollowup.php
+share/glpi/ajax/itillayout.php
+share/glpi/ajax/kanban.php
 share/glpi/ajax/kblink.php
 share/glpi/ajax/knowbase.php
 share/glpi/ajax/ldapdaterestriction.php
 share/glpi/ajax/mailcollector.php
 share/glpi/ajax/map.php
+share/glpi/ajax/marketplace.php
 share/glpi/ajax/massiveaction.php
 share/glpi/ajax/notifications_ajax.php
+share/glpi/ajax/pendingreason.php
+share/glpi/ajax/pin_savedsearches.php
 share/glpi/ajax/planning.php
 share/glpi/ajax/planningcheck.php
 share/glpi/ajax/planningend.php
@@ -80,6 +95,9 @@
 share/glpi/ajax/projecttask.php
 share/glpi/ajax/rack.php
 share/glpi/ajax/resaperiod.php
+share/glpi/ajax/reservable_items.php
+share/glpi/ajax/reservations.php
+share/glpi/ajax/rule.php
 share/glpi/ajax/ruleaction.php
 share/glpi/ajax/ruleactionvalue.php
 share/glpi/ajax/rulecriteria.php
@@ -88,10 +106,11 @@
 share/glpi/ajax/search.php
 share/glpi/ajax/searchoptionvalue.php
 share/glpi/ajax/selectUnaffectedOrNewItem_Device.php
+share/glpi/ajax/socket.php
 share/glpi/ajax/solution.php
 share/glpi/ajax/subvisibility.php
 share/glpi/ajax/switchdebug.php
-share/glpi/ajax/switchlang.php
+share/glpi/ajax/switchfoldmenu.php
 share/glpi/ajax/task.php
 share/glpi/ajax/telemetry.php
 share/glpi/ajax/textarea.php
@@ -100,6 +119,7 @@
 share/glpi/ajax/ticketsatisfaction.php
 share/glpi/ajax/timeline.php
 share/glpi/ajax/transfers.php
+share/glpi/ajax/treebrowse.php
 share/glpi/ajax/uemailUpdate.php
 share/glpi/ajax/unlockobject.php
 share/glpi/ajax/updateTrackingDeviceType.php
@@ -110,92 +130,393 @@
 share/glpi/apirest.md
 share/glpi/apirest.php
 share/glpi/apixmlrpc.php
+share/glpi/babel.config.js
 share/glpi/bin/console
+share/glpi/caldav.php
 share/glpi/config/.htaccess
 share/glpi/config/crontab.sample
 share/glpi/config/httpd-glpi.conf
 share/glpi/config/local_define.php
-share/glpi/css/_highcontrast.scss
-share/glpi/css/chartists-glpi.css
-share/glpi/css/chartists-glpi.min.css
-share/glpi/css/jquery-glpi.css
-share/glpi/css/jquery-glpi.min.css
-share/glpi/css/jstree-glpi.css
-share/glpi/css/jstree-glpi.min.css
-share/glpi/css/palettes/_aerialgreen.scss
-share/glpi/css/palettes/_auror.scss
-share/glpi/css/palettes/_automn.scss
-share/glpi/css/palettes/_classic.scss
-share/glpi/css/palettes/_clockworkorange.scss
-share/glpi/css/palettes/_dark.scss
-share/glpi/css/palettes/_flood.scss
-share/glpi/css/palettes/_greenflat.scss
-share/glpi/css/palettes/_hipster.scss
-share/glpi/css/palettes/_icecream.scss
-share/glpi/css/palettes/_lightblue.scss
-share/glpi/css/palettes/_premiumred.scss
-share/glpi/css/palettes/_purplehaze.scss
-share/glpi/css/palettes/_teclib.scss
-share/glpi/css/palettes/_vintage.scss
+share/glpi/css/includes/_base.scss
+share/glpi/css/includes/_fonts.scss
+share/glpi/css/includes/_global-variables.scss
+share/glpi/css/includes/_highcontrast.scss
+share/glpi/css/includes/_includes.scss
+share/glpi/css/includes/_logos.scss
+share/glpi/css/includes/_palette_dark.scss
+share/glpi/css/includes/_palette_light.scss
+share/glpi/css/includes/components/_asset-form.scss
+share/glpi/css/includes/components/_browser_tree.scss
+share/glpi/css/includes/components/_buttons-group.scss
+share/glpi/css/includes/components/_debug-panel.scss
+share/glpi/css/includes/components/_documentation.scss
+share/glpi/css/includes/components/_fileupload.scss
+share/glpi/css/includes/components/_flatpickr.scss
+share/glpi/css/includes/components/_floating-buttons.scss
+share/glpi/css/includes/components/_fullcalendar.scss
+share/glpi/css/includes/components/_fuzzy.scss
+share/glpi/css/includes/components/_global-menu.scss
+share/glpi/css/includes/components/_kanban.scss
+share/glpi/css/includes/components/_mini-tabs.scss
+share/glpi/css/includes/components/_networkport.scss
+share/glpi/css/includes/components/_pictures.scss
+share/glpi/css/includes/components/_racks.scss
+share/glpi/css/includes/components/_richtext.scss
+share/glpi/css/includes/components/_rules.scss
+share/glpi/css/includes/components/_saved-searches.scss
+share/glpi/css/includes/components/_scrollbars.scss
+share/glpi/css/includes/components/_search_input.scss
+share/glpi/css/includes/components/_select2.scss
+share/glpi/css/includes/components/_tabs.scss
+share/glpi/css/includes/components/chartist/_generate.scss
+share/glpi/css/includes/components/chartist/_palette_cb_seq_blue_9.scss
+share/glpi/css/includes/components/chartist/_palette_cb_seq_red_9.scss
+share/glpi/css/includes/components/chartist/_palette_d3_cat_10.scss