diff --git a/.gitignore b/.gitignore index 8c7760d..03ad099 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ rancid-2.3.6.tar.gz /rancid-3.9.tar.gz /rancid-3.11.tar.gz /rancid-3.12.tar.gz +/rancid-3.13.tar.gz diff --git a/rancid.cron b/rancid.cron index 26f8170..ce289a0 100644 --- a/rancid.cron +++ b/rancid.cron @@ -4,3 +4,4 @@ MAILTO=root HOME=/var/rancid # Run config differ hourly 1 * * * * rancid RANCIDBINDIR/rancid-run +3 3 * * * rancid /usr/bin/find /var/log/rancid -type f -mtime +30 -exec /usr/bin/rm {} \; diff --git a/rancid.spec b/rancid.spec index d50ff3b..141f312 100644 --- a/rancid.spec +++ b/rancid.spec @@ -1,15 +1,14 @@ Name: rancid -Version: 3.12 -Release: 4%{?dist} +Version: 3.13 +Release: 1%{?dist} Summary: Really Awesome New Cisco confIg Differ License: BSD with advertising URL: http://www.shrubbery.net/rancid/ -Source0: ftp://ftp.shrubbery.net/pub/%{name}/%{name}-%{version}.tar.gz +Source0: https://shrubbery.net/pub/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.cron -Source2: %{name}.logrotate Patch0: %{name}-Makefile.patch - +Patch1: %{name}-configure-no-ping-test.patch BuildRequires: make BuildRequires: gcc @@ -30,7 +29,6 @@ Requires: findutils Requires: expect >= 5.40 Requires: perl-interpreter Requires: iputils -Requires: logrotate %description RANCID monitors a router's (or more generally a device's) configuration, @@ -40,7 +38,8 @@ including software and hardware (cards, serial numbers, etc) and uses CVS %prep %setup -q -n %{name}-%{version} -%patch0 -p1 +%patch0 -p1 -b .no-cflags +%patch1 -p1 -b .no-ping-check %build %configure \ @@ -67,12 +66,11 @@ for base in \ %{buildroot}/%{_bindir}/${base} done -install -D -p -m 0755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/cron.d/%{name} +install -D -p -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/cron.d/%{name} #Patch cron file to point to correct installation directory sed -i 's|RANCIDBINDIR|%{_libexecdir}/%{name}|g' %{buildroot}/%{_sysconfdir}/cron.d/%{name} -install -D -p -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} %pre getent group %{name} >/dev/null || groupadd -r %{name} @@ -90,7 +88,6 @@ exit 0 %attr(750,%{name},%{name}) %dir %{_sysconfdir}/%{name} %attr(640,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}/* %attr(644,root,root) %config(noreplace) %{_sysconfdir}/cron.d/%{name} -%attr(644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} #%%{_libexecdir}/%%{name}-files %{_libexecdir}/%{name} @@ -113,6 +110,12 @@ exit 0 %changelog +* Mon Mar 08 2021 Charles R. Anderson - 3.13-1 +- Update to 3.13 +- Use https rather than ftp for source0 +- Remove logrotate and add cron job to delete log files older than 30 days (rhbz#1873378) +- Disable configure ping syntax test since it fails in mock environment + * Wed Jan 27 2021 Fedora Release Engineering - 3.12-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index d905d3d..c551c63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rancid-3.12.tar.gz) = 0ce58c8cffaa7ddae57fa7c88b81028723b6ad137d87e39ea66c3f533c770654e626826f8bc4d875aabc463c5616811867973ac5e2c64d47a4c9646e255f632a +SHA512 (rancid-3.13.tar.gz) = 2dbd8a743a03cd94b474c08b0bb1868a991353690b9f3ff2828d16a3a102ca68e4092cb07f24ec4e57c4436e6657f3f2638f890069fbbd35d6c7a34d5bd55df5