From nobody Mon Sep 05 17:56:45 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MLx6Q05w1z4bFJh; Mon, 5 Sep 2022 17:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MLx6P6gdDz4CS7; Mon, 5 Sep 2022 17:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662400605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xsuaNAevviH6S0IIMczs6s9+hw4o8WhO8oG0OgX74EM=; b=luqM2XBWZLEC2UXe2wwoImb7+09oiaLPdnoBHcYvEHtBJhd++INKaYA5Yg297DdyDTCL0G MUPVqoNHLML3kXXk8C9dn5/0jj1/sjYkzTGRi3ImmZHRL5FYLBfUWrbmlM7L3GZS2CdHpq ClmoUkW7rC8cbZMX7XMqMY/SPmK+UTX8LkDYZKwcJ9iqQWZZ7QRPhBMJzi7GMhvaL9/JxA vua4QtzvhqvlF8a1ttyozd8O5bZZsZ9UT7cpkWaqk/FoMRJMkzy9XvHgJrqqOJAyqx5I+8 L57lgwwzvJOlMc23pViA5ZQZlUWp9fQ7JA3Is70j4i51OxN7ObhKTFEZA5roEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MLx6P5jrzzv9v; Mon, 5 Sep 2022 17:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 285Hujhm025034; Mon, 5 Sep 2022 17:56:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 285HujwN025033; Mon, 5 Sep 2022 17:56:45 GMT (envelope-from git) Date: Mon, 5 Sep 2022 17:56:45 GMT Message-Id: <202209051756.285HujwN025033@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mikael Urankar Subject: git: 97cddc6f5f83 - 2022Q3 - net-mgmt/ocsinventory-{server,ocsreports}: Update to 2.10.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 97cddc6f5f8313b8203d161d5f44c7a00f3c97b9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662400605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xsuaNAevviH6S0IIMczs6s9+hw4o8WhO8oG0OgX74EM=; b=JT7JTpFK3P4etOEUx2ZSDoyLI9YK8LKhxIlbCaguoPWpnFNjHskMvUPiTngsVaJWSJDhuz sJp4JvXjaj8lsgjA7lMw3xZGjfi5re6dfa/AckZ97sa8EZ38DMXTdFXEbw8pvG/ybUCiJJ dyFVLwFsge/lDx+A/KGQ/YjFNN459UL0BfmDXbI6rkjo/U9XmGLfz8yQYwvrXVDa4ZhGev TFTgFUhTC18HF9W1gdYp7YX1Sj3KBt9LxcXo3aCabKH+HYJ2GycCs6hjYKguAmrO8WD30B 85fGl5iGfOYZVGK0/a0vsJlybrnveZx6sDosYH5rJAfj44TPXww9i2OcQZWr1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662400605; a=rsa-sha256; cv=none; b=HYW351E8jY9CTfWFz2n0L3cp1S9Nv00ZK4T3zRlmQhAGtB7tWo2rPSyuoFPXC2+GfxETOZ l80dtf3gWq+yCwUMKtRpp3uWZvILcfrZQAVpFcSNDzrPlMM65WB82/TQDmsx7tV62T0T03 3wMHp6USA8z/zaQw37USmq7S37esINoclovhlazEfZNEklki5en/g+Rz5fxAvivT/cFDUD g1wJyYZbDG4RvKbqO0guSPRnNQvLwenTXwvprUQVbiwg5kM/44uby1nkzDgKevJ+H9hYvo sHYxvIviNLFPsKD/PkeP6zpq3Uy+2skrMSw7g+9FwaxW4bhvxXntcTtn5kwfvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=97cddc6f5f8313b8203d161d5f44c7a00f3c97b9 commit 97cddc6f5f8313b8203d161d5f44c7a00f3c97b9 Author: Mikael Urankar AuthorDate: 2022-08-25 11:33:05 +0000 Commit: Mikael Urankar 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