Attachment 245530 Details for Bug 274376 – v0

[patch] v0

0004-net-mgmt-ocsinventory-server-ocsreports-Update-to-2..patch (text/plain), 8.10 KB, created by Mikael Urankar on 2023-10-09 14:32:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2023-10-09 14:32:04 UTC

Size: 8.10 KB

patch

obsolete

>From d239828f4ae5fe8246d38078429ae77b6da87088 Mon Sep 17 00:00:00 2001
>From: Mikael Urankar <mikael@FreeBSD.org>
>Date: Mon, 9 Oct 2023 15:56:04 +0200
>Subject: [PATCH] net-mgmt/ocsinventory-{server,ocsreports}: Update to 2.12.1
>
>Changes:
>  https://github.com/OCSInventory-NG/OCSInventory-ocsreports/releases/tag/2.12.0
>  https://github.com/OCSInventory-NG/OCSInventory-ocsreports/releases/tag/2.12.1
>---
> net-mgmt/ocsinventory-ocsreports/Makefile  |  2 +-
> net-mgmt/ocsinventory-ocsreports/distinfo  |  6 +++---
> net-mgmt/ocsinventory-ocsreports/pkg-plist | 23 +++++++++++++++++++---
> net-mgmt/ocsinventory-server/Makefile      |  2 +-
> net-mgmt/ocsinventory-server/distinfo      |  6 +++---
> 5 files changed, 28 insertions(+), 11 deletions(-)
>
>diff --git a/net-mgmt/ocsinventory-ocsreports/Makefile b/net-mgmt/ocsinventory-ocsreports/Makefile
>index 16b951056..c2d6d3255 100644
>--- a/net-mgmt/ocsinventory-ocsreports/Makefile
>+++ b/net-mgmt/ocsinventory-ocsreports/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	ocsinventory-ocsreports
>-PORTVERSION=	2.11.1
>+PORTVERSION=	2.12.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 84e60e5f7..364016208 100644
>--- a/net-mgmt/ocsinventory-ocsreports/distinfo
>+++ b/net-mgmt/ocsinventory-ocsreports/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1668531229
>-SHA256 (OCSNG_UNIX_SERVER-2.11.1.tar.gz) = 36d0a0975163c12baab90bf63c6e10b72a862a2de2ef23e6246fc243556fe9c4
>-SIZE (OCSNG_UNIX_SERVER-2.11.1.tar.gz) = 5765276
>+TIMESTAMP = 1696514414
>+SHA256 (OCSNG_UNIX_SERVER-2.12.1.tar.gz) = 1e9d2fd96195876755d18c350d4494b7059c304325540690b9c9ab85f5fc8d86
>+SIZE (OCSNG_UNIX_SERVER-2.12.1.tar.gz) = 5815999
>diff --git a/net-mgmt/ocsinventory-ocsreports/pkg-plist b/net-mgmt/ocsinventory-ocsreports/pkg-plist
>index 9e48bc4fb..c3e594f77 100644
>--- a/net-mgmt/ocsinventory-ocsreports/pkg-plist
>+++ b/net-mgmt/ocsinventory-ocsreports/pkg-plist
>@@ -13,6 +13,7 @@
> %%WWWDIR%%/backend/AUTH/methode/cas.php
> %%WWWDIR%%/backend/AUTH/methode/ldap.php
> %%WWWDIR%%/backend/AUTH/methode/local.php
>+%%WWWDIR%%/backend/AUTH/methode/sso_only.php
> %%WWWDIR%%/backend/identity/identity.php
> %%WWWDIR%%/backend/identity/methode/cas.php
> %%WWWDIR%%/backend/identity/methode/ldap.php
>@@ -73,6 +74,7 @@
> %%WWWDIR%%/config/teledeploy/script/scheduledupdateagent.ps1
> %%WWWDIR%%/config/urls.xml
> %%WWWDIR%%/crontab/cron_all_software.php
>+%%WWWDIR%%/crontab/cron_clean_orphan.php
> %%WWWDIR%%/crontab/cron_cve.php
> %%WWWDIR%%/crontab/cron_cve_computer.php
> %%WWWDIR%%/crontab/cron_ipdiscover.php
>@@ -93,7 +95,7 @@
> %%WWWDIR%%/dbconfig.inc.php.sample
> %%WWWDIR%%/extensions/Readme.md
> %%WWWDIR%%/favicon.ico
>-%%WWWDIR%%/files/cve/csv_example.csv
>+%%WWWDIR%%/files/cve/cve_matching_mostknown.csv
> %%WWWDIR%%/files/ocsbase.sql
> %%WWWDIR%%/files/ocsbase_new.sql
> %%WWWDIR%%/files/oui.txt
>@@ -160,6 +162,14 @@
> %%WWWDIR%%/files/update/7067.sql
> %%WWWDIR%%/files/update/7068.sql
> %%WWWDIR%%/files/update/7069.sql
>+%%WWWDIR%%/files/update/7070.sql
>+%%WWWDIR%%/files/update/7071.sql
>+%%WWWDIR%%/files/update/7072.sql
>+%%WWWDIR%%/files/update/7073.sql
>+%%WWWDIR%%/files/update/7074.sql
>+%%WWWDIR%%/files/update/7075.sql
>+%%WWWDIR%%/files/update/7076.sql
>+%%WWWDIR%%/files/update/7077.sql
> %%WWWDIR%%/image/adjustment.png
> %%WWWDIR%%/image/apple-logo.png
> %%WWWDIR%%/image/binary.png
>@@ -763,6 +773,7 @@
> %%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_usbdevices/cd_usbdevices.php
> %%WWWDIR%%/plugins/computer_detail/cd_videos/cd_videos.php
> %%WWWDIR%%/plugins/computer_detail/cd_vm/cd_vm.php
> %%WWWDIR%%/plugins/computer_detail/require/functions.php
>@@ -879,6 +890,7 @@
> %%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_export_snmp_conf.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
>@@ -1060,6 +1072,7 @@
> %%WWWDIR%%/tools/gz.php
> %%WWWDIR%%/tools/install_plugin.py
> %%WWWDIR%%/tools/recompose_paquet.php
>+%%WWWDIR%%/tools/sync_snmp_types.php
> %%WWWDIR%%/update.php
> %%WWWDIR%%/var.php
> %%WWWDIR%%/vendor/autoload.php
>@@ -1076,13 +1089,11 @@
> %%WWWDIR%%/vendor/ircmaxell/password-compat/composer.json
> %%WWWDIR%%/vendor/ircmaxell/password-compat/lib/password.php
> %%WWWDIR%%/vendor/ircmaxell/password-compat/version-test.php
>-%%WWWDIR%%/vendor/jasig/phpcas/.codecov.yml
> %%WWWDIR%%/vendor/jasig/phpcas/CAS.php
> %%WWWDIR%%/vendor/jasig/phpcas/LICENSE
> %%WWWDIR%%/vendor/jasig/phpcas/NOTICE
> %%WWWDIR%%/vendor/jasig/phpcas/README.md
> %%WWWDIR%%/vendor/jasig/phpcas/composer.json
>-%%WWWDIR%%/vendor/jasig/phpcas/phpunit.xml.dist
> %%WWWDIR%%/vendor/jasig/phpcas/source/CAS.php
> %%WWWDIR%%/vendor/jasig/phpcas/source/CAS/AuthenticationException.php
> %%WWWDIR%%/vendor/jasig/phpcas/source/CAS/Autoload.php
>@@ -1130,6 +1141,10 @@
> %%WWWDIR%%/vendor/jasig/phpcas/source/CAS/Request/Exception.php
> %%WWWDIR%%/vendor/jasig/phpcas/source/CAS/Request/MultiRequestInterface.php
> %%WWWDIR%%/vendor/jasig/phpcas/source/CAS/Request/RequestInterface.php
>+%%WWWDIR%%/vendor/jasig/phpcas/source/CAS/ServiceBaseUrl/AllowedListDiscovery.php
>+%%WWWDIR%%/vendor/jasig/phpcas/source/CAS/ServiceBaseUrl/Base.php
>+%%WWWDIR%%/vendor/jasig/phpcas/source/CAS/ServiceBaseUrl/Interface.php
>+%%WWWDIR%%/vendor/jasig/phpcas/source/CAS/ServiceBaseUrl/Static.php
> %%WWWDIR%%/vendor/jasig/phpcas/source/CAS/Session/PhpSession.php
> %%WWWDIR%%/vendor/jasig/phpcas/source/CAS/TypeMismatchException.php
> %%WWWDIR%%/vendor/phpmailer/phpmailer/COMMITMENT
>@@ -1180,6 +1195,7 @@
> %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
> %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php
> %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php
>+%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-si.php
> %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php
> %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php
> %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr.php
>@@ -1191,6 +1207,7 @@
> %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php
> %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php
> %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
>+%%WWWDIR%%/vendor/phpmailer/phpmailer/src/DSNConfigurator.php
> %%WWWDIR%%/vendor/phpmailer/phpmailer/src/Exception.php
> %%WWWDIR%%/vendor/phpmailer/phpmailer/src/OAuth.php
> %%WWWDIR%%/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
>diff --git a/net-mgmt/ocsinventory-server/Makefile b/net-mgmt/ocsinventory-server/Makefile
>index 465477f37..85258484e 100644
>--- a/net-mgmt/ocsinventory-server/Makefile
>+++ b/net-mgmt/ocsinventory-server/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	ocsinventory-server
>-PORTVERSION=	2.11.1
>+PORTVERSION=	2.12.1
> CATEGORIES=	net-mgmt
> 
> MAINTAINER=	dgeo@centrale-marseille.fr
>diff --git a/net-mgmt/ocsinventory-server/distinfo b/net-mgmt/ocsinventory-server/distinfo
>index 694b4c6ad..df8cd0e0e 100644
>--- a/net-mgmt/ocsinventory-server/distinfo
>+++ b/net-mgmt/ocsinventory-server/distinfo
>@@ -1,3 +1,3 @@
>-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
>+TIMESTAMP = 1696514426
>+SHA256 (OCSInventory-NG-OCSInventory-Server-2.12.1-7aff9af5d91a98fd6897afc2ea4b979464a88452_GH0.tar.gz) = 559723173a2d4078d23262a6ce1806f914f1f06a750a123203a1ea55ab778b62
>+SIZE (OCSInventory-NG-OCSInventory-Server-2.12.1-7aff9af5d91a98fd6897afc2ea4b979464a88452_GH0.tar.gz) = 128157
>-- 
>2.42.0
>

Actions: View | Diff

Attachments on bug 274376: 245530