From nobody Fri Jan 17 16:47:59 2025 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 4YZQdq4RC5z5lBCt; Fri, 17 Jan 2025 16:47:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YZQdq3Txnz3K44; Fri, 17 Jan 2025 16:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737132479; 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=craSAGk9LDnRxC+ng3H/tDKKp3LB8Web67WDnu1gTw8=; b=OdOlZeZurjmlJwgx90B1hBEHMvOqzHroglsRTaFHjOmUaS2t7UAyd3p895Dp2D31hd60Ps q8LrOeepBvJ+I5ZenMT4Se4SwchOUTYoAsfD36JMk2vQBvGWeJzEqn588+zwHa4vsvUbQU NfLffQern+JCa5/itAcOTJyfOg+KPdQwSgx/1+hlkYKIMHu8uE119ZNsUdKhYCVjqoYilp YdDtaD88ReYnV/uULqsRnB4yv532/eFggfkjjKqIwz7tRmVMxDKtDVwAF4sntnoogonq2S 6Ivt8t4cler1lNwt5MVj4eiAJXmSf89VxvTJY7oGSwN9YZ8YaSb56DhyzMusHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737132479; 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=craSAGk9LDnRxC+ng3H/tDKKp3LB8Web67WDnu1gTw8=; b=T4qDEtasEP4YgKZJUIh/tRfr0W29UFSDi8HCOmdiOC8JHvTccmhQk3c5ioCCt3uT0GmpqZ UdG4b7Zde9q/ogHwMRSiqskWXuASbIA/7yHomJ/ryc1BD11pHXu51ByuOnpRFXXp8Gomo9 bwLNOH5MN68NZ6+8Vksb+osa+Vcm6lODdttqAZNGmjh0iCsszr3pU7FWhHA4VmsjQevcYu zDoLdiRFB02OVpn5zWZ0KGA77+UI2mu9Pt5hVYtlrAyQjwvM7ZzJDEz7jnrLVg2Y7bXvl7 yPQZjkgV5I+zyQE6Gqkilufrgvm7lk3Mm3uue4+lbjyTO5Y89yfhJe5AYHKEdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737132479; a=rsa-sha256; cv=none; b=vuaSOS2CP6P9l0rSlMYlY+vqHvKH7EPMRM+lTLFMdfts1mpX6HQHDcywt6o1D4vtX5NziG 3rbBmJ4XXZ9hRoZ2RrP1v5HokKtxClPzwZcmn4vUBh8E1hh/Do+/N2cP1pzIwQ30a5Mt34 SN5oUA7k8mzPBtC83jd+fA7s3PL4Ea7EWLgY1STzCWrWDreFGZNLo80ct31Xmo+KEtwLGr uwyFCOMB1er7tyDesDKCy9LWrZUJjqlnDcynUwb6BliY2KyZCq/43i45hZcDmS/jpmsx9X 0oiH4215wRb/KXZQ2BNBdMwtGsqCBgXQXmscEHG5ADb0MAofztMd0loHQVXQ3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YZQdq34D2z9bt; Fri, 17 Jan 2025 16:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50HGlxKq042900; Fri, 17 Jan 2025 16:47:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HGlxRb042897; Fri, 17 Jan 2025 16:47:59 GMT (envelope-from git) Date: Fri, 17 Jan 2025 16:47:59 GMT Message-Id: <202501171647.50HGlxRb042897@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: a3784b152ccd - 2025Q1 - net-mgmt/cacti: Update 1.2.26 =?utf-8?Q?=E2=86=92?= 1.2.28 (PHP 8.3 support and security fixes) 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: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: a3784b152ccd7ff13d78bb30bbe75e3364f2a2c1 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a3784b152ccd7ff13d78bb30bbe75e3364f2a2c1 commit a3784b152ccd7ff13d78bb30bbe75e3364f2a2c1 Author: Vladimir Druzenko AuthorDate: 2025-01-17 16:31:59 +0000 Commit: Vladimir Druzenko CommitDate: 2025-01-17 16:47:51 +0000 net-mgmt/cacti: Update 1.2.26 → 1.2.28 (PHP 8.3 support and security fixes) Security fixes in 1.2.27: GHSA-37x7-mfjv-mm7m Authentication Bypass when using using older password hashes GHSA-7cmj-g5qc-pj88 RCE vulnerability when importing packages GHSA-cx8g-hvq8-p2rv RCE vulnerability when plugins include files GHSA-gj3f-p326-gh8r SQL Injection vulnerability when using tree rules through Automation API GHSA-grj5-8fcj-34gh XSS vulnerability when using JavaScript based messaging API GHSA-jrxg-8wh8-943x SQL Injection vulnerability when using form templates GHSA-p4ch-7hjw-6m87 XSS vulnerability when reading tree rules with Automation API GHSA-rqc8-78cm-85j3 XSS vulnerability when managing data queries GHSA-vjph-r677-6pcc SQL Injection vulnerability when retrieving graphs using Automation API Security fixes in 1.2.28: GHSA-49f2-hwx9-qffr XSS vulnerability when creating external links with the consolenewsection parameter GHSA-fgc6-g8gc-wcg5 XSS vulnerability when creating external links with the title parameter GHSA-gxq4-mv8h-6qj4 RCE vulnerability can be executed via Log Poisoning GHSA-wh9c-v56x-v77c XSS vulnerability when creating external links with the fileurl parameter Also 1.2.27 contains fixes for PHP 8.3 compatibility which is default in ports now. Changelogs: http://www.cacti.net/info/changelog/1.2.27 http://www.cacti.net/info/changelog/1.2.28 PR: 284037 Approved by: Michael Muenz (maintainer) MFH: 2025Q1 (cherry picked from commit 75e2ca30e765f24d07c12dc8744a40b0b90f783e) --- net-mgmt/cacti/Makefile | 4 ++-- net-mgmt/cacti/distinfo | 6 +++--- net-mgmt/cacti/pkg-plist | 14 +++++++++++++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile index 232c1041b964..ca4863ff9530 100644 --- a/net-mgmt/cacti/Makefile +++ b/net-mgmt/cacti/Makefile @@ -1,5 +1,5 @@ PORTNAME= cacti -DISTVERSION= 1.2.26 +DISTVERSION= 1.2.28 CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ \ ftp://ftpmirror.uk/freebsd-ports/cacti/ @@ -47,7 +47,7 @@ SUB_LIST= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \ post-patch: @${FIND} ${WRKSRC} -name \*.orig -delete; \ - ${MV} ${WRKSRC}/include/config.php ${WRKSRC}/include/config.php.sample + ${MV} ${WRKSRC}/include/config.php.dist ${WRKSRC}/include/config.php.sample ${RM} -r ${WRKSRC}/log ${WRKSRC}/rra do-install: diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo index 91467bfa954e..87cc857daaea 100644 --- a/net-mgmt/cacti/distinfo +++ b/net-mgmt/cacti/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1708196412 -SHA256 (cacti-1.2.26.tar.gz) = 1d2ed4479588540b63c77a662b3b7e841e23e63e786c47de9e7a8b558a395db0 -SIZE (cacti-1.2.26.tar.gz) = 43637358 +TIMESTAMP = 1737039609 +SHA256 (cacti-1.2.28.tar.gz) = 4a095821a9435e1b9c8294e709365f67e59dd7696c3f3feffa9cd9ace1d8cea7 +SIZE (cacti-1.2.28.tar.gz) = 46785888 diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist index 9911261ce9d0..74d262472d1c 100644 --- a/net-mgmt/cacti/pkg-plist +++ b/net-mgmt/cacti/pkg-plist @@ -13,7 +13,6 @@ %%CACTIDIR%%/automation_snmp.php %%CACTIDIR%%/automation_templates.php %%CACTIDIR%%/automation_tree_rules.php -%%CACTIDIR%%/boost_rrdupdate.php %%CACTIDIR%%/cache/boost/.htaccess %%CACTIDIR%%/cache/boost/index.php %%CACTIDIR%%/cache/index.php @@ -79,6 +78,9 @@ %%CACTIDIR%%/color.php %%CACTIDIR%%/color_templates.php %%CACTIDIR%%/color_templates_items.php +%%CACTIDIR%%/contrib/.htaccess +%%CACTIDIR%%/contrib/README.md +%%CACTIDIR%%/contrib/index.php %%CACTIDIR%%/data_debug.php %%CACTIDIR%%/data_input.php %%CACTIDIR%%/data_queries.php @@ -125,6 +127,7 @@ %%CACTIDIR%%/docs/How-To-Determine-Template-Version.html %%CACTIDIR%%/docs/How-To-Existing-SNMP-Data-Queries.html %%CACTIDIR%%/docs/How-To-New-SNMP-Data-Queries.html +%%CACTIDIR%%/docs/How-To-Poller-5-to-1-min.html %%CACTIDIR%%/docs/How-To-SSH-Tunnels.html %%CACTIDIR%%/docs/How-To-Script-Data-Queries.html %%CACTIDIR%%/docs/How-To-Setup-Remote-Pollers.html @@ -198,6 +201,7 @@ %%CACTIDIR%%/docs/Viewing-Graphs.html %%CACTIDIR%%/docs/apache_template_config.html %%CACTIDIR%%/docs/audit_schema.sql +%%CACTIDIR%%/docs/convert-from-package-to-source-debian-ubuntu.html %%CACTIDIR%%/docs/images/apache-template-preview.png %%CACTIDIR%%/docs/images/cacti-https.PNG %%CACTIDIR%%/docs/images/cacti-log.png @@ -452,6 +456,9 @@ %%CACTIDIR%%/docs/images/plugins-dependencies.png %%CACTIDIR%%/docs/images/plugins-uninstall.png %%CACTIDIR%%/docs/images/plugins.png +%%CACTIDIR%%/docs/images/poller-5-1-change-profile.png +%%CACTIDIR%%/docs/images/poller-5-1-preset-1min.png +%%CACTIDIR%%/docs/images/poller-5-1-preset-default.png %%CACTIDIR%%/docs/images/principles-of-operation.png %%CACTIDIR%%/docs/images/r-dev1.png %%CACTIDIR%%/docs/images/r-dev2.png @@ -2623,6 +2630,7 @@ %%CACTIDIR%%/include/js/jstree.js %%CACTIDIR%%/include/js/pace.js %%CACTIDIR%%/include/js/purify.js +%%CACTIDIR%%/include/js/purify.js.map %%CACTIDIR%%/include/js/screenfull.js %%CACTIDIR%%/include/layout.js %%CACTIDIR%%/include/plugins.php @@ -2738,6 +2746,7 @@ %%CACTIDIR%%/include/themes/midwinter/Diff.css %%CACTIDIR%%/include/themes/midwinter/billboard.css %%CACTIDIR%%/include/themes/midwinter/billboard.midwinter.css +%%CACTIDIR%%/include/themes/midwinter/colors.css %%CACTIDIR%%/include/themes/midwinter/css/media/compact-landscape.css %%CACTIDIR%%/include/themes/midwinter/css/media/compact-portrait.css %%CACTIDIR%%/include/themes/midwinter/css/media/compact.css @@ -2757,6 +2766,7 @@ %%CACTIDIR%%/include/themes/midwinter/default/style.css %%CACTIDIR%%/include/themes/midwinter/default/style.min.css %%CACTIDIR%%/include/themes/midwinter/default/throbber.gif +%%CACTIDIR%%/include/themes/midwinter/fonts.css %%CACTIDIR%%/include/themes/midwinter/images/128/bar-alpha.png %%CACTIDIR%%/include/themes/midwinter/images/128/bar.png %%CACTIDIR%%/include/themes/midwinter/images/128/map.png @@ -3996,6 +4006,7 @@ %%CACTIDIR%%/install/templates/Cacti_Stats.xml.gz %%CACTIDIR%%/install/templates/Cisco_Router.xml.gz %%CACTIDIR%%/install/templates/Citrix_NetScaler_VPX.xml.gz +%%CACTIDIR%%/install/templates/Clearpass_policy_manager.xml.gz %%CACTIDIR%%/install/templates/ESXi_Device.xml.gz %%CACTIDIR%%/install/templates/Fortigate.xml.gz %%CACTIDIR%%/install/templates/Generic_SNMP_Device.xml.gz @@ -4061,6 +4072,7 @@ %%CACTIDIR%%/install/upgrades/1_2_23.php %%CACTIDIR%%/install/upgrades/1_2_25.php %%CACTIDIR%%/install/upgrades/1_2_26.php +%%CACTIDIR%%/install/upgrades/1_2_27.php %%CACTIDIR%%/install/upgrades/1_2_2.php %%CACTIDIR%%/install/upgrades/1_2_3.php %%CACTIDIR%%/install/upgrades/1_2_5.php