Upgrade GLPI to 9.4.1.1

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

De-support apache 2.2 config in httpd-glpi.conf sample
Re-work the way we hook in pkgsrc specific etc and var paths
This commit is contained in:
hauke 2019-03-15 16:32:13 +00:00
parent 34e7247ac3
commit 3d9f392295
8 changed files with 1045 additions and 540 deletions

View file

@ -1,11 +1,11 @@
===========================================================================
$NetBSD: MESSAGE,v 1.4 2017/07/21 10:11:27 hauke Exp $
$NetBSD: MESSAGE,v 1.5 2019/03/15 16:32:13 hauke Exp $
GLPI requires a web server set up to run PHP scripts;
${PREFIX}/share/examples/glpi/http-glpi.conf is a sample
configuration for Apache.
In addition, you need access to a MySQL server. Create a MySQL gpli user,
In addition, you need access to a MySQL server. Create a MySQL glpi user,
and as that user create a database:
# mysql -u root -p

View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.5 2018/04/27 14:19:29 hauke Exp $
# $NetBSD: Makefile,v 1.6 2019/03/15 16:32:13 hauke Exp $
DISTNAME= glpi-${GLPI_VERSION}
GLPI_VERSION= 9.2.3
GLPI_VERSION= 9.4.1.1
CATEGORIES= www
MASTER_SITES= https://github.com/glpi-project/glpi/releases/download/${GLPI_VERSION}/
@ -17,6 +17,7 @@ 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
@ -45,7 +46,7 @@ PKG_SYSCONFDIR_PERMS= ${APACHE_USER} ${APACHE_GROUP} 0700
EGDIR= share/examples/glpi
GLPI_DIR= share/glpi
.for ddd in config_path.php
.for ddd in local_define.php
CONF_FILES+= ${EGDIR}/${ddd} ${PKG_SYSCONFDIR}/${ddd}
.endfor
@ -62,7 +63,8 @@ SUBST_CLASSES+= path
SUBST_STAGE.path= post-configure
SUBST_MESSAGE.path= Fixing paths.
SUBST_VARS.path= PREFIX VARBASE PKG_SYSCONFDIR APACHE_USER
SUBST_FILES.path= config/config_path.php
SUBST_FILES.path= config/local_define.php
SUBST_FILES.path+= inc/downstream.php
SUBST_FILES.path+= config/crontab.sample
SUBST_FILES.path+= config/httpd-glpi.conf
@ -70,6 +72,7 @@ REPLACE_INTERPRETER+= php
REPLACE.php.old= .*php
REPLACE.php.new= ${PREFIX}/bin/php
REPLACE_FILES.php= vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php
REPLACE_FILES.php+= bin/console
.for ddd in bench.php fetch_windows_zones.php generate_vcards \
generateicalendardata.php vobject
REPLACE_FILES.php+= vendor/sabre/vobject/bin/${ddd}
@ -86,10 +89,11 @@ DEPENDS+= ${PHP_PKG_PREFIX}-apcu_bc>=1.0:../../www/php-apcu_bc
.endif
post-extract:
for ddd in config_path.php crontab.sample httpd-glpi.conf ; do \
for ddd in local_define.php crontab.sample httpd-glpi.conf ; do \
${CP} ${FILESDIR}/$${ddd} ${WRKSRC}/config ; \
done
for ddd in ajax front lib locales pics vendor ; do \
${CP} ${FILESDIR}/downstream.php ${WRKSRC}/inc
for ddd in ajax css front inc lib locales pics vendor ; do \
find ${WRKSRC}/$${ddd} -type f -exec ${CHMOD} ugo-x \{\} \; ; \
done
cd ${WRKSRC}/install && ${MV} install.php install.php.disabled

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.4 2018/04/27 14:19:29 hauke Exp $
$NetBSD: distinfo,v 1.5 2019/03/15 16:32:13 hauke Exp $
SHA1 (glpi-9.2.3.tgz) = 5e4264b7498b2d7593986d8a60f021e91f4763d8
RMD160 (glpi-9.2.3.tgz) = 2720e4ccdcb0d7914a0ec9c6459480e2eb2afe12
SHA512 (glpi-9.2.3.tgz) = 8028f4500875e598b548dbbec726217226666b7553b1f681b14349b6ce75f90f432eec1184639aeee69e3b31fa7233e750b97bca768ae1ddc77dd9a97c1b6b65
Size (glpi-9.2.3.tgz) = 31755947 bytes
SHA1 (glpi-9.4.1.1.tgz) = 6b37adf1336c7590e822238a54b9e4b4134457a7
RMD160 (glpi-9.4.1.1.tgz) = 7da2b40a7d24d5a2c049361c9a656c70a181cc93
SHA512 (glpi-9.4.1.1.tgz) = 528f0e2d65d2f134583f1c544da74b94c631ba783666718e5bc643041a461668a62a1c8ef56ea1c6b458d14cccb3af3900c68f58f9fca640ddce9265488f9687
Size (glpi-9.4.1.1.tgz) = 34795273 bytes

View file

@ -1,37 +0,0 @@
<?php
// $NetBSD: config_path.php,v 1.2 2017/11/17 11:07:39 hauke Exp $
//
// pkgsrc GLPI path setup file, see
// <http://glpi-developer-documentation.readthedocs.io/en/master/packaging.html>
// Configuration
define('GLPI_CONFIG_DIR', '@PKG_SYSCONFDIR@');
// Runtime Data
define('GLPI_DOC_DIR', '@VARBASE@/glpi');
define('GLPI_CACHE_DIR', GLPI_DOC_DIR . '/_cache');
define('GLPI_CRON_DIR', GLPI_DOC_DIR . '/_cron');
define('GLPI_DUMP_DIR', GLPI_DOC_DIR . '/_dumps');
define('GLPI_GRAPH_DIR', GLPI_DOC_DIR . '/_graphs');
define('GLPI_LOCK_DIR', GLPI_DOC_DIR . '/_lock');
define('GLPI_PICTURE_DIR', GLPI_DOC_DIR . '/_pictures');
define('GLPI_PLUGIN_DOC_DIR', GLPI_DOC_DIR . '/_plugins');
define('GLPI_RSS_DIR', GLPI_DOC_DIR . '/_rss');
define('GLPI_SESSION_DIR', GLPI_DOC_DIR . '/_sessions');
define('GLPI_TMP_DIR', GLPI_DOC_DIR . '/_tmp');
define('GLPI_UPLOAD_DIR', GLPI_DOC_DIR . '/_uploads');
// Log file
define('GLPI_LOG_DIR', '@VARBASE@/log/glpi');
// System libraries
// htmlawed not in pkgsrc - built-in, anyway?
//define('GLPI_HTMLAWED', '@PREFIX@/share/php/htmLawed/htmLawed.php');
// Fonts
// fonts/freefont-ttf
define('GLPI_FONT_FREESANS', '@PREFIX@/share/fonts/X11/TTF/FreeSans.ttf');
// Use system cron
define('GLPI_SYSTEM_CRON', true);

View file

@ -0,0 +1,13 @@
<?php
// $NetBSD: downstream.php,v 1.1 2019/03/15 16:32:13 hauke Exp $
//
// pkgsrc GLPI path setup file, see
// <http://glpi-developer-documentation.readthedocs.io/en/master/packaging.html>
// Configuration
define('GLPI_CONFIG_DIR', '@PKG_SYSCONFDIR@');
if (file_exists(GLPI_CONFIG_DIR . '/local_define.php')) {
require_once GLPI_CONFIG_DIR . '/local_define.php';
}

View file

@ -1,6 +1,6 @@
# $NetBSD: httpd-glpi.conf,v 1.1 2017/07/18 14:29:51 hauke Exp $
# $NetBSD: httpd-glpi.conf,v 1.2 2019/03/15 16:32:13 hauke Exp $
#
# Sample Apache 2.x GLPI configuration
# Sample Apache 2.4 GLPI configuration
# To access via http://servername/glpi/
Alias /glpi @PREFIX@/share/glpi
@ -19,15 +19,7 @@ Alias /glpi @PREFIX@/share/glpi
# which could be less than recommanded value
php_value memory_limit 64M
<IfModule mod_authz_core.c>
# Apache 2.4
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order Deny,Allow
Allow from All
</IfModule>
Require all granted
</Directory>
<Directory @PREFIX@/share/glpi/install>
@ -36,63 +28,23 @@ Alias /glpi @PREFIX@/share/glpi
php_value memory_limit 128M
# Block access after GLPI setup or update
<IfModule mod_authz_core.c>
# Apache 2.4
#Require all denied
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
#Order Deny,Allow
#Deny from All
</IfModule>
#Require all denied
</Directory>
# This sections remplaces the .htaccess files provided in the tarball
# This sections replaces the .htaccess files provided in the tarball
<Directory @PREFIX@/share/glpi/config>
<IfModule mod_authz_core.c>
# Apache 2.4
Require all denied
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order Deny,Allow
Deny from All
</IfModule>
Require all denied
</Directory>
<Directory @PREFIX@/share/glpi/locales>
<IfModule mod_authz_core.c>
# Apache 2.4
Require all denied
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order Deny,Allow
Deny from All
</IfModule>
Require all denied
</Directory>
<Directory @PREFIX@/share/glpi/install/mysql>
<IfModule mod_authz_core.c>
# Apache 2.4
Require all denied
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order Deny,Allow
Deny from All
</IfModule>
Require all denied
</Directory>
<Directory @PREFIX@/share/glpi/scripts>
<IfModule mod_authz_core.c>
# Apache 2.4
Require all denied
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order Deny,Allow
Deny from All
</IfModule>
Require all denied
</Directory>

View file

@ -0,0 +1,26 @@
<?php
// $NetBSD: local_define.php,v 1.1 2019/03/15 16:32:13 hauke Exp $
//
// pkgsrc GLPI setup file, see
// <http://glpi-developer-documentation.readthedocs.io/en/master/packaging.html>
// Configuration
define('GLPI_CONFIG_DIR', '@PKG_SYSCONFDIR@');
// Runtime Data
define('GLPI_VAR_DIR', '@VARBASE@/glpi');
// Log file
define('GLPI_LOG_DIR', '@VARBASE@/log/glpi');
// System libraries
// htmlawed not in pkgsrc - built-in, anyway?
//define('GLPI_HTMLAWED', '@PREFIX@/share/php/htmLawed/htmLawed.php');
// Fonts
// fonts/freefont-ttf
define('GLPI_FONT_FREESANS', '@PREFIX@/share/fonts/X11/TTF/FreeSans.ttf');
// Use system cron
define('GLPI_SYSTEM_CRON', true);