svn commit: r528639 - in head/net-mgmt/ocsinventory-ocsreports: . files
Mikael Urankar
mikael at FreeBSD.org
Wed Mar 18 10:26:46 UTC 2020
Author: mikael
Date: Wed Mar 18 10:26:44 2020
New Revision: 528639
URL: https://svnweb.freebsd.org/changeset/ports/528639
Log:
net-mgmt/ocsinventory-ocsreports: update to 2.6
PR: 232460
Submitted by: geoffroy Desvernay (maintainer)
Approved by: manu (mentor, implicit)
Modified:
head/net-mgmt/ocsinventory-ocsreports/Makefile
head/net-mgmt/ocsinventory-ocsreports/distinfo
head/net-mgmt/ocsinventory-ocsreports/files/apache.conf.in
head/net-mgmt/ocsinventory-ocsreports/pkg-plist
Modified: head/net-mgmt/ocsinventory-ocsreports/Makefile
==============================================================================
--- head/net-mgmt/ocsinventory-ocsreports/Makefile Wed Mar 18 10:25:33 2020 (r528638)
+++ head/net-mgmt/ocsinventory-ocsreports/Makefile Wed Mar 18 10:26:44 2020 (r528639)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ocsinventory-ocsreports
-PORTVERSION= 2.5
+PORTVERSION= 2.6
CATEGORIES= net-mgmt
MAINTAINER= dgeo at centrale-marseille.fr
@@ -19,7 +19,7 @@ GH_ACCOUNT= OCSInventory-NG
GH_PROJECT= OCSInventory-ocsreports
SUB_FILES= apache.conf pkg-message
-ETCDIR= ${PREFIX}/etc/OCSInventory
+ETCDIR= ${PREFIX}/etc/ocsinventory-server
do-install:
${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR}
@@ -27,5 +27,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/dbconfig.inc.php ${STAGEDIR}${WWWDIR}/dbconfig.inc.php.sample
${INSTALL_DATA} ${WRKSRC}/backend/require/cas.config.php ${STAGEDIR}${WWWDIR}/backend/require/cas.config.php.sample
${INSTALL_DATA} ${WRKDIR}/apache.conf ${STAGEDIR}${ETCDIR}/ocsreports.inc.sample
+ ${MKDIR} ${STAGEDIR}${DATADIR}/packages
+ ${MKDIR} ${STAGEDIR}${DATADIR}/snmp
.include <bsd.port.mk>
Modified: head/net-mgmt/ocsinventory-ocsreports/distinfo
==============================================================================
--- head/net-mgmt/ocsinventory-ocsreports/distinfo Wed Mar 18 10:25:33 2020 (r528638)
+++ head/net-mgmt/ocsinventory-ocsreports/distinfo Wed Mar 18 10:26:44 2020 (r528639)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534580034
-SHA256 (OCSInventory-NG-OCSInventory-ocsreports-2.5_GH0.tar.gz) = 02e75c903ca4f1032e5dc779f8fb7cfbf51b804269ff358cff35176ae47321c0
-SIZE (OCSInventory-NG-OCSInventory-ocsreports-2.5_GH0.tar.gz) = 3222390
+TIMESTAMP = 1583417456
+SHA256 (OCSInventory-NG-OCSInventory-ocsreports-2.6_GH0.tar.gz) = bfd9e6e82e54d12e4b29e6a401b80fc9de95a4c7157fa2cc64c29d09f6c81060
+SIZE (OCSInventory-NG-OCSInventory-ocsreports-2.6_GH0.tar.gz) = 2791940
Modified: head/net-mgmt/ocsinventory-ocsreports/files/apache.conf.in
==============================================================================
--- head/net-mgmt/ocsinventory-ocsreports/files/apache.conf.in Wed Mar 18 10:25:33 2020 (r528638)
+++ head/net-mgmt/ocsinventory-ocsreports/files/apache.conf.in Wed Mar 18 10:26:44 2020 (r528639)
@@ -64,7 +64,7 @@ Alias /ocsreports %%WWWDIR%%
#
# Alias to put Deployment package files outside Apache document root directory
#
-<Directory %%SHAREDIR%%/packages>
+<Directory %%DATADIR%%/packages>
<IfModule mod_authz_core.c>
# Apache 2.4
Require all granted
@@ -74,7 +74,7 @@ Alias /ocsreports %%WWWDIR%%
Allow from all
</IfModule>
</Directory>
-Alias /ocs/packages %%SHAREDIR%%/packages
+Alias /ocs/packages %%DATADIR%%/packages
################################################################################
@@ -82,7 +82,7 @@ Alias /ocs/packages %%SHAREDIR%%/packages
#
# Alias to put Snmp custom Mibs files outside Apache document root directory
#
-<Directory %%SHAREDIR%%/snmp>
+<Directory %%DATADIR%%/snmp>
<IfModule mod_authz_core.c>
# Apache 2.4
Require all granted
@@ -92,5 +92,5 @@ Alias /ocs/packages %%SHAREDIR%%/packages
Allow from all
</IfModule>
</Directory>
-Alias /ocs/snmp %%SHAREDIR%%/snmp
+Alias /ocs/snmp %%DATADIR%%/snmp
Modified: head/net-mgmt/ocsinventory-ocsreports/pkg-plist
==============================================================================
--- head/net-mgmt/ocsinventory-ocsreports/pkg-plist Wed Mar 18 10:25:33 2020 (r528638)
+++ head/net-mgmt/ocsinventory-ocsreports/pkg-plist Wed Mar 18 10:26:44 2020 (r528639)
@@ -42,7 +42,7 @@
%%WWWDIR%%/css/onglets.css
%%WWWDIR%%/css/winclassic.css
@sample %%WWWDIR%%/dbconfig.inc.php.sample
-%%WWWDIR%%/download/README
+%%WWWDIR%%/extensions/Readme.md
%%WWWDIR%%/favicon.ico
%%WWWDIR%%/files/ocsbase.sql
%%WWWDIR%%/files/ocsbase_new.sql
@@ -56,6 +56,13 @@
%%WWWDIR%%/files/update/7013.sql
%%WWWDIR%%/files/update/7014.sql
%%WWWDIR%%/files/update/7015.sql
+%%WWWDIR%%/files/update/7016.sql
+%%WWWDIR%%/files/update/7017.sql
+%%WWWDIR%%/files/update/7018.sql
+%%WWWDIR%%/files/update/7019.sql
+%%WWWDIR%%/files/update/7020.sql
+%%WWWDIR%%/files/update/7021.sql
+%%WWWDIR%%/files/update/7022.sql
%%WWWDIR%%/image/bootstrap-formhelpers-countries.flags.png
%%WWWDIR%%/image/cadena_ferme.png
%%WWWDIR%%/image/cadena_ouvert.png
@@ -444,6 +451,7 @@
%%WWWDIR%%/plugins/computer_detail/cd_processors/cd_processors.php
%%WWWDIR%%/plugins/computer_detail/cd_registry/cd_registry.php
%%WWWDIR%%/plugins/computer_detail/cd_repository/cd_repository.php
+%%WWWDIR%%/plugins/computer_detail/cd_saas/cd_saas.php
%%WWWDIR%%/plugins/computer_detail/cd_slots/cd_slots.php
%%WWWDIR%%/plugins/computer_detail/cd_softwares/cd_softwares.php
%%WWWDIR%%/plugins/computer_detail/cd_sounds/cd_sounds.php
@@ -556,6 +564,9 @@
%%WWWDIR%%/plugins/main_sections/ms_export/ms_csv.php
%%WWWDIR%%/plugins/main_sections/ms_export/ms_export_ocs.php
%%WWWDIR%%/plugins/main_sections/ms_export/ms_soft_csv.php
+%%WWWDIR%%/plugins/main_sections/ms_extensionmanager/ms_extensionmanager.php
+%%WWWDIR%%/plugins/main_sections/ms_saas_soft/ms_saas_soft.php
+%%WWWDIR%%/plugins/main_sections/ms_soft_cat/ms_options_soft_cat.php
%%WWWDIR%%/plugins/main_sections/ms_groups/ms_custom_groups.php
%%WWWDIR%%/plugins/main_sections/ms_groups/ms_group_show.php
%%WWWDIR%%/plugins/main_sections/ms_groups/ms_groups.php
@@ -572,12 +583,7 @@
%%WWWDIR%%/plugins/main_sections/ms_multi_search/ms_custom_sup.php
%%WWWDIR%%/plugins/main_sections/ms_multi_search/ms_custom_tag.php
%%WWWDIR%%/plugins/main_sections/ms_multi_search/ms_multi_search.php
-%%WWWDIR%%/plugins/main_sections/ms_multi_search/ms_multi_search.php.back
%%WWWDIR%%/plugins/main_sections/ms_plugins/functions_check.php
-%%WWWDIR%%/plugins/main_sections/ms_plugins/functions_delete.php
-%%WWWDIR%%/plugins/main_sections/ms_plugins/functions_webservices.php
-%%WWWDIR%%/plugins/main_sections/ms_plugins/ms_pluginsmanager.php
-%%WWWDIR%%/plugins/main_sections/ms_plugins/plugins.class.php
%%WWWDIR%%/plugins/main_sections/ms_regconfig/ms_regconfig.php
%%WWWDIR%%/plugins/main_sections/ms_regconfig/require/function_regconfig.php
%%WWWDIR%%/plugins/main_sections/ms_repart_tag/ms_repart_tag.php
@@ -591,9 +597,6 @@
%%WWWDIR%%/plugins/main_sections/ms_snmp/ms_snmp_detail.php
%%WWWDIR%%/plugins/main_sections/ms_snmp/require/function_snmp.php
%%WWWDIR%%/plugins/main_sections/ms_soft_cat/ms_soft_cat.php
-%%WWWDIR%%/plugins/main_sections/ms_stats/class/msstats.class.php
-%%WWWDIR%%/plugins/main_sections/ms_stats/class/msstatsconnexion.class.php
-%%WWWDIR%%/plugins/main_sections/ms_stats/class/msstatstop.class.php
%%WWWDIR%%/plugins/main_sections/ms_stats/files/ms_stats_top_soft.txt
%%WWWDIR%%/plugins/main_sections/ms_stats/ms_stats.php
%%WWWDIR%%/plugins/main_sections/ms_teledeploy/js/package-form.js
@@ -666,6 +669,11 @@
%%WWWDIR%%/require/config/XMLProfileSerializer.php
%%WWWDIR%%/require/config/XMLUrlsSerializer.php
%%WWWDIR%%/require/config/include.php
+%%WWWDIR%%/require/console/Console.php
+%%WWWDIR%%/require/extensions/ExtensionCommon.php
+%%WWWDIR%%/require/extensions/ExtensionHook.php
+%%WWWDIR%%/require/extensions/ExtensionManager.php
+%%WWWDIR%%/require/extensions/include.php
%%WWWDIR%%/require/fichierConf.class.php
%%WWWDIR%%/require/footer.php
%%WWWDIR%%/require/function_admininfo.php
@@ -701,15 +709,19 @@
%%WWWDIR%%/require/menu/TxtMenuSerializer.php
%%WWWDIR%%/require/menu/XMLMenuSerializer.php
%%WWWDIR%%/require/menu/include.php
+%%WWWDIR%%/require/news/News.php
%%WWWDIR%%/require/plugin/ComputerPlugin.php
%%WWWDIR%%/require/plugin/XMLPluginsSerializer.php
%%WWWDIR%%/require/plugin/include.php
+%%WWWDIR%%/require/saas/Saas.php
%%WWWDIR%%/require/search/AccountinfoSearch.php
%%WWWDIR%%/require/search/DatabaseSearch.php
+%%WWWDIR%%/require/search/GroupSearch.php
%%WWWDIR%%/require/search/LegacySearch.php
%%WWWDIR%%/require/search/Search.php
%%WWWDIR%%/require/search/TranslationSearch.php
%%WWWDIR%%/require/softwares/SoftwareCategory.php
+%%WWWDIR%%/require/stats/Stats.php
%%WWWDIR%%/require/table/Column.php
%%WWWDIR%%/require/table/Columns.php
%%WWWDIR%%/require/table/Table.php
@@ -721,14 +733,18 @@
%%WWWDIR%%/require/tables/TableRenderer.php
%%WWWDIR%%/require/tables/table.html.php
%%WWWDIR%%/require/tables/tables.js
+%%WWWDIR%%/require/teledeploy/Teledeploy.php
%%WWWDIR%%/require/views/forms.php
+%%WWWDIR%%/templates/.htaccess
%%WWWDIR%%/templates/OCS_template.html
%%WWWDIR%%/themes/OCS/banniere.png
%%WWWDIR%%/themes/OCS/logo.png
%%WWWDIR%%/themes/OCS/style.css
%%WWWDIR%%/tools/cron_mailer.php
+%%WWWDIR%%/tools/install_plugin.py
%%WWWDIR%%/tools/gz.php
%%WWWDIR%%/tools/recompose_paquet.php
%%WWWDIR%%/update.php
-%%WWWDIR%%/upload/README
%%WWWDIR%%/var.php
+ at dir %%DATADIR%%/packages
+ at dir %%DATADIR%%/snmp
More information about the svn-ports-all
mailing list