rpms/cacti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: rpms:e15cc9bd2ace2e1851ad20d4dfe3e9541906adca
Branches Tags
rpms:f39
..
compare: rpms:0ec8859633eba50dcff01e472d782bf5144fee2d
Branches Tags
rpms:f39

No commits in common. "e15cc9bd2ace2e1851ad20d4dfe3e9541906adca" and "0ec8859633eba50dcff01e472d782bf5144fee2d" have entirely different histories.
e15cc9bd2a ... 0ec8859633

6 changed files with 31 additions and 95 deletions
Show Stats Expand all files Collapse all files

6
.gitignore vendored
View File

@ -52,9 +52,3 @@
/cacti-1.2.15.tar.gz
/cacti-1.2.16.tar.gz
/cacti-1.2.17.tar.gz
/cacti-1.2.19.tar.gz
/cacti-1.2.20.tar.gz
/cacti-1.2.21.tar.gz
/cacti-1.2.22.tar.gz
/cacti-1.2.23.tar.gz
/cacti-1.2.25.tar.gz

8
cacti-1.2.x-csrf-secret.patch
View File

@ -1,11 +1,11 @@
--- 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;
--- 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;
* 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

8
cacti-1.2.x-disable_log_rotation.patch
View File

@ -1,11 +1,11 @@
--- 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;
--- 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;
* Disable log rotation settings for packagers
*/
-$disable_log_rotation = false;
+$disable_log_rotation = true;
/**
/*
* Optional parameters to define scripts and resource paths. These

14
cacti-httpd.conf
View File

@ -16,6 +16,12 @@ Alias /cacti /usr/share/cacti
# httpd 2.4
Require host localhost
</IfModule>
<IfModule !mod_authz_core.c>
# httpd 2.2
Order deny,allow
Deny from all
Allow from localhost
</IfModule>
</Directory>
<Directory /usr/share/cacti/install>
@ -35,9 +41,17 @@ Alias /cacti /usr/share/cacti
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
<IfModule !mod_authz_core.c>
Order deny,allow
Deny from all
</IfModule>
</Directory>
<Directory /usr/share/cacti/rra>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
<IfModule !mod_authz_core.c>
Order deny,allow
Deny from all
</IfModule>
</Directory>

88
cacti.spec
View File

@ -1,10 +1,10 @@
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Name: cacti
Version: 1.2.25
Version: 1.2.17
Release: 2%{?dist}
Summary: An rrd based graphing tool
License: GPL-2.0-or-later
License: GPLv2+
URL: https://www.cacti.net/
Source0: https://www.cacti.net/downloads/%{name}-%{version}.tar.gz
Source1: cacti-httpd.conf
@ -17,8 +17,6 @@ Patch1: cacti-1.2.x-csrf-secret.patch
BuildArch: noarch
BuildRequires: fdupes
Requires: httpd-filesystem
Requires: nginx-filesystem
Requires: php(httpd)
@ -65,7 +63,6 @@ Requires: rrdtool
Requires: net-snmp
Requires: net-snmp-utils
Requires: crontabs
Requires: logrotate
# Bundled JS library
Provides: bundled(js-jquery) = 3.4.1
@ -75,32 +72,12 @@ Provides: bundled(js-tree) = 3.3.8
%description
Cacti is a complete frontend to RRDTool. It stores all of the
necessary information to create graphs and populate them with
data in a MySQL database. The front-end is completely PHP
data in a MySQL database. The frontend is completely PHP
driven.
%package doc
Summary: Cacti documentation
%description doc
Documentation package for Cacti. Includes documentation and database seed file
%prep
%autosetup -p1
# rpmlint(E: git): remove source tree files
rm /usr/share/cacti/include/vendor/cldr-to-gettext-plural-rules/.gitignore
rm /usr/share/cacti/include/vendor/cldr-to-gettext-plural-rules/.gitattributes
# rpmlint(E: htaccess-files) - this is covered by supplemental apache config
rm /usr/share/cacti/mibs/.htaccess
rm /var/lib/cacti/cache/boost/.htaccess
rm /var/lib/cacti/cache/mibcache/.htaccess
rm /var/lib/cacti/cache/realtime/.htaccess
rm /var/lib/cacti/cache/spikekill/.htaccess
rm /var/lib/cacti/cli/.htaccess
rm /var/lib/cacti/rra/.htaccess
rm /var/lib/cacti/scripts/.htaccess
%build
# Nothing to build
@ -145,10 +122,6 @@ touch %{buildroot}/%{_localstatedir}/log/%{name}/%{name}_stderr.log
# Create csrf-secret.php
touch %{buildroot}/%{_localstatedir}/lib/%{name}/csrf/csrf-secret.php
# hardlink duplicate files
%fdupes %{buildroot}/%{_localstatedir}/lib/%{name}
%fdupes %{buildroot}/%{_localstatedir}/share/%{name}
# Migrate /usr/share/cacti/resource to /var/cacti/resource
%pretrans -p <lua>
path = "/usr/share/cacti/resource"
@ -202,14 +175,7 @@ fi
%files
%doc docs/ README.md cacti.sql
%license LICENSE LICENSE.txt
%license include/fa/LICENSE.txt
%license include/vendor/cldr-to-gettext-plural-rules/LICENSE
%license include/vendor/csrf/LICENSE.txt
%license include/vendor/gettext/LICENSE
%license include/vendor/flag-icon-css/LICENSE
%license include/vendor/phpmailer/LICENSE
%license LICENSE
%dir %{_sysconfdir}/%{name}
%dir %{_datadir}/%{name}
%dir %{_localstatedir}/lib/%{name}
@ -217,10 +183,8 @@ fi
%dir %attr(-,apache,apache) %{_localstatedir}/lib/%{name}/csrf
%dir %attr(-,apache,apache) %{_localstatedir}/lib/%{name}/scripts
%dir %attr(-,apache,apache) %{_localstatedir}/log/%{name}/
%ghost %attr(-,apache,apache) %{_localstatedir}/log/%{name}/%{name}.log
%ghost %attr(-,apache,apache) %{_localstatedir}/log/%{name}/%{name}_stderr.log
%config(noreplace) %attr(-,apache,apache) %{_localstatedir}/log/%{name}/%{name}.log
%config(noreplace) %attr(-,apache,apache) %{_localstatedir}/log/%{name}/%{name}_stderr.log
%config(noreplace) %{_sysconfdir}/cron.d/cacti
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%config(noreplace) %{_sysconfdir}/nginx/default.d/%{name}.conf
@ -243,54 +207,18 @@ fi
%{_datadir}/%{name}/scripts
%{_localstatedir}/lib/%{name}/scripts/*[^p]
%{_pkgdocdir}/cacti.README.fedora
%attr(0755,apache,apache) %{_localstatedir}/lib/%{name}/scripts/*.php
%attr(0755,apache,apache) %{_localstatedir}/lib/%{name}/scripts/*.pl
%attr(-,apache,apache) %{_localstatedir}/lib/%{name}/scripts/.htaccess
%attr(-,apache,apache) %{_localstatedir}/lib/%{name}/scripts/*.php
%attr(-,apache,apache) %{_localstatedir}/lib/%{name}/resource/
%attr(-,apache,apache) %{_localstatedir}/lib/%{name}/rra/
%attr(-,apache,apache) %{_localstatedir}/lib/%{name}/cache/
%attr(0755,apache,apache) %{_localstatedir}/lib/%{name}/cli/*php
%attr(0755,apache,apache) %{_localstatedir}/lib/%{name}/cli/*.pl
%attr(-,apache,apache) %{_localstatedir}/lib/%{name}/cli/*php
%attr(-,apache,apache) %{_localstatedir}/lib/%{name}/cli/.htaccess
%attr(0770,apache,apache) %{_localstatedir}/lib/%{name}/csrf/csrf-secret.php
%attr(-,root,root) %{_localstatedir}/lib/%{name}/include
%attr(-,root,root) %{_localstatedir}/lib/%{name}/lib
%ghost %{_datadir}/%{name}/resource.rpmmoved
%files doc
%{_docdir}
%changelog
* Thu Dec 21 2023 Neil Hanlon <neil@shrug.pw> - 1.2.25-2
- Modernize and fix rpmlint errors for re-review of orphan/retired package
* Wed Oct 04 2023 Carl George <carlwgeorge@fedoraproject.org> - 1.2.25-1
- Update to version 1.2.25
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.23-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jan 04 2023 Morten Stevens <mstevens@fedoraproject.org> - 1.2.23-1
- Update to 1.2.23
* Sat Oct 22 2022 Morten Stevens <mstevens@fedoraproject.org> - 1.2.22-1
- Update to 1.2.22
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.21-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu May 19 2022 Morten Stevens <mstevens@fedoraproject.org> - 1.2.21-1
- Update to 1.2.21
* Sun Apr 10 2022 Morten Stevens <mstevens@fedoraproject.org> - 1.2.20-1
- Update to 1.2.20
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Nov 02 2021 Morten Stevens <mstevens@fedoraproject.org> - 1.2.19-1
- Update to 1.2.19
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (cacti-1.2.25.tar.gz) = 15dec723102343b4457ef2baeb98789125c69cceb52f6baac1d002dde42e844da5189fd23f77fe1e72f0e80ee6d329d0df653af18e1f624012f00fbaaee62f34
SHA512 (cacti-1.2.17.tar.gz) = 94ae75b2494a91c536906c7bbeaa948d16c7ad96ed3a62c1eb21175f92c01787c6849960bbc791e04b3df46edbfd3cd787eb825bb423ce0814c0904edb2c915d