From owner-svn-ports-all@freebsd.org Fri Oct 2 06:06:55 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E3D473F7EEA; Fri, 2 Oct 2020 06:06:55 +0000 (UTC) (envelope-from mikael@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C2fdq5g1jz4DPy; Fri, 2 Oct 2020 06:06:55 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A5A2C1D890; Fri, 2 Oct 2020 06:06:55 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09266tgM033399; Fri, 2 Oct 2020 06:06:55 GMT (envelope-from mikael@FreeBSD.org) Received: (from mikael@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09266sI2033390; Fri, 2 Oct 2020 06:06:54 GMT (envelope-from mikael@FreeBSD.org) Message-Id: <202010020606.09266sI2033390@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mikael set sender to mikael@FreeBSD.org using -f From: Mikael Urankar Date: Fri, 2 Oct 2020 06:06:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550900 - in head/net-mgmt: ocsinventory-ocsreports ocsinventory-ocsreports/files ocsinventory-server X-SVN-Group: ports-head X-SVN-Commit-Author: mikael X-SVN-Commit-Paths: in head/net-mgmt: ocsinventory-ocsreports ocsinventory-ocsreports/files ocsinventory-server X-SVN-Commit-Revision: 550900 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Oct 2020 06:06:56 -0000 Author: mikael Date: Fri Oct 2 06:06:54 2020 New Revision: 550900 URL: https://svnweb.freebsd.org/changeset/ports/550900 Log: net-mgmt/ocsinventory-server net-mgmt/ocsinventory-ocsreports: update to 2.8 Changelog: https://ocsinventory-ng.org/?page_id=1548&lang=en PR: 250008 Approved by: Geoffroy Desvernay (maintainer) Added: head/net-mgmt/ocsinventory-ocsreports/files/dbconfig.inc.php.sample (contents, props changed) Modified: head/net-mgmt/ocsinventory-ocsreports/Makefile head/net-mgmt/ocsinventory-ocsreports/distinfo head/net-mgmt/ocsinventory-ocsreports/pkg-plist head/net-mgmt/ocsinventory-server/Makefile head/net-mgmt/ocsinventory-server/distinfo head/net-mgmt/ocsinventory-server/pkg-plist Modified: head/net-mgmt/ocsinventory-ocsreports/Makefile ============================================================================== --- head/net-mgmt/ocsinventory-ocsreports/Makefile Fri Oct 2 05:41:11 2020 (r550899) +++ head/net-mgmt/ocsinventory-ocsreports/Makefile Fri Oct 2 06:06:54 2020 (r550900) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ocsinventory-ocsreports -PORTVERSION= 2.7 +PORTVERSION= 2.8 CATEGORIES= net-mgmt MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/ DISTNAME= OCSNG_UNIX_SERVER_${PORTVERSION} @@ -32,7 +32,7 @@ do-extract: do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "! -name dbconfig.inc.php ! -name cas.config.php") - ${INSTALL_DATA} ${WRKSRC}/dbconfig.inc.php ${STAGEDIR}${WWWDIR}/dbconfig.inc.php.sample + ${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 Modified: head/net-mgmt/ocsinventory-ocsreports/distinfo ============================================================================== --- head/net-mgmt/ocsinventory-ocsreports/distinfo Fri Oct 2 05:41:11 2020 (r550899) +++ head/net-mgmt/ocsinventory-ocsreports/distinfo Fri Oct 2 06:06:54 2020 (r550900) @@ -1,3 +1,3 @@ -TIMESTAMP = 1586615337 -SHA256 (OCSNG_UNIX_SERVER_2.7.tar.gz) = 4fbbf1797a7e20245493d7c714b77893ebfec0c5c5f3f4f898c6aa24ce50dda5 -SIZE (OCSNG_UNIX_SERVER_2.7.tar.gz) = 2895184 +TIMESTAMP = 1601466351 +SHA256 (OCSNG_UNIX_SERVER_2.8.tar.gz) = d4e7583ab40848dd45e938da9bcefdc078626ea6ee99fb890cd52bc0f4d52ac3 +SIZE (OCSNG_UNIX_SERVER_2.8.tar.gz) = 2943225 Added: head/net-mgmt/ocsinventory-ocsreports/files/dbconfig.inc.php.sample ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/ocsinventory-ocsreports/files/dbconfig.inc.php.sample Fri Oct 2 06:06:54 2020 (r550900) @@ -0,0 +1,5 @@ + Modified: head/net-mgmt/ocsinventory-ocsreports/pkg-plist ============================================================================== --- head/net-mgmt/ocsinventory-ocsreports/pkg-plist Fri Oct 2 05:41:11 2020 (r550899) +++ head/net-mgmt/ocsinventory-ocsreports/pkg-plist Fri Oct 2 06:06:54 2020 (r550900) @@ -15,9 +15,11 @@ %%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 %%WWWDIR%%/config/computer/menu.xml %%WWWDIR%%/config/computer/plugins.xml %%WWWDIR%%/config/js.xml @@ -28,7 +30,6 @@ %%WWWDIR%%/config/profiles/read-only.xml %%WWWDIR%%/config/profiles/sadmin.xml %%WWWDIR%%/config/urls.xml -%%WWWDIR%%/crontab/cron_clean_cve.php %%WWWDIR%%/crontab/cron_cve.php %%WWWDIR%%/crontab/cron_wol.php %%WWWDIR%%/css/bootstrap-datetimepicker.css @@ -45,6 +46,7 @@ @sample %%WWWDIR%%/dbconfig.inc.php.sample %%WWWDIR%%/extensions/Readme.md %%WWWDIR%%/favicon.ico +%%WWWDIR%%/files/cve/csv_example.csv %%WWWDIR%%/files/ocsbase.sql %%WWWDIR%%/files/ocsbase_new.sql %%WWWDIR%%/files/oui.txt @@ -70,6 +72,15 @@ %%WWWDIR%%/files/update/7026.sql %%WWWDIR%%/files/update/7027.sql %%WWWDIR%%/files/update/7028.sql +%%WWWDIR%%/files/update/7029.sql +%%WWWDIR%%/files/update/7030.sql +%%WWWDIR%%/files/update/7031.sql +%%WWWDIR%%/files/update/7032.sql +%%WWWDIR%%/files/update/7033.sql +%%WWWDIR%%/files/update/7034.sql +%%WWWDIR%%/files/update/7035.sql +%%WWWDIR%%/files/update/7036.sql +%%WWWDIR%%/files/update/7037.sql %%WWWDIR%%/image/bootstrap-formhelpers-countries.flags.png %%WWWDIR%%/image/cadena_ferme.png %%WWWDIR%%/image/cadena_ouvert.png @@ -277,6 +288,8 @@ %%WWWDIR%%/plugins/language/ug_UY/ug_UY.txt %%WWWDIR%%/plugins/language/uk_UA/uk_UA.txt %%WWWDIR%%/plugins/language/uk_UA/ukrainian.png +%%WWWDIR%%/plugins/language/zh_CN/chinese.png +%%WWWDIR%%/plugins/language/zh_CN/zh_CN.txt %%WWWDIR%%/plugins/main_sections/img/ms_admininfo.png %%WWWDIR%%/plugins/main_sections/img/ms_admininfo_a.png %%WWWDIR%%/plugins/main_sections/img/ms_all_computers.png @@ -344,6 +357,8 @@ %%WWWDIR%%/plugins/main_sections/ms_config/ms_snmp_config.php %%WWWDIR%%/plugins/main_sections/ms_config/require/function_blacklist.php %%WWWDIR%%/plugins/main_sections/ms_console/ms_console.php +%%WWWDIR%%/plugins/main_sections/ms_cve_correspondance/ms_cve_correspondance.php +%%WWWDIR%%/plugins/main_sections/ms_cve_history/ms_cve_history.php %%WWWDIR%%/plugins/main_sections/ms_cve_search/ms_cve_search.php %%WWWDIR%%/plugins/main_sections/ms_debug/ms_debug.php %%WWWDIR%%/plugins/main_sections/ms_dict/ms_dict.php @@ -384,6 +399,7 @@ %%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_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 %%WWWDIR%%/plugins/main_sections/ms_stats/files/ms_stats_top_soft.txt @@ -400,7 +416,6 @@ %%WWWDIR%%/plugins/main_sections/ms_teledeploy/ms_tele_compress.php %%WWWDIR%%/plugins/main_sections/ms_teledeploy/ms_tele_modify.php %%WWWDIR%%/plugins/main_sections/ms_teledeploy/ms_tele_package.php -%%WWWDIR%%/plugins/main_sections/ms_teledeploy/ms_tele_package_new.php %%WWWDIR%%/plugins/main_sections/ms_teledeploy/ms_tele_popup_active.php %%WWWDIR%%/plugins/main_sections/ms_teledeploy/ms_tele_stats.php %%WWWDIR%%/plugins/main_sections/ms_teledeploy/views/activate_form_view.php @@ -447,6 +462,7 @@ %%WWWDIR%%/plugins/snmp_detail/sd_virtualmachines/sd_virtualmachines.php %%WWWDIR%%/plugins/snmp_detail/snmp_config.txt %%WWWDIR%%/require/aide_developpement.php +%%WWWDIR%%/require/archive/ArchiveComputer.php %%WWWDIR%%/require/assets/AssetsCategory.php %%WWWDIR%%/require/charts/StatsChartsRenderer.php %%WWWDIR%%/require/commandLine/CommandLine.php @@ -491,6 +507,7 @@ %%WWWDIR%%/require/function_wol.php %%WWWDIR%%/require/header.php %%WWWDIR%%/require/html_header.php +%%WWWDIR%%/require/ipdiscover/Ipdiscover.php %%WWWDIR%%/require/mail/NotificationMail.php %%WWWDIR%%/require/menu/ComputerMenuRenderer.php %%WWWDIR%%/require/menu/MainMenuRenderer.php @@ -512,6 +529,7 @@ %%WWWDIR%%/require/search/LegacySearch.php %%WWWDIR%%/require/search/SQLCache.php %%WWWDIR%%/require/search/Search.php +%%WWWDIR%%/require/search/SoftwareSearch.php %%WWWDIR%%/require/search/TranslationSearch.php %%WWWDIR%%/require/snmp/Snmp.php %%WWWDIR%%/require/softwares/SoftwareCategory.php @@ -614,7 +632,6 @@ %%WWWDIR%%/vendor/phpmailer/phpmailer/composer.json %%WWWDIR%%/vendor/phpmailer/phpmailer/get_oauth_token.php %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-af.php -%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-am.php %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php @@ -638,6 +655,7 @@ %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-hr.php %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php +%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php Modified: head/net-mgmt/ocsinventory-server/Makefile ============================================================================== --- head/net-mgmt/ocsinventory-server/Makefile Fri Oct 2 05:41:11 2020 (r550899) +++ head/net-mgmt/ocsinventory-server/Makefile Fri Oct 2 06:06:54 2020 (r550900) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ocsinventory-server -PORTVERSION= 2.7 +PORTVERSION= 2.8 CATEGORIES= net-mgmt MAINTAINER= dgeo@centrale-marseille.fr Modified: head/net-mgmt/ocsinventory-server/distinfo ============================================================================== --- head/net-mgmt/ocsinventory-server/distinfo Fri Oct 2 05:41:11 2020 (r550899) +++ head/net-mgmt/ocsinventory-server/distinfo Fri Oct 2 06:06:54 2020 (r550900) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584518830 -SHA256 (OCSInventory-NG-OCSInventory-Server-2.7_GH0.tar.gz) = 3b7ab18160443ef8b691cbbb0fc4137c23b8d90d87d5459934439d0d90478ebb -SIZE (OCSInventory-NG-OCSInventory-Server-2.7_GH0.tar.gz) = 121007 +TIMESTAMP = 1601466328 +SHA256 (OCSInventory-NG-OCSInventory-Server-2.8_GH0.tar.gz) = ef6037c4018c8d55ff4fd66fe5b3d40d032a605aaeac2fb20f8d6f4e1842aa66 +SIZE (OCSInventory-NG-OCSInventory-Server-2.8_GH0.tar.gz) = 123378 Modified: head/net-mgmt/ocsinventory-server/pkg-plist ============================================================================== --- head/net-mgmt/ocsinventory-server/pkg-plist Fri Oct 2 05:41:11 2020 (r550899) +++ head/net-mgmt/ocsinventory-server/pkg-plist Fri Oct 2 06:06:54 2020 (r550900) @@ -21,7 +21,6 @@ %%DATADIR%%/Apache/Ocsinventory/Interface/Updates.pm %%DATADIR%%/Apache/Ocsinventory/Map.pm %%DATADIR%%/Apache/Ocsinventory/Plugins.pm -%%DATADIR%%/Apache/Ocsinventory/Plugins/Apache.pm %%DATADIR%%/Apache/Ocsinventory/Plugins/Modules.pm %%DATADIR%%/Apache/Ocsinventory/SOAP.pm %%DATADIR%%/Apache/Ocsinventory/Server/Capacities/Datafilter.pm @@ -47,6 +46,7 @@ %%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Data.pm %%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Export.pm %%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Filter.pm +%%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Software.pm %%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Update.pm %%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Update/AccountInfos.pm %%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Update/Hardware.pm @@ -63,10 +63,10 @@ %%DATADIR%%/Api/Ocsinventory/Restapi/Computer/Get/ComputersSearch.pm %%DATADIR%%/Api/Ocsinventory/Restapi/Ipdiscover/Get/Ipdiscover.pm %%DATADIR%%/Api/Ocsinventory/Restapi/Ipdiscover/Get/IpdiscoverNetwork.pm +%%DATADIR%%/Api/Ocsinventory/Restapi/Ipdiscover/Get/IpdiscoverTag.pm %%DATADIR%%/Api/Ocsinventory/Restapi/Loader.pm %%DATADIR%%/Api/Ocsinventory/Restapi/README.md %%DATADIR%%/Api/Ocsinventory/Restapi/References/api.json -%%DATADIR%%/Api/Ocsinventory/Restapi/Snmp/Get/Snmp.pm %%DATADIR%%/Api/Ocsinventory/Restapi/Snmp/Get/SnmpId.pm %%DATADIR%%/Api/Ocsinventory/Restapi/Snmp/Get/SnmpIdField.pm %%DATADIR%%/Api/Ocsinventory/Restapi/Snmp/Get/SnmpListId.pm