git: 0f63b7fec4d0 - main - net-mgmt/ocsinventory-{server,ocsreports}: Update to 2.11.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Mikael Urankar <mikael_at_FreeBSD.org>
Date: Sat, 14 Jan 2023 19:04:25 UTC
The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0f63b7fec4d06588b49635bab46da189ab2b4668

commit 0f63b7fec4d06588b49635bab46da189ab2b4668
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2022-11-15 17:14:31 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2023-01-14 19:04:11 +0000

    net-mgmt/ocsinventory-{server,ocsreports}: Update to 2.11.1
    
    Changes:
      https://github.com/OCSInventory-NG/OCSInventory-ocsreports/releases/tag/2.11.0
      https://github.com/OCSInventory-NG/OCSInventory-ocsreports/releases/tag/2.11.1
    
    PR:             267789
    Approved by:    maintainer timeout
---
 net-mgmt/ocsinventory-ocsreports/Makefile  |  2 +-
 net-mgmt/ocsinventory-ocsreports/distinfo  |  6 ++--
 net-mgmt/ocsinventory-ocsreports/pkg-plist | 46 ++++++++++++------------------
 net-mgmt/ocsinventory-server/Makefile      |  4 +--
 net-mgmt/ocsinventory-server/distinfo      |  6 ++--
 net-mgmt/ocsinventory-server/pkg-plist     |  7 ++---
 6 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/net-mgmt/ocsinventory-ocsreports/Makefile b/net-mgmt/ocsinventory-ocsreports/Makefile
index e93d15d98105..be69f2ca9ba5 100644
--- a/net-mgmt/ocsinventory-ocsreports/Makefile
+++ b/net-mgmt/ocsinventory-ocsreports/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ocsinventory-ocsreports
-PORTVERSION=	2.10.0
+PORTVERSION=	2.11.1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/
 DISTNAME=	OCSNG_UNIX_SERVER-${PORTVERSION}
diff --git a/net-mgmt/ocsinventory-ocsreports/distinfo b/net-mgmt/ocsinventory-ocsreports/distinfo
index 3b506acd4f52..84e60e5f7528 100644
--- a/net-mgmt/ocsinventory-ocsreports/distinfo
+++ b/net-mgmt/ocsinventory-ocsreports/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661419093
-SHA256 (OCSNG_UNIX_SERVER-2.10.0.tar.gz) = e738fa223a4cbf050c4c6c1740cfca352292b6b5fdd0ab249c17b7adfabbb7d9
-SIZE (OCSNG_UNIX_SERVER-2.10.0.tar.gz) = 5751902
+TIMESTAMP = 1668531229
+SHA256 (OCSNG_UNIX_SERVER-2.11.1.tar.gz) = 36d0a0975163c12baab90bf63c6e10b72a862a2de2ef23e6246fc243556fe9c4
+SIZE (OCSNG_UNIX_SERVER-2.11.1.tar.gz) = 5765276
diff --git a/net-mgmt/ocsinventory-ocsreports/pkg-plist b/net-mgmt/ocsinventory-ocsreports/pkg-plist
index 3070a51b4677..9e48bc4fb29f 100644
--- a/net-mgmt/ocsinventory-ocsreports/pkg-plist
+++ b/net-mgmt/ocsinventory-ocsreports/pkg-plist
@@ -1,5 +1,6 @@
 @sample %%ETCDIR%%/ocsreports.inc.sample
-%%WWWDIR%%/.travis.yml
+%%WWWDIR%%/.jscpd.json
+%%WWWDIR%%/.mega-linter.yml
 %%WWWDIR%%/Changes
 %%WWWDIR%%/Contributors
 %%WWWDIR%%/LICENSE
@@ -76,6 +77,7 @@
 %%WWWDIR%%/crontab/cron_cve_computer.php
 %%WWWDIR%%/crontab/cron_ipdiscover.php
 %%WWWDIR%%/crontab/cron_purge_history.php
+%%WWWDIR%%/crontab/cron_report_notification.php
 %%WWWDIR%%/crontab/cron_wol.php
 %%WWWDIR%%/css/bootstrap-datetimepicker.css
 %%WWWDIR%%/css/bootstrap-formhelpers.css
@@ -88,7 +90,7 @@
 %%WWWDIR%%/css/ocsreports.css
 %%WWWDIR%%/css/onglets.css
 %%WWWDIR%%/css/winclassic.css
-@sample %%WWWDIR%%/dbconfig.inc.php.sample
+%%WWWDIR%%/dbconfig.inc.php.sample
 %%WWWDIR%%/extensions/Readme.md
 %%WWWDIR%%/favicon.ico
 %%WWWDIR%%/files/cve/csv_example.csv
@@ -152,6 +154,12 @@
 %%WWWDIR%%/files/update/7061.sql
 %%WWWDIR%%/files/update/7062.sql
 %%WWWDIR%%/files/update/7063.sql
+%%WWWDIR%%/files/update/7064.sql
+%%WWWDIR%%/files/update/7065.sql
+%%WWWDIR%%/files/update/7066.sql
+%%WWWDIR%%/files/update/7067.sql
+%%WWWDIR%%/files/update/7068.sql
+%%WWWDIR%%/files/update/7069.sql
 %%WWWDIR%%/image/adjustment.png
 %%WWWDIR%%/image/apple-logo.png
 %%WWWDIR%%/image/binary.png
@@ -752,6 +760,7 @@
 %%WWWDIR%%/plugins/computer_detail/cd_sounds/cd_sounds.php
 %%WWWDIR%%/plugins/computer_detail/cd_storages/cd_storages.php
 %%WWWDIR%%/plugins/computer_detail/cd_teledeploy/cd_teledeploy.php
+%%WWWDIR%%/plugins/computer_detail/cd_teledeploymanage/cd_teledeploymanage.php
 %%WWWDIR%%/plugins/computer_detail/cd_unixlocalgroups/cd_unixlocalgroups.php
 %%WWWDIR%%/plugins/computer_detail/cd_unixlocalusers/cd_unixlocalusers.php
 %%WWWDIR%%/plugins/computer_detail/cd_videos/cd_videos.php
@@ -867,7 +876,9 @@
 %%WWWDIR%%/plugins/main_sections/ms_dict/ms_dict.php
 %%WWWDIR%%/plugins/main_sections/ms_doubles/ms_doubles.php
 %%WWWDIR%%/plugins/main_sections/ms_export/ms_csv.php
+%%WWWDIR%%/plugins/main_sections/ms_export/ms_csv_snmp.php
 %%WWWDIR%%/plugins/main_sections/ms_export/ms_export_ocs.php
+%%WWWDIR%%/plugins/main_sections/ms_export/ms_export_snmp.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_groups/ms_custom_groups.php
@@ -886,6 +897,7 @@
 %%WWWDIR%%/plugins/main_sections/ms_multi_search/ms_custom_lock.php
 %%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_custom_tag_snmp.php
 %%WWWDIR%%/plugins/main_sections/ms_multi_search/ms_multi_search.php
 %%WWWDIR%%/plugins/main_sections/ms_regconfig/ms_regconfig.php
 %%WWWDIR%%/plugins/main_sections/ms_regconfig/require/function_regconfig.php
@@ -900,8 +912,8 @@
 %%WWWDIR%%/plugins/main_sections/ms_search_soft/require/fonction.inc.php
 %%WWWDIR%%/plugins/main_sections/ms_server_infos/ms_server_infos.php
 %%WWWDIR%%/plugins/main_sections/ms_snmp/ms_snmp.php
-%%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_snmp_inventory/ms_snmp_detail.php
 %%WWWDIR%%/plugins/main_sections/ms_snmp_inventory/ms_snmp_inventory.php
 %%WWWDIR%%/plugins/main_sections/ms_soft_cat/ms_options_soft_cat.php
 %%WWWDIR%%/plugins/main_sections/ms_soft_cat/ms_soft_cat.php
@@ -924,7 +936,6 @@
 %%WWWDIR%%/plugins/main_sections/ms_teledeploy/views/package_form_view.php
 %%WWWDIR%%/plugins/main_sections/ms_upload_file/ms_local_import.php
 %%WWWDIR%%/plugins/main_sections/ms_upload_file/ms_upload_file.php
-%%WWWDIR%%/plugins/main_sections/ms_upload_file/ms_upload_file_popup.php
 %%WWWDIR%%/plugins/main_sections/ms_upload_file/ms_view_file.php
 %%WWWDIR%%/plugins/main_sections/ms_users/js/profile-create-form.js
 %%WWWDIR%%/plugins/main_sections/ms_users/js/profile-edit-form.js
@@ -941,28 +952,8 @@
 %%WWWDIR%%/plugins/main_sections/ms_users/views/profile_create_form.php
 %%WWWDIR%%/plugins/main_sections/ms_users/views/profile_edit_form.php
 %%WWWDIR%%/plugins/main_sections/ms_users/views/users_views.php
-%%WWWDIR%%/plugins/snmp_detail/sd_admininfo/sd_admininfo.php
-%%WWWDIR%%/plugins/snmp_detail/sd_cards/sd_cards.php
-%%WWWDIR%%/plugins/snmp_detail/sd_cartridges/sd_cartridges.php
-%%WWWDIR%%/plugins/snmp_detail/sd_cpus/sd_cpus.php
-%%WWWDIR%%/plugins/snmp_detail/sd_drives/sd_drives.php
-%%WWWDIR%%/plugins/snmp_detail/sd_fans/sd_fans.php
-%%WWWDIR%%/plugins/snmp_detail/sd_inputs/sd_inputs.php
-%%WWWDIR%%/plugins/snmp_detail/sd_localprinters/sd_localprinters.php
-%%WWWDIR%%/plugins/snmp_detail/sd_memories/sd_memories.php
-%%WWWDIR%%/plugins/snmp_detail/sd_modems/sd_modems.php
-%%WWWDIR%%/plugins/snmp_detail/sd_networks/sd_networks.php
-%%WWWDIR%%/plugins/snmp_detail/sd_ports/sd_ports.php
-%%WWWDIR%%/plugins/snmp_detail/sd_powersupplies/sd_powersupplies.php
-%%WWWDIR%%/plugins/snmp_detail/sd_softwares/sd_softwares.php
-%%WWWDIR%%/plugins/snmp_detail/sd_sounds/sd_sounds.php
-%%WWWDIR%%/plugins/snmp_detail/sd_storages/sd_storages.php
-%%WWWDIR%%/plugins/snmp_detail/sd_switch/sd_switch.php
-%%WWWDIR%%/plugins/snmp_detail/sd_trays/sd_trays.php
-%%WWWDIR%%/plugins/snmp_detail/sd_videos/sd_videos.php
-%%WWWDIR%%/plugins/snmp_detail/sd_virtualmachines/sd_virtualmachines.php
-%%WWWDIR%%/plugins/snmp_detail/snmp_config.txt
 %%WWWDIR%%/require/CSV.class.php
+%%WWWDIR%%/require/admininfo/Admininfo.php
 %%WWWDIR%%/require/aide_developpement.php
 %%WWWDIR%%/require/archive/ArchiveComputer.php
 %%WWWDIR%%/require/assets/AssetsCategory.php
@@ -985,11 +976,9 @@
 %%WWWDIR%%/require/extensions/include.php
 %%WWWDIR%%/require/fichierConf.class.php
 %%WWWDIR%%/require/footer.php
-%%WWWDIR%%/require/function_admininfo.php
 %%WWWDIR%%/require/function_commun.php
 %%WWWDIR%%/require/function_computers.php
 %%WWWDIR%%/require/function_config_generale.php
-%%WWWDIR%%/require/function_console.php
 %%WWWDIR%%/require/function_cookies.php
 %%WWWDIR%%/require/function_dico.php
 %%WWWDIR%%/require/function_files.php
@@ -1007,6 +996,7 @@
 %%WWWDIR%%/require/function_telediff.php
 %%WWWDIR%%/require/function_users.php
 %%WWWDIR%%/require/function_wol.php
+%%WWWDIR%%/require/groupReports/GroupReport.php
 %%WWWDIR%%/require/header.php
 %%WWWDIR%%/require/history/History.php
 %%WWWDIR%%/require/html_header.php
@@ -1033,6 +1023,7 @@
 %%WWWDIR%%/require/search/LegacySearch.php
 %%WWWDIR%%/require/search/SQLCache.php
 %%WWWDIR%%/require/search/Search.php
+%%WWWDIR%%/require/search/SnmpSearch.php
 %%WWWDIR%%/require/search/SoftwareSearch.php
 %%WWWDIR%%/require/search/TranslationSearch.php
 %%WWWDIR%%/require/snmp/Snmp.php
@@ -1060,6 +1051,7 @@
 %%WWWDIR%%/require/views/forms.php
 %%WWWDIR%%/require/wol/WakeOnLan.php
 %%WWWDIR%%/templates/.htaccess
+%%WWWDIR%%/templates/OCS_group_notif.html
 %%WWWDIR%%/templates/OCS_template.html
 %%WWWDIR%%/themes/OCS/banniere.png
 %%WWWDIR%%/themes/OCS/logo.png
diff --git a/net-mgmt/ocsinventory-server/Makefile b/net-mgmt/ocsinventory-server/Makefile
index dec7ff3efca6..f73aade89d59 100644
--- a/net-mgmt/ocsinventory-server/Makefile
+++ b/net-mgmt/ocsinventory-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ocsinventory-server
-PORTVERSION=	2.10.0
+PORTVERSION=	2.11.1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	dgeo@centrale-marseille.fr
@@ -28,7 +28,7 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 USE_GITHUB=	YES
-GH_TAGNAME=	246e3525944d10893b1380d4c63f4538d1eb6a6d
+GH_TAGNAME=	7aff9af5d91a98fd6897afc2ea4b979464a88452
 GH_ACCOUNT=	OCSInventory-NG
 GH_PROJECT=	OCSInventory-Server
 
diff --git a/net-mgmt/ocsinventory-server/distinfo b/net-mgmt/ocsinventory-server/distinfo
index e961e74286d1..694b4c6ad531 100644
--- a/net-mgmt/ocsinventory-server/distinfo
+++ b/net-mgmt/ocsinventory-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661419242
-SHA256 (OCSInventory-NG-OCSInventory-Server-2.10.0-246e3525944d10893b1380d4c63f4538d1eb6a6d_GH0.tar.gz) = 8ca1a281484553c38002b1e03a32deb0c784d683cfb676f2af54f4dc6e3d7289
-SIZE (OCSInventory-NG-OCSInventory-Server-2.10.0-246e3525944d10893b1380d4c63f4538d1eb6a6d_GH0.tar.gz) = 126997
+TIMESTAMP = 1668531582
+SHA256 (OCSInventory-NG-OCSInventory-Server-2.11.1-7aff9af5d91a98fd6897afc2ea4b979464a88452_GH0.tar.gz) = 559723173a2d4078d23262a6ce1806f914f1f06a750a123203a1ea55ab778b62
+SIZE (OCSInventory-NG-OCSInventory-Server-2.11.1-7aff9af5d91a98fd6897afc2ea4b979464a88452_GH0.tar.gz) = 128157
diff --git a/net-mgmt/ocsinventory-server/pkg-plist b/net-mgmt/ocsinventory-server/pkg-plist
index 643a046bed3f..66836fe2a82b 100644
--- a/net-mgmt/ocsinventory-server/pkg-plist
+++ b/net-mgmt/ocsinventory-server/pkg-plist
@@ -1,5 +1,7 @@
 @sample %%ETCDIR%%/ocsinventory-restapi.conf.sample
 @sample %%ETCDIR%%/ocsinventory-server.conf.sample
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README.md
 %%DATADIR%%/Apache/Changes
 %%DATADIR%%/Apache/INSTALL
 %%DATADIR%%/Apache/LICENSE
@@ -59,6 +61,7 @@
 %%DATADIR%%/Api/Ocsinventory/Restapi/Computer/Get/ComputerId.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Computer/Get/ComputerIdField.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Computer/Get/Computers.pm
+%%DATADIR%%/Api/Ocsinventory/Restapi/Computer/Get/ComputersLastUpdate.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Computer/Get/ComputersListId.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Computer/Get/ComputersSearch.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Cve/Get/CveComputer.pm
@@ -84,8 +87,6 @@
 %%DATADIR%%/binutils/ocsinventory-log.README
 %%DATADIR%%/binutils/ocsinventory-log.pl
 %%DATADIR%%/binutils/ocsinventory-powershell-injector.ps1
-%%DATADIR%%/binutils/soap-client.README
-%%DATADIR%%/binutils/soap-client.pl
 %%DATADIR%%/dtd/Interface/get_computers_V1-request.dtd
 %%DATADIR%%/dtd/download_request.dtd
 %%DATADIR%%/dtd/file_request.dtd
@@ -97,5 +98,3 @@
 %%DATADIR%%/dtd/update_reply.dtd
 %%DATADIR%%/dtd/update_request.dtd
 %%DATADIR%%/setup.sh
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README.md