diff --git a/.gitignore b/.gitignore index c43553e..20f159b 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /cacti-1.2.20.tar.gz /cacti-1.2.21.tar.gz /cacti-1.2.22.tar.gz +/cacti-1.2.23.tar.gz diff --git a/cacti-1.2.x-csrf-secret.patch b/cacti-1.2.x-csrf-secret.patch index a071c6b..093935a 100644 --- a/cacti-1.2.x-csrf-secret.patch +++ b/cacti-1.2.x-csrf-secret.patch @@ -1,11 +1,11 @@ ---- cacti-1.2.9/include/config.php.orig 2020-02-10 02:25:45.000000000 +0100 -+++ cacti-1.2.9/include/config.php 2020-02-10 10:46:35.436772588 +0100 -@@ -124,7 +124,7 @@ $disable_log_rotation = false; +--- cacti-1.2.23/include/config.php.orig 2023-01-02 15:47:02.000000000 +0100 ++++ cacti-1.2.23/include/config.php 2023-01-04 10:36:19.834958775 +0100 +@@ -131,7 +131,7 @@ $disable_log_rotation = false; * the CRSF secret file. */ -//$path_csrf_secret = '/usr/share/cacti/resource/csrf-secret.php'; +$path_csrf_secret = '/var/lib/cacti/csrf/csrf-secret.php'; - /* + /** * The following are optional variables for debugging low level system diff --git a/cacti-1.2.x-disable_log_rotation.patch b/cacti-1.2.x-disable_log_rotation.patch index a072764..eee5489 100644 --- a/cacti-1.2.x-disable_log_rotation.patch +++ b/cacti-1.2.x-disable_log_rotation.patch @@ -1,11 +1,11 @@ ---- cacti-1.2.2/include/config.php.orig 2019-02-24 15:52:08.000000000 +0100 -+++ cacti-1.2.2/include/config.php 2019-02-25 13:31:22.313347085 +0100 -@@ -85,7 +85,7 @@ $cacti_db_session = false; +--- cacti-1.2.23/include/config.php.orig 2023-01-02 15:47:02.000000000 +0100 ++++ cacti-1.2.23/include/config.php 2023-01-04 10:31:04.844402154 +0100 +@@ -94,7 +94,7 @@ $cacti_db_session = false; * Disable log rotation settings for packagers */ -$disable_log_rotation = false; +$disable_log_rotation = true; - /* + /** * Optional parameters to define scripts and resource paths. These diff --git a/cacti.spec b/cacti.spec index e4df6cf..8b7a0b4 100644 --- a/cacti.spec +++ b/cacti.spec @@ -1,7 +1,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: cacti -Version: 1.2.22 +Version: 1.2.23 Release: 1%{?dist} Summary: An rrd based graphing tool License: GPLv2+ @@ -208,6 +208,7 @@ fi %{_localstatedir}/lib/%{name}/scripts/*[^p] %{_pkgdocdir}/cacti.README.fedora %attr(-,apache,apache) %{_localstatedir}/lib/%{name}/scripts/*.php +%attr(-,apache,apache) %{_localstatedir}/lib/%{name}/scripts/.htaccess %attr(-,apache,apache) %{_localstatedir}/lib/%{name}/resource/ %attr(-,apache,apache) %{_localstatedir}/lib/%{name}/rra/ %attr(-,apache,apache) %{_localstatedir}/lib/%{name}/cache/ @@ -219,6 +220,9 @@ fi %ghost %{_datadir}/%{name}/resource.rpmmoved %changelog +* Wed Jan 04 2023 Morten Stevens - 1.2.23-1 +- Update to 1.2.23 + * Sat Oct 22 2022 Morten Stevens - 1.2.22-1 - Update to 1.2.22 diff --git a/sources b/sources index ee3ce10..866a7df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cacti-1.2.22.tar.gz) = 95e96f8b05b07a1620bc4eae37250ea7e9e49383fe5e2c2993d06b735cb24b95229fb0788b588bc033ab0304ca82119a0cf9d24becb11f2a234c2a612c6dd965 +SHA512 (cacti-1.2.23.tar.gz) = cb5b12e7512470f057e32a8fc7e3dde7e658796e34c01cbac710c86449f59a6f5bf438bed7f780206d9a3132df9a34d0217431eaa05c7a6be223f0fdf6247fe0