Update to GLPI v9.4.3, with security and bug fixes.

- (security) Prevent execution of XSS on rich text,
- (security) Prevent xss attack on user picture,
- Fix performance issues when using entities,
- New "Prevent take into account" action on tickets business rules,
- New "Status" criterion on tickets business rules,
- Change and problem tasks can now be marked as private,

The full changelog is available under
<https://github.com/glpi-project/glpi/milestone/36?closed=1>

4 files changed, 16 insertions, 12 deletions

diff --git a/www/php-glpi/MESSAGE b/www/php-glpi/MESSAGE
index 9d8dd74ee4f..be48620a22d 100644
--- a/www/php-glpi/MESSAGE
+++ b/www/php-glpi/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2019/03/15 16:32:13 hauke Exp $
+$NetBSD: MESSAGE,v 1.6 2019/07/02 12:23:41 hauke Exp $
 
 GLPI requires a web server set up to run PHP scripts;
 ${PREFIX}/share/examples/glpi/http-glpi.conf is a sample
@@ -30,4 +30,8 @@ database.
 
 Rename install.php when you are done.
 
+To update from the commandline, run
+
+su -m ${APACHE_USER} -c '${PREFIX}/share/glpi/bin/console --config-dir=${PKG_SYSCONFDIR} db:update'
+
 ===========================================================================
diff --git a/www/php-glpi/Makefile b/www/php-glpi/Makefile
index 9fda4576bad..48286419236 100644
--- a/www/php-glpi/Makefile
+++ b/www/php-glpi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2019/04/12 13:23:57 hauke Exp $
+# $NetBSD: Makefile,v 1.8 2019/07/02 12:23:41 hauke Exp $
 
 DISTNAME=	glpi-${GLPI_VERSION}
-GLPI_VERSION=	9.4.2
+GLPI_VERSION=	9.4.3
 CATEGORIES=	www
 
 MASTER_SITES=	https://github.com/glpi-project/glpi/releases/download/${GLPI_VERSION}/
@@ -32,10 +32,9 @@ USE_TOOLS+=	chmod find pax
 
 BUILD_DEFS+=    APACHE_USER APACHE_GROUP VARBASE
 
-.include "../../mk/bsd.prefs.mk"
+MESSAGE_SUBST+=	APACHE_USER="${APACHE_USER}"
 
-APACHE_USER?=   www
-APACHE_GROUP?=  www
+.include "../../mk/bsd.prefs.mk"
 
 WRKSRC=		${WRKDIR}/glpi
 
diff --git a/www/php-glpi/PLIST b/www/php-glpi/PLIST
index 1d907befcdd..f18de9f4116 100644
--- a/www/php-glpi/PLIST
+++ b/www/php-glpi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2019/04/12 13:23:57 hauke Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/07/02 12:23:41 hauke Exp $
 share/examples/glpi/crontab.sample
 share/examples/glpi/httpd-glpi.conf
 share/examples/glpi/local_define.php
@@ -1256,6 +1256,7 @@ share/glpi/install/update_931_932.php
 share/glpi/install/update_93_94.php
 share/glpi/install/update_940_941.php
 share/glpi/install/update_941_942.php
+share/glpi/install/update_942_943.php
 share/glpi/install/update_content.php
 share/glpi/install/update_to_031.php
 share/glpi/install/update_xx_xy.tpl.php
diff --git a/www/php-glpi/distinfo b/www/php-glpi/distinfo
index 629eb429571..c7f1a841fef 100644
--- a/www/php-glpi/distinfo
+++ b/www/php-glpi/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2019/04/12 13:23:57 hauke Exp $
+$NetBSD: distinfo,v 1.7 2019/07/02 12:23:41 hauke Exp $
 
-SHA1 (glpi-9.4.2.tgz) = 9e9802689d054f3f310a22a0e8fde70727790b54
-RMD160 (glpi-9.4.2.tgz) = 7fbfe3525a96267ffe0bc622c51fbb17b765ac3b
-SHA512 (glpi-9.4.2.tgz) = 88b3156c55160c3f199cacaffcb9c4fe321c42999506a0c94c8e8006f68ee2d4d812c6ad64b46ccf7371ca5bcd71cb52f98210002b0044ad7668f6a4b4c2fd9d
-Size (glpi-9.4.2.tgz) = 34831683 bytes
+SHA1 (glpi-9.4.3.tgz) = 594121e47057d408393b6fbb101bafa6fb95941e
+RMD160 (glpi-9.4.3.tgz) = 6585bb0ece7b2c6ffb5975666c6e349c4a255eb2
+SHA512 (glpi-9.4.3.tgz) = 235ca245e2178a075face1d530010b94fa5b9c9b15d582879c0beff5994442330d994d68683f867fca3829f1f5a8fd3ba60a94569af5a743f712d6f895c4bfd8
+Size (glpi-9.4.3.tgz) = 34847591 bytes