Received: by mail.netbsd.org (Postfix, from userid 605) id B523E84D88; Sat, 6 Jul 2019 19:06:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3EE2284D61 for ; Sat, 6 Jul 2019 19:06:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id j_TOYAyBxRC1 for ; Sat, 6 Jul 2019 19:06:19 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7BEF684CEF for ; Sat, 6 Jul 2019 19:06:19 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 74494FBF4; Sat, 6 Jul 2019 19:06:19 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_156243997982820" MIME-Version: 1.0 Date: Sat, 6 Jul 2019 19:06:19 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2019Q2] pkgsrc/www/php-glpi To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20190706190619.74494FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_156243997982820 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Sat Jul 6 19:06:19 UTC 2019 Modified Files: pkgsrc/www/php-glpi [pkgsrc-2019Q2]: MESSAGE Makefile PLIST distinfo Log Message: Pullup ticket #5988 - requested by hauke www/php-glpi: security fix Revisions pulled up: - www/php-glpi/MESSAGE 1.6 - www/php-glpi/Makefile 1.8 - www/php-glpi/PLIST 1.6 - www/php-glpi/distinfo 1.7 --- Module Name: pkgsrc Committed By: hauke Date: Tue Jul 2 12:23:42 UTC 2019 Modified Files: pkgsrc/www/php-glpi: MESSAGE Makefile PLIST distinfo Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.4.1 pkgsrc/www/php-glpi/MESSAGE cvs rdiff -u -r1.7 -r1.7.2.1 pkgsrc/www/php-glpi/Makefile cvs rdiff -u -r1.5 -r1.5.2.1 pkgsrc/www/php-glpi/PLIST cvs rdiff -u -r1.6 -r1.6.2.1 pkgsrc/www/php-glpi/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_156243997982820 Content-Disposition: inline Content-Length: 3555 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/php-glpi/MESSAGE diff -u pkgsrc/www/php-glpi/MESSAGE:1.5 pkgsrc/www/php-glpi/MESSAGE:1.5.4.1 --- pkgsrc/www/php-glpi/MESSAGE:1.5 Fri Mar 15 16:32:13 2019 +++ pkgsrc/www/php-glpi/MESSAGE Sat Jul 6 19:06:19 2019 @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.5 2019/03/15 16:32:13 hauke Exp $ +$NetBSD: MESSAGE,v 1.5.4.1 2019/07/06 19:06:19 bsiegert 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' + =========================================================================== Index: pkgsrc/www/php-glpi/Makefile diff -u pkgsrc/www/php-glpi/Makefile:1.7 pkgsrc/www/php-glpi/Makefile:1.7.2.1 --- pkgsrc/www/php-glpi/Makefile:1.7 Fri Apr 12 13:23:57 2019 +++ pkgsrc/www/php-glpi/Makefile Sat Jul 6 19:06:19 2019 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2019/04/12 13:23:57 hauke Exp $ +# $NetBSD: Makefile,v 1.7.2.1 2019/07/06 19:06:19 bsiegert 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 Index: pkgsrc/www/php-glpi/PLIST diff -u pkgsrc/www/php-glpi/PLIST:1.5 pkgsrc/www/php-glpi/PLIST:1.5.2.1 --- pkgsrc/www/php-glpi/PLIST:1.5 Fri Apr 12 13:23:57 2019 +++ pkgsrc/www/php-glpi/PLIST Sat Jul 6 19:06:19 2019 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2019/04/12 13:23:57 hauke Exp $ +@comment $NetBSD: PLIST,v 1.5.2.1 2019/07/06 19:06:19 bsiegert 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 Index: pkgsrc/www/php-glpi/distinfo diff -u pkgsrc/www/php-glpi/distinfo:1.6 pkgsrc/www/php-glpi/distinfo:1.6.2.1 --- pkgsrc/www/php-glpi/distinfo:1.6 Fri Apr 12 13:23:57 2019 +++ pkgsrc/www/php-glpi/distinfo Sat Jul 6 19:06:19 2019 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2019/04/12 13:23:57 hauke Exp $ +$NetBSD: distinfo,v 1.6.2.1 2019/07/06 19:06:19 bsiegert 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 --_----------=_156243997982820--