git: 97cddc6f5f83 - 2022Q3 - net-mgmt/ocsinventory-{server,ocsreports}: Update to 2.10.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Mikael Urankar <mikael_at_FreeBSD.org>
Date: Mon, 05 Sep 2022 17:56:45 UTC
The branch 2022Q3 has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=97cddc6f5f8313b8203d161d5f44c7a00f3c97b9

commit 97cddc6f5f8313b8203d161d5f44c7a00f3c97b9
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2022-08-25 11:33:05 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2022-09-05 17:55:56 +0000

    net-mgmt/ocsinventory-{server,ocsreports}: Update to 2.10.0
    
    Changes:
    https://github.com/OCSInventory-NG/OCSInventory-ocsreports/releases/tag/2.10.0
    
    PR:             266031
    Tested by:      Geoffroy Desvernay
    Approved by:    Geoffroy Desvernay (maintainer)
    
    (cherry picked from commit ca5aef34df8652cc5749ad6261dd0bb2d3375bb5)
---
 net-mgmt/ocsinventory-ocsreports/Makefile  |  5 ++---
 net-mgmt/ocsinventory-ocsreports/distinfo  |  6 +++---
 net-mgmt/ocsinventory-ocsreports/pkg-plist | 19 ++++++++++++++++---
 net-mgmt/ocsinventory-server/Makefile      |  4 ++--
 net-mgmt/ocsinventory-server/distinfo      |  6 +++---
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/net-mgmt/ocsinventory-ocsreports/Makefile b/net-mgmt/ocsinventory-ocsreports/Makefile
index 3bfe0521a397..1dd0821c7733 100644
--- a/net-mgmt/ocsinventory-ocsreports/Makefile
+++ b/net-mgmt/ocsinventory-ocsreports/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ocsinventory-ocsreports
-PORTVERSION=	2.9.2
+PORTVERSION=	2.10.0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/
 DISTNAME=	OCSNG_UNIX_SERVER-${PORTVERSION}
@@ -29,9 +29,8 @@ do-extract:
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR}
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "! -name dbconfig.inc.php ! -name cas.config.php")
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "! -name dbconfig.inc.php")
 	${INSTALL_DATA} ${FILESDIR}/dbconfig.inc.php.sample ${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
diff --git a/net-mgmt/ocsinventory-ocsreports/distinfo b/net-mgmt/ocsinventory-ocsreports/distinfo
index 8e5012b0f28c..3b506acd4f52 100644
--- a/net-mgmt/ocsinventory-ocsreports/distinfo
+++ b/net-mgmt/ocsinventory-ocsreports/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646153690
-SHA256 (OCSNG_UNIX_SERVER-2.9.2.tar.gz) = f90495e3ec748dcdcbfd0223bd7b612ca94ad2254282dce643e2aa0442a31e90
-SIZE (OCSNG_UNIX_SERVER-2.9.2.tar.gz) = 5721391
+TIMESTAMP = 1661419093
+SHA256 (OCSNG_UNIX_SERVER-2.10.0.tar.gz) = e738fa223a4cbf050c4c6c1740cfca352292b6b5fdd0ab249c17b7adfabbb7d9
+SIZE (OCSNG_UNIX_SERVER-2.10.0.tar.gz) = 5751902
diff --git a/net-mgmt/ocsinventory-ocsreports/pkg-plist b/net-mgmt/ocsinventory-ocsreports/pkg-plist
index 634d655c0a7d..3070a51b4677 100644
--- a/net-mgmt/ocsinventory-ocsreports/pkg-plist
+++ b/net-mgmt/ocsinventory-ocsreports/pkg-plist
@@ -13,12 +13,12 @@
 %%WWWDIR%%/backend/AUTH/methode/ldap.php
 %%WWWDIR%%/backend/AUTH/methode/local.php
 %%WWWDIR%%/backend/identity/identity.php
+%%WWWDIR%%/backend/identity/methode/cas.php
 %%WWWDIR%%/backend/identity/methode/ldap.php
 %%WWWDIR%%/backend/identity/methode/local.php
 %%WWWDIR%%/backend/ipdiscover/ipdiscover.php
 %%WWWDIR%%/backend/ipdiscover/methode/local.php
 %%WWWDIR%%/backend/require/auth.manager.php
-@sample %%WWWDIR%%/backend/require/cas.config.php.sample
 %%WWWDIR%%/backend/require/connexion.php
 %%WWWDIR%%/composer.json
 %%WWWDIR%%/composer.lock
@@ -40,6 +40,7 @@
 %%WWWDIR%%/config/teledeploy/interactions/installapplinux.xml
 %%WWWDIR%%/config/teledeploy/interactions/installappmacos.xml
 %%WWWDIR%%/config/teledeploy/interactions/installpkgmacos.xml
+%%WWWDIR%%/config/teledeploy/interactions/installpluginlinux.xml
 %%WWWDIR%%/config/teledeploy/interactions/msiapplication.xml
 %%WWWDIR%%/config/teledeploy/interactions/powershellscript.xml
 %%WWWDIR%%/config/teledeploy/interactions/store.xml
@@ -58,6 +59,7 @@
 %%WWWDIR%%/config/teledeploy/options/installapplinuxopt.xml
 %%WWWDIR%%/config/teledeploy/options/installappmacosopt.xml
 %%WWWDIR%%/config/teledeploy/options/installpkgmacosopt.xml
+%%WWWDIR%%/config/teledeploy/options/installpluginlinuxopt.xml
 %%WWWDIR%%/config/teledeploy/options/msiapplicationopt.xml
 %%WWWDIR%%/config/teledeploy/options/powershellscriptopt.xml
 %%WWWDIR%%/config/teledeploy/options/storeopt.xml
@@ -65,6 +67,7 @@
 %%WWWDIR%%/config/teledeploy/options/uninstallopt.xml
 %%WWWDIR%%/config/teledeploy/options/updateagentopt.xml
 %%WWWDIR%%/config/teledeploy/options/yumrepositoryopt.xml
+%%WWWDIR%%/config/teledeploy/script/installplugin.sh
 %%WWWDIR%%/config/teledeploy/script/removeupdateagent.ps1
 %%WWWDIR%%/config/teledeploy/script/scheduledupdateagent.ps1
 %%WWWDIR%%/config/urls.xml
@@ -143,6 +146,12 @@
 %%WWWDIR%%/files/update/7055.sql
 %%WWWDIR%%/files/update/7056.sql
 %%WWWDIR%%/files/update/7057.sql
+%%WWWDIR%%/files/update/7058.sql
+%%WWWDIR%%/files/update/7059.sql
+%%WWWDIR%%/files/update/7060.sql
+%%WWWDIR%%/files/update/7061.sql
+%%WWWDIR%%/files/update/7062.sql
+%%WWWDIR%%/files/update/7063.sql
 %%WWWDIR%%/image/adjustment.png
 %%WWWDIR%%/image/apple-logo.png
 %%WWWDIR%%/image/binary.png
@@ -865,13 +874,14 @@
 %%WWWDIR%%/plugins/main_sections/ms_groups/ms_group_show.php
 %%WWWDIR%%/plugins/main_sections/ms_groups/ms_groups.php
 %%WWWDIR%%/plugins/main_sections/ms_help/ms_ask.php
-%%WWWDIR%%/plugins/main_sections/ms_help/ms_irc.php
 %%WWWDIR%%/plugins/main_sections/ms_help/ms_offers.php
 %%WWWDIR%%/plugins/main_sections/ms_help/ms_wiki.php
+%%WWWDIR%%/plugins/main_sections/ms_history/ms_history.php
 %%WWWDIR%%/plugins/main_sections/ms_ipdiscover/ms_admin_ipdiscover.php
 %%WWWDIR%%/plugins/main_sections/ms_ipdiscover/ms_custom_info.php
 %%WWWDIR%%/plugins/main_sections/ms_ipdiscover/ms_ipdiscover.php
 %%WWWDIR%%/plugins/main_sections/ms_ipdiscover/ms_ipdiscover_analyse.php
+%%WWWDIR%%/plugins/main_sections/ms_layouts/ms_layouts.php
 %%WWWDIR%%/plugins/main_sections/ms_logs/ms_logs.php
 %%WWWDIR%%/plugins/main_sections/ms_multi_search/ms_custom_lock.php
 %%WWWDIR%%/plugins/main_sections/ms_multi_search/ms_custom_sup.php
@@ -998,8 +1008,10 @@
 %%WWWDIR%%/require/function_users.php
 %%WWWDIR%%/require/function_wol.php
 %%WWWDIR%%/require/header.php
+%%WWWDIR%%/require/history/History.php
 %%WWWDIR%%/require/html_header.php
 %%WWWDIR%%/require/ipdiscover/Ipdiscover.php
+%%WWWDIR%%/require/layouts/Layout.php
 %%WWWDIR%%/require/mail/NotificationMail.php
 %%WWWDIR%%/require/menu/ComputerMenuRenderer.php
 %%WWWDIR%%/require/menu/MainMenuRenderer.php
@@ -1142,7 +1154,6 @@
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php
-%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php
@@ -1168,6 +1179,7 @@
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php
+%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php
@@ -1189,6 +1201,7 @@
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/src/Exception.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/src/OAuth.php
+%%WWWDIR%%/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/src/PHPMailer.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/src/POP3.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/src/SMTP.php
diff --git a/net-mgmt/ocsinventory-server/Makefile b/net-mgmt/ocsinventory-server/Makefile
index 6e097a3aed47..b685b3ad1d49 100644
--- a/net-mgmt/ocsinventory-server/Makefile
+++ b/net-mgmt/ocsinventory-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ocsinventory-server
-PORTVERSION=	2.9.2
+PORTVERSION=	2.10.0
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	dgeo@centrale-marseille.fr
@@ -27,7 +27,7 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 USE_GITHUB=	YES
-GH_TAGNAME=	f19e7606b91fe240a31eb4823310bea5ebbda40a
+GH_TAGNAME=	246e3525944d10893b1380d4c63f4538d1eb6a6d
 GH_ACCOUNT=	OCSInventory-NG
 GH_PROJECT=	OCSInventory-Server
 
diff --git a/net-mgmt/ocsinventory-server/distinfo b/net-mgmt/ocsinventory-server/distinfo
index 2b8d9c3c7f33..e961e74286d1 100644
--- a/net-mgmt/ocsinventory-server/distinfo
+++ b/net-mgmt/ocsinventory-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645697594
-SHA256 (OCSInventory-NG-OCSInventory-Server-2.9.2-f19e7606b91fe240a31eb4823310bea5ebbda40a_GH0.tar.gz) = 83cd1c2d6058856467f09e793e5fac805faa84fa2370724f7cdca4f615fe1356
-SIZE (OCSInventory-NG-OCSInventory-Server-2.9.2-f19e7606b91fe240a31eb4823310bea5ebbda40a_GH0.tar.gz) = 126846
+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