From 1e06e49f151f7892cc67f7ec7135dca8e6c9c450 Mon Sep 17 00:00:00 2001 From: Kairo Francisco de Araujo Date: Thu, 3 Apr 2008 20:32:59 +0000 Subject: [PATCH 01/90] initial commit changelog on review #430377 Thu Apr 3 2008 Kairo Araujo - 1.23-6 - removed variable DATALIFE from atop.d and atop.crondaily Wed Apr 2 2008 Kairo Araujo - 1.23-5 - improved atop.d and atop.crondaily (Manuel Wolfshant) Mon Mar 31 2008 Kairo Araujo - 1.23-4 - logical bash bug on atop.d and atop.crondaily - implemented security on atop.d and atop.crondaily - common script for init and cron.daily Sat Mar 29 2008 Kairo Araujo - 1.23-3 - deleted duplicate "-p" on spec file (install) - modified comment about interval on atop.d and atop.crondaily - removed check atop.log on atop.d and atop.crondaily - created new section on atop.crondaily Thu Mar 27 2008 Kairo Araujo - 1.23-2 - removed atop start on %%post - atop.crondaily with exit after checking - created atop.sysconfig with variables - created atop.d (removed atop.crondaily call from cron.init) Thu Mar 27 2008 Kairo Araujo - 1.23-1 - update 1.23 - bug on source2 (init file) Sun Jan 27 2008 Kairo Araujo - 1.22-3 - removed minimal version from requires/build-requires - corrected variable in atop.crondaily - corrected comentary in atop.crondaily Sun Jan 27 2008 Kairo Araujo - 1.22-2 - corrected license tag to GPLv2+ - replaced references to atop (init file) - rebuild with Fedora mandatory flags (make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS") - chkconfig and service added at pre/post scriptlets - improved name in logrotate file configuration - corrected english description Sat Jan 26 2008 Kairo Araujo - 1.22-1 - Initial RPM release --- .cvsignore | 1 + atop.crondaily | 42 +++++++++++++++ atop.d | 41 +++++++++++++++ atop.init | 78 ++++++++++++++++++++++++++++ atop.logrotate | 16 ++++++ atop.spec | 137 +++++++++++++++++++++++++++++++++++++++++++++++++ atop.sysconfig | 13 +++++ sources | 1 + 8 files changed, 329 insertions(+) create mode 100644 atop.crondaily create mode 100644 atop.d create mode 100644 atop.init create mode 100644 atop.logrotate create mode 100644 atop.spec create mode 100644 atop.sysconfig diff --git a/.cvsignore b/.cvsignore index e69de29..f7a6120 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +atop-1.23.tar.gz diff --git a/atop.crondaily b/atop.crondaily new file mode 100644 index 0000000..00071a9 --- /dev/null +++ b/atop.crondaily @@ -0,0 +1,42 @@ +#!/bin/bash + +# load sysconfig atop + +[ -f /etc/sysconfig/atop ] && . /etc/sysconfig/atop +# Current Day format +[ -z $CURDAY ] || CURDAY=`date +%Y%m%d` +# Log files path +[ -z $LOGPATH ] || LOGPATH=/var/log/atop +# Binaries path +[ -z $BINPATH ] || BINPATH=/usr/bin +# PID File +[ -z $PIDFILE ] || PIDFILE=/var/run/atop.pid +# interval (default 10 minutes) +[ -z $INTERVAL ] || INTERVAL=600 + +start_atop() { + +# start atop for all processes with interval of $INTERVAL +# (by default 10) minutes +$BINPATH/atop -a -w $LOGPATH/atop_$CURDAY $INTERVAL > $LOGPATH/atop.log 2>&1 & +echo $! > $PIDFILE +} + +# verify if atop still runs for daily logging +# +if [ -f $PIDFILE ]; then + PID=`cat $PIDFILE` + if [ -s $PIDFILE ] && ps -p $PID | grep 'atop$' > /dev/null + then + kill -USR1 $PID # take final sample + sleep 3 + kill -TERM $PID + rm $PIDFILE + sleep 1 + start_atop + else + exit 1 + fi +fi +exit 0 + diff --git a/atop.d b/atop.d new file mode 100644 index 0000000..c985ad3 --- /dev/null +++ b/atop.d @@ -0,0 +1,41 @@ +#!/bin/bash + +# load sysconfig atop + +[ -f /etc/sysconfig/atop ] && . /etc/sysconfig/atop +# Current Day format +[ -z $CURDAY ] || CURDAY=`date +%Y%m%d` +# Log files path +[ -z $LOGPATH ] || LOGPATH=/var/log/atop +# Binaries path +[ -z $BINPATH ] || BINPATH=/usr/bin +# PID File +[ -z $PIDFILE ] || PIDFILE=/var/run/atop.pid +# interval (default 10 minutes) +[ -z $INTERVAL ] || INTERVAL=600 + + +start_atop() { +# start atop for all processes with interval of $INTERVAL +# (by default 10) minutes +$BINPATH/atop -a -w $LOGPATH/atop_$CURDAY $INTERVAL > $LOGPATH/atop.log 2>&1 & +echo $! > $PIDFILE +} + +# verify if atop still runs for daily logging +# +if [ -f $PIDFILE ]; then + PID=`cat $PIDFILE` + if [ -s $PIDFILE ] && ps -p $PID | grep 'atop$' > /dev/null + then + kill -USR1 $PID # take final sample + sleep 3 + kill -TERM $PID + rm $PIDFILE + sleep 1 + else + exit 1 + fi +fi +start_atop +exit 0 diff --git a/atop.init b/atop.init new file mode 100644 index 0000000..f3dcfc6 --- /dev/null +++ b/atop.init @@ -0,0 +1,78 @@ +#! /bin/bash +# +# atop advanced interactive monitor +# +# chkconfig: - 90 60 +# description: atop is advanced interactive monitor +# processname: atop +# pidfile: /var/run/atop.pid +# Source function library. +. /etc/init.d/functions + +RETVAL=0 + +# See how we were called. + +prog="atop" + +start() { + echo -n $"Starting $prog: " + + daemon atopd + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/atop + return $RETVAL +} + +stop() { + echo -n $"Stopping $prog: " + killproc atop 2>/dev/null + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/atop + return $RETVAL +} + +rhstatus() { + status atop +} + +restart() { + stop + start +} + +reload() { + echo -n $"Reloading atop daemon configuration: " + killproc atop -HUP + retval=$? + echo + return $RETVAL +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + restart + ;; + reload) + reload + ;; + status) + rhstatus + ;; + condrestart) + [ -f /var/lock/subsys/atop ] && restart || : + ;; + *) + echo $"Usage: $0 {start|stop|status|reload|restart|condrestart}" + exit 1 +esac + +exit $? diff --git a/atop.logrotate b/atop.logrotate new file mode 100644 index 0000000..933db60 --- /dev/null +++ b/atop.logrotate @@ -0,0 +1,16 @@ +/var/log/atop/atop.log { + missingok + weekly + rotate 4 + ifempty + create 0600 root root + postrotate +} +/var/log/atop/atop_* { + missingok + daily + rotate 1 + ifempty + create 0600 root root + postrotate +} diff --git a/atop.spec b/atop.spec new file mode 100644 index 0000000..9ced2ee --- /dev/null +++ b/atop.spec @@ -0,0 +1,137 @@ +Name: atop +Version: 1.23 +Release: 6%{?dist} +Summary: An advanced interactive monitor to view the load on system and process level + +Group: Applications/System +License: GPLv2+ +URL: http://www.atcomputing.nl/Tools/atop/ +Source0: http://www.atcomputing.nl/Tools/%{name}/packages/%{name}-%{version}.tar.gz +Source1: atop.logrotate +Source2: atop.init +Source3: atop.crondaily +Source4: atop.sysconfig +Source5: atop.d +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: ncurses +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service + +BuildRequires: zlib-devel +BuildRequires: ncurses-devel + +%description +An advanced interactive monitor for Linux-systems to view the load on +system-level and process-level. +The command atop has some major advantages compared to other +performance-monitors: + - Resource consumption by all processes + - Utilization of all relevant resources + - Permanent logging of resource utilization + - Highlight critical resources + - Watch activity only + - Watch deviations only + - Accumulated process activity per user + - Accumulated process activity per program +For more informations: http://www.atcomputing.nl/Tools/atop +The package does not make use of the patches available at +http://www.atcomputing.nl/Tools/atop/kernpatch.html + +%prep +%setup -q + +%build +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" + +%install +rm -rf $RPM_BUILD_ROOT +install -Dp -m 0755 atop $RPM_BUILD_ROOT%{_bindir}/atop +ln -s atop $RPM_BUILD_ROOT%{_bindir}/atopsar +install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 +install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 +install -Dp -m 0644 atop.cron $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/atop +install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/atop +install -Dp -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/atop +install -Dp -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/atop +install -Dp -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop +install -Dp -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/atopd +install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/chkconfig --add atop + +%preun +if [ $1 -eq 0 ]; then + /sbin/service atop stop &>/dev/null || : + /sbin/chkconfig --del atop +fi + +%postun +if [ $1 -ge 1 ]; then + /sbin/service atop condrestart &>/dev/null || : +fi + +%files +%defattr(-,root,root,-) +%doc AUTHOR COPYING README ChangeLog +%config(noreplace) %{_sysconfdir}/cron.d/atop +%config(noreplace) %{_sysconfdir}/logrotate.d/atop +%config(noreplace) %{_sysconfdir}/sysconfig/atop +%{_sysconfdir}/cron.daily/atop +%{_initrddir}/atop +%{_bindir}/atopsar +%{_bindir}/atop +%{_bindir}/atopd +%{_mandir}/man1/atop.1.gz +%{_mandir}/man1/atopsar.1.gz +%attr(0755,root,root) %dir %{_localstatedir}/log/atop + + +%changelog +* Thu Apr 3 2008 Kairo Araujo - 1.23-6 +- removed variable DATALIFE from atop.d and atop.crondaily + +* Wed Apr 2 2008 Kairo Araujo - 1.23-5 +- improved atop.d and atop.crondaily (Manuel Wolfshant) + +* Mon Mar 31 2008 Kairo Araujo - 1.23-4 +- logical bash bug on atop.d and atop.crondaily +- implemented security on atop.d and atop.crondaily +- common script for init and cron.daily + +* Sat Mar 29 2008 Kairo Araujo - 1.23-3 +- deleted duplicate "-p" on spec file (install) +- modified comment about interval on atop.d and atop.crondaily +- removed check atop.log on atop.d and atop.crondaily +- created new section on atop.crondaily + +* Thu Mar 27 2008 Kairo Araujo - 1.23-2 +- removed atop start on %%post +- atop.crondaily with exit after checking +- created atop.sysconfig with variables +- created atop.d (removed atop.crondaily call from cron.init) + +* Thu Mar 27 2008 Kairo Araujo - 1.23-1 +- update 1.23 +- bug on source2 (init file) + +* Sun Jan 27 2008 Kairo Araujo - 1.22-3 +- removed minimal version from requires/build-requires +- corrected variable in atop.crondaily +- corrected comentary in atop.crondaily + +* Sun Jan 27 2008 Kairo Araujo - 1.22-2 +- corrected license tag to GPLv2+ +- replaced references to atop (init file) +- rebuild with Fedora mandatory flags (make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS") +- chkconfig and service added at pre/post scriptlets +- improved name in logrotate file configuration +- corrected english description + +* Sat Jan 26 2008 Kairo Araujo - 1.22-1 +- Initial RPM release diff --git a/atop.sysconfig b/atop.sysconfig new file mode 100644 index 0000000..12d376a --- /dev/null +++ b/atop.sysconfig @@ -0,0 +1,13 @@ +# sysconfig atop +# + +# Current Day format +CURDAY=`date +%Y%m%d` +# Log files path +LOGPATH=/var/log/atop +# Binaries path +BINPATH=/usr/bin +# PID File +PIDFILE=/var/run/atop.pid +# interval (default 10 minutes) +INTERVAL=600 diff --git a/sources b/sources index e69de29..002cc30 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +ba1d733b9f0fcf8469a8e6c8e4d2d3b7 atop-1.23.tar.gz From 5b2ba438833137206b302474ae5fe3b8fff56e4a Mon Sep 17 00:00:00 2001 From: Kairo Francisco de Araujo Date: Mon, 5 May 2008 16:36:44 +0000 Subject: [PATCH 02/90] - add bug fixes for #445174 --- atop-1.23-cron.patch | 6 ++++++ atop.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 atop-1.23-cron.patch diff --git a/atop-1.23-cron.patch b/atop-1.23-cron.patch new file mode 100644 index 0000000..36e0452 --- /dev/null +++ b/atop-1.23-cron.patch @@ -0,0 +1,6 @@ +--- atop-1.23/atop.cron 2008-03-06 07:15:47.000000000 -0300 ++++ atop-1.23/atop.cron-fedora 2008-05-05 12:17:19.000000000 -0300 +@@ -1,2 +1,2 @@ + # start atop daily at midnight +-0 0 * * * root /etc/atop/atop.daily ++0 0 * * * root /etc/cron.daily/atop diff --git a/atop.spec b/atop.spec index 9ced2ee..478e5fe 100644 --- a/atop.spec +++ b/atop.spec @@ -1,6 +1,6 @@ Name: atop Version: 1.23 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -12,6 +12,7 @@ Source2: atop.init Source3: atop.crondaily Source4: atop.sysconfig Source5: atop.d +Patch0: atop-1.23-cron.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ncurses @@ -41,6 +42,7 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %prep %setup -q +%patch0 -p1 -b .cron %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -93,6 +95,9 @@ fi %changelog +* Mon May 5 2008 Kairo Araujo - 1.23-7 +- add bug fixes for #445174 + * Thu Apr 3 2008 Kairo Araujo - 1.23-6 - removed variable DATALIFE from atop.d and atop.crondaily From ff8a000a2e9fd7a07d490ad6907ee2502892db30 Mon Sep 17 00:00:00 2001 From: Kairo Francisco de Araujo Date: Mon, 21 Jul 2008 19:52:34 +0000 Subject: [PATCH 03/90] - add bug fixes for #455223 and #455375 logrotate output error: error: atop:prerotate or postrotate without endscript --- atop.logrotate | 2 ++ atop.spec | 7 ++++++- import.log | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 import.log diff --git a/atop.logrotate b/atop.logrotate index 933db60..75ea883 100644 --- a/atop.logrotate +++ b/atop.logrotate @@ -5,6 +5,7 @@ ifempty create 0600 root root postrotate + endscript } /var/log/atop/atop_* { missingok @@ -13,4 +14,5 @@ ifempty create 0600 root root postrotate + endscript } diff --git a/atop.spec b/atop.spec index 478e5fe..d26efc3 100644 --- a/atop.spec +++ b/atop.spec @@ -1,6 +1,6 @@ Name: atop Version: 1.23 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -95,6 +95,11 @@ fi %changelog +* Mon Jul 21 2008 Kairo Araujo - 1.23-8 +- add bug fixes for #455223 and #455375 + logrotate output error: + error: atop:prerotate or postrotate without endscript + * Mon May 5 2008 Kairo Araujo - 1.23-7 - add bug fixes for #445174 diff --git a/import.log b/import.log new file mode 100644 index 0000000..328a335 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +atop-1_23-8_fc8:HEAD:atop-1.23-8.fc8.src.rpm:1216659414 From e4405c41d0f45b5b3411536a0c8567ca39fc1acb Mon Sep 17 00:00:00 2001 From: Kairo Francisco de Araujo Date: Mon, 21 Jul 2008 20:05:08 +0000 Subject: [PATCH 04/90] Removed postrotate (no script for post executation) --- atop.logrotate | 4 ---- import.log | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/atop.logrotate b/atop.logrotate index 75ea883..bc9caa4 100644 --- a/atop.logrotate +++ b/atop.logrotate @@ -4,8 +4,6 @@ rotate 4 ifempty create 0600 root root - postrotate - endscript } /var/log/atop/atop_* { missingok @@ -13,6 +11,4 @@ rotate 1 ifempty create 0600 root root - postrotate - endscript } diff --git a/import.log b/import.log index 328a335..70fd162 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ atop-1_23-8_fc8:HEAD:atop-1.23-8.fc8.src.rpm:1216659414 +atop-1_23-8_fc8:HEAD:atop-1.23-8.fc8.src.rpm:1216660163 From a33edceaa39623defb3d374f6336c504f182428b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 03:01:41 +0000 Subject: [PATCH 05/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index d26efc3..0e923bb 100644 --- a/atop.spec +++ b/atop.spec @@ -1,6 +1,6 @@ Name: atop Version: 1.23 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -95,6 +95,9 @@ fi %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 1.23-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Jul 21 2008 Kairo Araujo - 1.23-8 - add bug fixes for #455223 and #455375 logrotate output error: From 941a217682bbbf1c8a7cf5fedc59f7042b1985a7 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 17:30:42 +0000 Subject: [PATCH 06/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 0e923bb..c634433 100644 --- a/atop.spec +++ b/atop.spec @@ -1,6 +1,6 @@ Name: atop Version: 1.23 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -95,6 +95,9 @@ fi %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1.23-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Feb 23 2009 Fedora Release Engineering - 1.23-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 6c2f5e68f4c088867e97b0bc83f6b06eba012f67 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:42:11 +0000 Subject: [PATCH 07/90] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fc4c612..a04d2dd 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: atop -# $Id$ +# $Id: Makefile,v 1.1 2008/04/03 20:13:54 kevin Exp $ NAME := atop SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f74dc09febefc29d60d450746cc1eecad88edc27 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:27:59 +0000 Subject: [PATCH 08/90] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 2 -- 3 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a04d2dd..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: atop -# $Id: Makefile,v 1.1 2008/04/03 20:13:54 kevin Exp $ -NAME := atop -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 70fd162..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -atop-1_23-8_fc8:HEAD:atop-1.23-8.fc8.src.rpm:1216659414 -atop-1_23-8_fc8:HEAD:atop-1.23-8.fc8.src.rpm:1216660163 From 64f4c8df4cf08930be27620b95d76faccf54972d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 21:05:41 -0600 Subject: [PATCH 09/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index c634433..a8e3bdd 100644 --- a/atop.spec +++ b/atop.spec @@ -1,6 +1,6 @@ Name: atop Version: 1.23 -Release: 10%{?dist} +Release: 11%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -95,6 +95,9 @@ fi %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.23-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Jul 24 2009 Fedora Release Engineering - 1.23-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From b0b2985065d50856b152aa35830e67b94931e4e1 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 21 Jun 2011 09:07:56 -0500 Subject: [PATCH 10/90] New upstream. Honors sysconfig. sysv->systemd. --- .gitignore | 1 + atop.d | 10 ++++----- atop.service | 9 ++++++++ atop.spec | 61 +++++++++++++++++++++++++++++++++++++--------------- sources | 2 +- 5 files changed, 60 insertions(+), 23 deletions(-) create mode 100644 atop.service diff --git a/.gitignore b/.gitignore index f7a6120..6956a9d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ atop-1.23.tar.gz +/atop-1.26.tar.gz diff --git a/atop.d b/atop.d index c985ad3..0195ad1 100644 --- a/atop.d +++ b/atop.d @@ -4,15 +4,15 @@ [ -f /etc/sysconfig/atop ] && . /etc/sysconfig/atop # Current Day format -[ -z $CURDAY ] || CURDAY=`date +%Y%m%d` +[ -z $CURDAY ] && CURDAY=`date +%Y%m%d` # Log files path -[ -z $LOGPATH ] || LOGPATH=/var/log/atop +[ -z $LOGPATH ] && LOGPATH=/var/log/atop # Binaries path -[ -z $BINPATH ] || BINPATH=/usr/bin +[ -z $BINPATH ] && BINPATH=/usr/bin # PID File -[ -z $PIDFILE ] || PIDFILE=/var/run/atop.pid +[ -z $PIDFILE ] && PIDFILE=/var/run/atop.pid # interval (default 10 minutes) -[ -z $INTERVAL ] || INTERVAL=600 +[ -z $INTERVAL ] && INTERVAL=600 start_atop() { diff --git a/atop.service b/atop.service new file mode 100644 index 0000000..5903945 --- /dev/null +++ b/atop.service @@ -0,0 +1,9 @@ +[Unit] +Description=advanced interactive monitor +After=syslog.target + +[Service] +ExecStart=/usr/bin/atop + +[Install] +WantedBy=multi-user.target diff --git a/atop.spec b/atop.spec index a8e3bdd..d1cc5b7 100644 --- a/atop.spec +++ b/atop.spec @@ -1,6 +1,6 @@ Name: atop -Version: 1.23 -Release: 11%{?dist} +Version: 1.26 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -8,20 +8,23 @@ License: GPLv2+ URL: http://www.atcomputing.nl/Tools/atop/ Source0: http://www.atcomputing.nl/Tools/%{name}/packages/%{name}-%{version}.tar.gz Source1: atop.logrotate -Source2: atop.init +#Source2: atop.init Source3: atop.crondaily Source4: atop.sysconfig Source5: atop.d +Source6: atop.service Patch0: atop-1.23-cron.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: ncurses -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service - BuildRequires: zlib-devel BuildRequires: ncurses-devel +BuildRequires: systemd-units + +Requires(post): systemd-units +Requires(post): systemd-sysv +Requires(preun): systemd-units +Requires(postun): systemd-units + %description An advanced interactive monitor for Linux-systems to view the load on @@ -55,29 +58,47 @@ install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 install -Dp -m 0644 atop.cron $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/atop install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/atop -install -Dp -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/atop +#install -Dp -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/atop install -Dp -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/atop install -Dp -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop install -Dp -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/atopd +install -Dp -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop %clean rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add atop +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi %preun -if [ $1 -eq 0 ]; then - /sbin/service atop stop &>/dev/null || : - /sbin/chkconfig --del atop +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable atop.service > /dev/null 2>&1 || : + /bin/systemctl stop atop.service > /dev/null 2>&1 || : fi %postun -if [ $1 -ge 1 ]; then - /sbin/service atop condrestart &>/dev/null || : +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart atop.service >/dev/null 2>&1 || : fi +%triggerun -- atop < 1.26-1 +# Save the current service runlevel info +# User must manually run systemd-sysv-convert --apply atop +# to migrate them to systemd targets +/usr/bin/systemd-sysv-convert --save atop >/dev/null 2>&1 ||: + +# Run these because the SysV package being removed won't do them +/sbin/chkconfig --del atop >/dev/null 2>&1 || : +/bin/systemctl try-restart atop.service >/dev/null 2>&1 || : + + %files %defattr(-,root,root,-) %doc AUTHOR COPYING README ChangeLog @@ -85,16 +106,22 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/atop %config(noreplace) %{_sysconfdir}/sysconfig/atop %{_sysconfdir}/cron.daily/atop -%{_initrddir}/atop +#%{_initrddir}/atop %{_bindir}/atopsar %{_bindir}/atop %{_bindir}/atopd %{_mandir}/man1/atop.1.gz %{_mandir}/man1/atopsar.1.gz %attr(0755,root,root) %dir %{_localstatedir}/log/atop - +%{_unitdir}/atop.service %changelog +* Tue Jun 21 2011 Jon Ciesla - 1.26-1 +- New upstream, BZ 657207. +- Migrated from sysv to systemd, BZ 659629. +- Modified to respect sysconfig settings, BZ 609124. +- Dropped explicit Requires for ncurses. + * Mon Feb 07 2011 Fedora Release Engineering - 1.23-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 002cc30..77c30fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ba1d733b9f0fcf8469a8e6c8e4d2d3b7 atop-1.23.tar.gz +9a72baf4c8f330973f1e2703f5a6c041 atop-1.26.tar.gz From 145afa35f05320f00136feb7a66d13d28ae2e088 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 16:02:21 -0600 Subject: [PATCH 11/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index d1cc5b7..1f0da25 100644 --- a/atop.spec +++ b/atop.spec @@ -1,6 +1,6 @@ Name: atop Version: 1.26 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -116,6 +116,9 @@ fi %{_unitdir}/atop.service %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 1.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Jun 21 2011 Jon Ciesla - 1.26-1 - New upstream, BZ 657207. - Migrated from sysv to systemd, BZ 659629. From 93e9a80807ecd70e398b391044e3291b8d0b5fd3 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 13 Apr 2012 07:11:24 -0500 Subject: [PATCH 12/90] Add hardened build. --- atop.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 1f0da25..a2a9925 100644 --- a/atop.spec +++ b/atop.spec @@ -1,6 +1,7 @@ +%define _hardened_build 1 Name: atop Version: 1.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -116,6 +117,9 @@ fi %{_unitdir}/atop.service %changelog +* Fri Apr 13 2012 Jon Ciesla - 1.26-3 +- Add hardened build. + * Thu Jan 12 2012 Fedora Release Engineering - 1.26-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 4e0c51b8022b55d34cb705c61d1d066bd2ce04a3 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 9 May 2012 08:07:06 -0500 Subject: [PATCH 13/90] Drop logrotate, fix cron. --- atop.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/atop.spec b/atop.spec index a2a9925..eaf30a8 100644 --- a/atop.spec +++ b/atop.spec @@ -1,20 +1,20 @@ %define _hardened_build 1 Name: atop Version: 1.26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System License: GPLv2+ URL: http://www.atcomputing.nl/Tools/atop/ Source0: http://www.atcomputing.nl/Tools/%{name}/packages/%{name}-%{version}.tar.gz -Source1: atop.logrotate +#Source1: atop.logrotate #Source2: atop.init Source3: atop.crondaily Source4: atop.sysconfig Source5: atop.d Source6: atop.service -Patch0: atop-1.23-cron.patch +#Patch0: atop-1.23-cron.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -46,7 +46,7 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %prep %setup -q -%patch0 -p1 -b .cron +#%patch0 -p1 -b .cron %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -58,9 +58,9 @@ ln -s atop $RPM_BUILD_ROOT%{_bindir}/atopsar install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 install -Dp -m 0644 atop.cron $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/atop -install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/atop +#install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/atop #install -Dp -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/atop -install -Dp -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/atop +install -Dp -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/atop/atop.daily install -Dp -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop install -Dp -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/atopd install -Dp -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/atop.service @@ -104,9 +104,9 @@ fi %defattr(-,root,root,-) %doc AUTHOR COPYING README ChangeLog %config(noreplace) %{_sysconfdir}/cron.d/atop -%config(noreplace) %{_sysconfdir}/logrotate.d/atop +#%config(noreplace) %{_sysconfdir}/logrotate.d/atop %config(noreplace) %{_sysconfdir}/sysconfig/atop -%{_sysconfdir}/cron.daily/atop +%{_sysconfdir}/atop/atop.daily #%{_initrddir}/atop %{_bindir}/atopsar %{_bindir}/atop @@ -117,6 +117,10 @@ fi %{_unitdir}/atop.service %changelog +* Wed May 09 2012 Jon Ciesla - 1.26-4 +- Dropped logrotate, conflicts with atop's logging, BZ 542598. +- Corrected cron config, BZ 819523. + * Fri Apr 13 2012 Jon Ciesla - 1.26-3 - Add hardened build. From edc034af2b01fb3afbe516de94855b7f9f4a2638 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 11 May 2012 08:13:39 -0500 Subject: [PATCH 14/90] Fix cron and logrotate. --- README.fedora | 14 ++++++++++++++ atop-1.26-cron.patch | 6 ++++++ atop.logrotate | 9 +-------- atop.spec | 24 +++++++++++++++--------- 4 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 README.fedora create mode 100644 atop-1.26-cron.patch diff --git a/README.fedora b/README.fedora new file mode 100644 index 0000000..add1d50 --- /dev/null +++ b/README.fedora @@ -0,0 +1,14 @@ +A note on logs: + +The /var/log/atop/atop.log file is rotated by logrotate. + +The other, date-stamped logfiles, cannot be correctly handled by logrotate. +Since upstream doesn't provide a method for pruning these, I'm not attempting to do so in the +default configuration of the RPM. If you need to do so, use something like this: + +find /var/log/atop/atop_* -mtime +5 -exec rm {} \; + +This would remove anything older than 5 days, and could be placed in a cron job, etc. + +-Jon Ciesla +2012-05-11 diff --git a/atop-1.26-cron.patch b/atop-1.26-cron.patch new file mode 100644 index 0000000..9174fd9 --- /dev/null +++ b/atop-1.26-cron.patch @@ -0,0 +1,6 @@ +--- atop.cron~ 2010-11-17 06:47:04.000000000 -0600 ++++ atop.cron 2012-05-10 08:55:45.101712473 -0500 +@@ -1,2 +1,2 @@ + # start atop daily at midnight +-0 0 * * * root /etc/atop/atop.daily ++0 0 * * * root /etc/rc.d/init.d/atop condrestart diff --git a/atop.logrotate b/atop.logrotate index bc9caa4..6253c74 100644 --- a/atop.logrotate +++ b/atop.logrotate @@ -2,13 +2,6 @@ missingok weekly rotate 4 - ifempty - create 0600 root root -} -/var/log/atop/atop_* { - missingok - daily - rotate 1 - ifempty + notifempty create 0600 root root } diff --git a/atop.spec b/atop.spec index eaf30a8..53a8ac9 100644 --- a/atop.spec +++ b/atop.spec @@ -1,20 +1,21 @@ %define _hardened_build 1 Name: atop Version: 1.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System License: GPLv2+ URL: http://www.atcomputing.nl/Tools/atop/ Source0: http://www.atcomputing.nl/Tools/%{name}/packages/%{name}-%{version}.tar.gz -#Source1: atop.logrotate +Source1: atop.logrotate #Source2: atop.init Source3: atop.crondaily Source4: atop.sysconfig Source5: atop.d Source6: atop.service -#Patch0: atop-1.23-cron.patch +Source7: README.fedora +Patch0: atop-1.26-cron.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -46,7 +47,7 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %prep %setup -q -#%patch0 -p1 -b .cron +%patch0 -p0 -b .cron %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -58,13 +59,14 @@ ln -s atop $RPM_BUILD_ROOT%{_bindir}/atopsar install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 install -Dp -m 0644 atop.cron $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/atop -#install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/atop +install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/atop #install -Dp -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/atop -install -Dp -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/atop/atop.daily +#install -Dp -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/atop/atop.daily install -Dp -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop install -Dp -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/atopd install -Dp -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop +install -m 0644 %{SOURCE7} . %clean rm -rf $RPM_BUILD_ROOT @@ -102,11 +104,11 @@ fi %files %defattr(-,root,root,-) -%doc AUTHOR COPYING README ChangeLog +%doc AUTHOR COPYING README ChangeLog README.fedora %config(noreplace) %{_sysconfdir}/cron.d/atop -#%config(noreplace) %{_sysconfdir}/logrotate.d/atop +%config(noreplace) %{_sysconfdir}/logrotate.d/atop %config(noreplace) %{_sysconfdir}/sysconfig/atop -%{_sysconfdir}/atop/atop.daily +#%{_sysconfdir}/atop/atop.daily #%{_initrddir}/atop %{_bindir}/atopsar %{_bindir}/atop @@ -117,6 +119,10 @@ fi %{_unitdir}/atop.service %changelog +* Fri May 11 2012 Jon Ciesla - 1.26-5 +- Re-add atop.log logrotate section. +- Modify cron setup per BZ 445174 comment #6. + * Wed May 09 2012 Jon Ciesla - 1.26-4 - Dropped logrotate, conflicts with atop's logging, BZ 542598. - Corrected cron config, BZ 819523. From 03e0a55bb716e82ad8562814fba9da4c042c58c6 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 14 May 2012 09:08:22 -0500 Subject: [PATCH 15/90] Fix, silence cron. --- atop-1.26-cron.patch | 2 +- atop.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/atop-1.26-cron.patch b/atop-1.26-cron.patch index 9174fd9..1a1ec94 100644 --- a/atop-1.26-cron.patch +++ b/atop-1.26-cron.patch @@ -3,4 +3,4 @@ @@ -1,2 +1,2 @@ # start atop daily at midnight -0 0 * * * root /etc/atop/atop.daily -+0 0 * * * root /etc/rc.d/init.d/atop condrestart ++0 0 * * * root /bin/systemctl try-restart atop.service > /dev/null 2>&1 || : diff --git a/atop.spec b/atop.spec index 53a8ac9..f244ac4 100644 --- a/atop.spec +++ b/atop.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: atop Version: 1.26 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -119,6 +119,9 @@ fi %{_unitdir}/atop.service %changelog +* Mon May 14 2012 Jon Ciesla - 1.26-6 +- Fix cron patch for systemd, BZ 821104. + * Fri May 11 2012 Jon Ciesla - 1.26-5 - Re-add atop.log logrotate section. - Modify cron setup per BZ 445174 comment #6. From c1d5b9d2f515e378ccad47cfca2adb28b8f0949a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 12:06:02 -0500 Subject: [PATCH 16/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index f244ac4..41e401b 100644 --- a/atop.spec +++ b/atop.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: atop Version: 1.26 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -119,6 +119,9 @@ fi %{_unitdir}/atop.service %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 1.26-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon May 14 2012 Jon Ciesla - 1.26-6 - Fix cron patch for systemd, BZ 821104. From 8f9c4b6b78b19c72f9bcf15d83a30fb45676d956 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 24 Jul 2012 13:45:19 -0500 Subject: [PATCH 17/90] Unit file fix. --- atop.service | 5 ++++- atop.spec | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/atop.service b/atop.service index 5903945..49b8811 100644 --- a/atop.service +++ b/atop.service @@ -3,7 +3,10 @@ Description=advanced interactive monitor After=syslog.target [Service] -ExecStart=/usr/bin/atop +Type=forking +PIDFile=/var/run/atop.pid +ExecStart=/usr/bin/atopd +ExecStop=/bin/rm -f /var/run/atop.pid [Install] WantedBy=multi-user.target diff --git a/atop.spec b/atop.spec index 41e401b..4d1aeb9 100644 --- a/atop.spec +++ b/atop.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: atop Version: 1.26 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -119,6 +119,9 @@ fi %{_unitdir}/atop.service %changelog +* Tue Jul 24 2012 Jon Ciesla - 1.26-8 +- Unit file fix, BZ 840942. + * Wed Jul 18 2012 Fedora Release Engineering - 1.26-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 82257d76e5da9806b501429362d1d9b580313564 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 11:20:47 -0600 Subject: [PATCH 18/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 4d1aeb9..fd06c40 100644 --- a/atop.spec +++ b/atop.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: atop Version: 1.26 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -119,6 +119,9 @@ fi %{_unitdir}/atop.service %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1.26-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Tue Jul 24 2012 Jon Ciesla - 1.26-8 - Unit file fix, BZ 840942. From 02db0cf07aa8866e2410626e8cf572afa8436961 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 1 Mar 2013 08:21:34 -0600 Subject: [PATCH 19/90] 2.0.2. --- .gitignore | 1 + atop.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6956a9d..725d659 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ atop-1.23.tar.gz /atop-1.26.tar.gz +/atop-2.0.2.tar.gz diff --git a/atop.spec b/atop.spec index fd06c40..ef04afe 100644 --- a/atop.spec +++ b/atop.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: atop -Version: 1.26 -Release: 9%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -119,6 +119,9 @@ fi %{_unitdir}/atop.service %changelog +* Fri Mar 01 2013 Jon Ciesla - 2.0.2-1 +- Latest upstream, BZ 916908. + * Wed Feb 13 2013 Fedora Release Engineering - 1.26-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 77c30fc..6b953c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a72baf4c8f330973f1e2703f5a6c041 atop-1.26.tar.gz +f1dd1984584f9635712cb7196e25620c atop-2.0.2.tar.gz From 14c71203482d4bce05a0fab52ea1b2fc5efd810d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 21:31:03 -0500 Subject: [PATCH 20/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index ef04afe..4fefae0 100644 --- a/atop.spec +++ b/atop.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: atop Version: 2.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -119,6 +119,9 @@ fi %{_unitdir}/atop.service %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Mar 01 2013 Jon Ciesla - 2.0.2-1 - Latest upstream, BZ 916908. From 9b98438da0b9de4741b032950f5908acb8cc0a08 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 21:00:38 -0500 Subject: [PATCH 21/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 4fefae0..5363470 100644 --- a/atop.spec +++ b/atop.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: atop Version: 2.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -119,6 +119,9 @@ fi %{_unitdir}/atop.service %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 2.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 9fb27f21c09e0c9eb00edbaa5b744d2e02775b26 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 21:43:08 +0000 Subject: [PATCH 22/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 5363470..2cb19f2 100644 --- a/atop.spec +++ b/atop.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: atop Version: 2.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -119,6 +119,9 @@ fi %{_unitdir}/atop.service %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 2.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 2.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From f63182871a35111db28da5a0a09ac5694dac8e9f Mon Sep 17 00:00:00 2001 From: "Richard M. Shaw" Date: Thu, 7 May 2015 10:00:59 -0500 Subject: [PATCH 23/90] Major update - Update to latest upstream release. - Fixes segmentation faults (BZ#1147145). - Update spec file to use licence macro where appropriate. - Modernize spec file and convert to new systemd scriptlets. --- .gitignore | 1 + atop.spec | 66 +++++++++++++++++++++++------------------------------- sources | 2 +- 3 files changed, 30 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 725d659..2aa42b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ atop-1.23.tar.gz /atop-1.26.tar.gz /atop-2.0.2.tar.gz +/atop-2.1.tar.gz diff --git a/atop.spec b/atop.spec index 2cb19f2..3821d65 100644 --- a/atop.spec +++ b/atop.spec @@ -1,13 +1,14 @@ %define _hardened_build 1 + Name: atop -Version: 2.0.2 -Release: 4%{?dist} +Version: 2.1 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System License: GPLv2+ URL: http://www.atcomputing.nl/Tools/atop/ -Source0: http://www.atcomputing.nl/Tools/%{name}/packages/%{name}-%{version}.tar.gz +Source0: http://www.atcomputing.nl/download/%{name}-%{version}.tar.gz Source1: atop.logrotate #Source2: atop.init Source3: atop.crondaily @@ -15,17 +16,16 @@ Source4: atop.sysconfig Source5: atop.d Source6: atop.service Source7: README.fedora + Patch0: atop-1.26-cron.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel BuildRequires: ncurses-devel -BuildRequires: systemd-units +BuildRequires: systemd -Requires(post): systemd-units -Requires(post): systemd-sysv -Requires(preun): systemd-units -Requires(postun): systemd-units +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd %description @@ -44,16 +44,18 @@ performance-monitors: For more informations: http://www.atcomputing.nl/Tools/atop The package does not make use of the patches available at http://www.atcomputing.nl/Tools/atop/kernpatch.html + %prep %setup -q %patch0 -p0 -b .cron + %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" + %install -rm -rf $RPM_BUILD_ROOT install -Dp -m 0755 atop $RPM_BUILD_ROOT%{_bindir}/atop ln -s atop $RPM_BUILD_ROOT%{_bindir}/atopsar install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 @@ -68,43 +70,24 @@ install -Dp -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop install -m 0644 %{SOURCE7} . -%clean -rm -rf $RPM_BUILD_ROOT %post -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post atop.service %preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable atop.service > /dev/null 2>&1 || : - /bin/systemctl stop atop.service > /dev/null 2>&1 || : -fi +%systemd_preun atop.service %postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart atop.service >/dev/null 2>&1 || : -fi - -%triggerun -- atop < 1.26-1 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply atop -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save atop >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del atop >/dev/null 2>&1 || : -/bin/systemctl try-restart atop.service >/dev/null 2>&1 || : +%systemd_postun_with_restart atop.service %files -%defattr(-,root,root,-) -%doc AUTHOR COPYING README ChangeLog README.fedora +%if 0%{?rhel} || 0%{?fedora} < 21 +%doc COPYING +%else +%license COPYING +%endif +%doc AUTHOR README ChangeLog README.fedora %config(noreplace) %{_sysconfdir}/cron.d/atop %config(noreplace) %{_sysconfdir}/logrotate.d/atop %config(noreplace) %{_sysconfdir}/sysconfig/atop @@ -118,7 +101,14 @@ fi %attr(0755,root,root) %dir %{_localstatedir}/log/atop %{_unitdir}/atop.service + %changelog +* Thu May 7 2015 Richard Shaw - 2.1-1 +- Update to latest upstream release. +- Fixes segmentation faults (BZ#1147145). +- Update spec file to use licence macro where appropriate. +- Modernize spec file and convert to new systemd scriptlets. + * Fri Aug 15 2014 Fedora Release Engineering - 2.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 6b953c5..f382000 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f1dd1984584f9635712cb7196e25620c atop-2.0.2.tar.gz +d956f5b0c7e0705cff6cf44898d664d7 atop-2.1.tar.gz From f55bd116558036974b8f77025b4663947c97e36c Mon Sep 17 00:00:00 2001 From: "Richard M. Shaw" Date: Thu, 7 May 2015 10:02:19 -0500 Subject: [PATCH 24/90] Remove old patch. --- atop-1.23-cron.patch | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 atop-1.23-cron.patch diff --git a/atop-1.23-cron.patch b/atop-1.23-cron.patch deleted file mode 100644 index 36e0452..0000000 --- a/atop-1.23-cron.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- atop-1.23/atop.cron 2008-03-06 07:15:47.000000000 -0300 -+++ atop-1.23/atop.cron-fedora 2008-05-05 12:17:19.000000000 -0300 -@@ -1,2 +1,2 @@ - # start atop daily at midnight --0 0 * * * root /etc/atop/atop.daily -+0 0 * * * root /etc/cron.daily/atop From 24e7f968bc958354553274ad64485dd6c4bc342e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 01:17:16 +0000 Subject: [PATCH 25/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 3821d65..dd36b41 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -103,6 +103,9 @@ install -m 0644 %{SOURCE7} . %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu May 7 2015 Richard Shaw - 2.1-1 - Update to latest upstream release. - Fixes segmentation faults (BZ#1147145). From 23e1f1bf4c7c85c7a15bf99af28cb98d32db62a6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:40:33 +0000 Subject: [PATCH 26/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index dd36b41..b585637 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -103,6 +103,9 @@ install -m 0644 %{SOURCE7} . %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From f9c74e92c9e40fc82c5a669591e32788e2aff90c Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 21 Dec 2016 09:33:44 -0600 Subject: [PATCH 27/90] 2.2 --- .gitignore | 1 + atop.logrotate | 1 + atop.spec | 18 +++++++++++------- sources | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2aa42b8..539cea3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ atop-1.23.tar.gz /atop-1.26.tar.gz /atop-2.0.2.tar.gz /atop-2.1.tar.gz +/atop-2.2-3.tar.gz diff --git a/atop.logrotate b/atop.logrotate index 6253c74..d558e42 100644 --- a/atop.logrotate +++ b/atop.logrotate @@ -2,6 +2,7 @@ missingok weekly rotate 4 + maxage 28 notifempty create 0600 root root } diff --git a/atop.spec b/atop.spec index b585637..dce009d 100644 --- a/atop.spec +++ b/atop.spec @@ -1,14 +1,14 @@ %define _hardened_build 1 Name: atop -Version: 2.1 -Release: 3%{?dist} +Version: 2.2 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System License: GPLv2+ URL: http://www.atcomputing.nl/Tools/atop/ -Source0: http://www.atcomputing.nl/download/%{name}-%{version}.tar.gz +Source0: http://www.atcomputing.nl/download/%{name}-%{version}-3.tar.gz Source1: atop.logrotate #Source2: atop.init Source3: atop.crondaily @@ -17,7 +17,7 @@ Source5: atop.d Source6: atop.service Source7: README.fedora -Patch0: atop-1.26-cron.patch +#Patch0: atop-1.26-cron.patch BuildRequires: zlib-devel BuildRequires: ncurses-devel @@ -47,8 +47,8 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %prep -%setup -q -%patch0 -p0 -b .cron +%setup -qn atop-2.2-3 +#%patch0 -p1 -b .cron %build @@ -60,7 +60,7 @@ install -Dp -m 0755 atop $RPM_BUILD_ROOT%{_bindir}/atop ln -s atop $RPM_BUILD_ROOT%{_bindir}/atopsar install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 -install -Dp -m 0644 atop.cron $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/atop +install -Dp -m 0644 atop.cronsystemd $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/atop install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/atop #install -Dp -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/atop #install -Dp -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/atop/atop.daily @@ -103,6 +103,10 @@ install -m 0644 %{SOURCE7} . %changelog +* Wed Dec 21 2016 Jon Ciesla - 2.2-1 +- Fix logrotate, 1247869 +- 2.2 + * Wed Feb 03 2016 Fedora Release Engineering - 2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index f382000..2bbc5d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d956f5b0c7e0705cff6cf44898d664d7 atop-2.1.tar.gz +SHA512 (atop-2.2-3.tar.gz) = 34076e35004367bbfd63f3aac1e786dab566633799b5d4f2c4d45f343642d145027f6298aa40d5e83c1356f502e3c51faa58da07cea58f2960bfacd78cf77915 From f090b2fa9c3faed6f91a8b8efd9b8f7d4579dbce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 06:31:00 +0000 Subject: [PATCH 28/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index dce009d..4e6a561 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -103,6 +103,9 @@ install -m 0644 %{SOURCE7} . %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Dec 21 2016 Jon Ciesla - 2.2-1 - Fix logrotate, 1247869 - 2.2 From b9a0b0a9a6c5933c5707f3223e2dd0d684e2b928 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 29 Mar 2017 09:09:06 -0500 Subject: [PATCH 29/90] 2.3.0 --- .gitignore | 1 + atop.spec | 14 +++++++------- sources | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 539cea3..07400d5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ atop-1.23.tar.gz /atop-2.0.2.tar.gz /atop-2.1.tar.gz /atop-2.2-3.tar.gz +/atop-2.3.0.tar.gz diff --git a/atop.spec b/atop.spec index 4e6a561..fa38996 100644 --- a/atop.spec +++ b/atop.spec @@ -1,16 +1,15 @@ %define _hardened_build 1 Name: atop -Version: 2.2 -Release: 2%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System License: GPLv2+ URL: http://www.atcomputing.nl/Tools/atop/ -Source0: http://www.atcomputing.nl/download/%{name}-%{version}-3.tar.gz +Source0: http://www.atcomputing.nl/download/%{name}-%{version}.tar.gz Source1: atop.logrotate -#Source2: atop.init Source3: atop.crondaily Source4: atop.sysconfig Source5: atop.d @@ -47,7 +46,7 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %prep -%setup -qn atop-2.2-3 +%setup -q #%patch0 -p1 -b .cron @@ -62,7 +61,6 @@ install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 install -Dp -m 0644 atop.cronsystemd $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/atop install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/atop -#install -Dp -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/atop #install -Dp -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/atop/atop.daily install -Dp -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop install -Dp -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/atopd @@ -92,7 +90,6 @@ install -m 0644 %{SOURCE7} . %config(noreplace) %{_sysconfdir}/logrotate.d/atop %config(noreplace) %{_sysconfdir}/sysconfig/atop #%{_sysconfdir}/atop/atop.daily -#%{_initrddir}/atop %{_bindir}/atopsar %{_bindir}/atop %{_bindir}/atopd @@ -103,6 +100,9 @@ install -m 0644 %{SOURCE7} . %changelog +* Wed Mar 29 2017 Gwyn Ciesla - 2.3.0-1 +- 2.3.0, BZ 1436833. + * Fri Feb 10 2017 Fedora Release Engineering - 2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 2bbc5d8..3466098 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.2-3.tar.gz) = 34076e35004367bbfd63f3aac1e786dab566633799b5d4f2c4d45f343642d145027f6298aa40d5e83c1356f502e3c51faa58da07cea58f2960bfacd78cf77915 +SHA512 (atop-2.3.0.tar.gz) = 51cc868545403cab439a66cc38fe9324c6ff7537e6dad5271fa3f0a22cbad471b0e15186d4f78f0080129301ba0a59e0c1cd1cc694bc3a4f982118a8d0cae429 From 5fcb5cf3bcc21cd600347a07f6120dd1a35b35bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 03:30:35 +0000 Subject: [PATCH 30/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index fa38996..64ec776 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -100,6 +100,9 @@ install -m 0644 %{SOURCE7} . %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Mar 29 2017 Gwyn Ciesla - 2.3.0-1 - 2.3.0, BZ 1436833. From 82b8558d5132bc8122d6e61ae951861f6a7743cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:56:51 +0000 Subject: [PATCH 31/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 64ec776..83b7629 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -100,6 +100,9 @@ install -m 0644 %{SOURCE7} . %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 0c90b0f6ca56ec6ab50e36e9f8cd7ee353755273 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 9 Nov 2017 10:15:07 -0600 Subject: [PATCH 32/90] Move from logrotate to upstream script. --- atop.service | 4 +--- atop.spec | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/atop.service b/atop.service index 49b8811..76e16f1 100644 --- a/atop.service +++ b/atop.service @@ -4,9 +4,7 @@ After=syslog.target [Service] Type=forking -PIDFile=/var/run/atop.pid -ExecStart=/usr/bin/atopd -ExecStop=/bin/rm -f /var/run/atop.pid +ExecStart=/usr/share/atop/atop.daily [Install] WantedBy=multi-user.target diff --git a/atop.spec b/atop.spec index 83b7629..ebe812f 100644 --- a/atop.spec +++ b/atop.spec @@ -2,18 +2,18 @@ Name: atop Version: 2.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System License: GPLv2+ URL: http://www.atcomputing.nl/Tools/atop/ Source0: http://www.atcomputing.nl/download/%{name}-%{version}.tar.gz -Source1: atop.logrotate -Source3: atop.crondaily +#Source1: atop.logrotate +#Source3: atop.crondaily Source4: atop.sysconfig Source5: atop.d -Source6: atop.service +#Source6: atop.service Source7: README.fedora #Patch0: atop-1.26-cron.patch @@ -60,11 +60,12 @@ ln -s atop $RPM_BUILD_ROOT%{_bindir}/atopsar install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 install -Dp -m 0644 atop.cronsystemd $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/atop -install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/atop +#install -Dp -m 0644 %%{SOURCE1} $RPM_BUILD_ROOT%%{_sysconfdir}/logrotate.d/atop #install -Dp -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/atop/atop.daily +install -Dp -m 0755 atop.daily $RPM_BUILD_ROOT%{_datadir}/atop/atop.daily install -Dp -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop install -Dp -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/atopd -install -Dp -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/atop.service +install -Dp -m 0644 atop.service $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop install -m 0644 %{SOURCE7} . @@ -87,7 +88,7 @@ install -m 0644 %{SOURCE7} . %endif %doc AUTHOR README ChangeLog README.fedora %config(noreplace) %{_sysconfdir}/cron.d/atop -%config(noreplace) %{_sysconfdir}/logrotate.d/atop +#%%config(noreplace) %%{_sysconfdir}/logrotate.d/atop %config(noreplace) %{_sysconfdir}/sysconfig/atop #%{_sysconfdir}/atop/atop.daily %{_bindir}/atopsar @@ -97,9 +98,12 @@ install -m 0644 %{SOURCE7} . %{_mandir}/man1/atopsar.1.gz %attr(0755,root,root) %dir %{_localstatedir}/log/atop %{_unitdir}/atop.service - +%{_datadir}/atop/atop.daily %changelog +* Tue Nov 07 2017 Gwyn Ciesla - 2.3.0-4 +- Move from logrotate to upstream script. + * Wed Aug 02 2017 Fedora Release Engineering - 2.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From fadabbbd3fc1cdafc48ab0fd29d27eda2298e80c Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 8 Dec 2017 10:00:31 -0600 Subject: [PATCH 33/90] nvme, sysconfig --- atop-sysconfig.patch | 12 ++++++++++++ atop.spec | 12 +++++++++--- nvme_support.patch | 11 +++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 atop-sysconfig.patch create mode 100644 nvme_support.patch diff --git a/atop-sysconfig.patch b/atop-sysconfig.patch new file mode 100644 index 0000000..aabc017 --- /dev/null +++ b/atop-sysconfig.patch @@ -0,0 +1,12 @@ +--- atop.daily~ 2017-03-25 04:00:03.000000000 -0500 ++++ atop.daily 2017-12-08 09:56:09.231136938 -0600 +@@ -6,6 +6,9 @@ + PIDFILE=/var/run/atop.pid + INTERVAL=600 # interval 10 minutes + ++# support /etc/sysconfig/atop ++source /etc/sysconfig/atop ++ + # verify if atop still runs for daily logging + # + if [ -e $PIDFILE ] && ps -p `cat $PIDFILE` | grep 'atop$' > /dev/null diff --git a/atop.spec b/atop.spec index ebe812f..8683382 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -16,7 +16,8 @@ Source5: atop.d #Source6: atop.service Source7: README.fedora -#Patch0: atop-1.26-cron.patch +Patch0: nvme_support.patch +Patch1: atop-sysconfig.patch BuildRequires: zlib-devel BuildRequires: ncurses-devel @@ -47,7 +48,8 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %prep %setup -q -#%patch0 -p1 -b .cron +%patch0 -p0 -b .nvme +%patch1 -p0 -b .sysconfig %build @@ -101,6 +103,10 @@ install -m 0644 %{SOURCE7} . %{_datadir}/atop/atop.daily %changelog +* Fri Dec 08 2017 Gwyn Ciesla - 2.3.0-5 +- Patch to support nvme disks, BZ 1523419. +- Patch to support /etc/sysconfig/atop, BZ 1520475. + * Tue Nov 07 2017 Gwyn Ciesla - 2.3.0-4 - Move from logrotate to upstream script. diff --git a/nvme_support.patch b/nvme_support.patch new file mode 100644 index 0000000..bc144a6 --- /dev/null +++ b/nvme_support.patch @@ -0,0 +1,11 @@ +diff -up ./photosyst.c.orig ./photosyst.c +--- ./photosyst.c.orig 2017-03-25 11:00:03.000000003 +0200 ++++ ./photosyst.c 2017-12-08 01:31:13.795157092 +0200 +@@ -1537,6 +1537,7 @@ static struct { + { "^dasd[a-z][a-z]*$", {0}, nullmodname, DSKTYPE, }, + { "^mmcblk[0-9][0-9]*$", {0}, nullmodname, DSKTYPE, }, + { "^emcpower[a-z][a-z]*$", {0}, nullmodname, DSKTYPE, }, ++ { "^nvme[0-9][a-z][0-9]*$", {0}, nullmodname, DSKTYPE, }, + }; + + static int From b938d01e0e8cf9ebdf900f25d8726c3b6153d572 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 8 Dec 2017 10:13:09 -0600 Subject: [PATCH 34/90] Cleanup. --- README.fedora | 14 -------- atop-1.26-cron.patch | 6 ---- atop.crondaily | 42 ------------------------ atop.init | 78 -------------------------------------------- atop.logrotate | 8 ----- atop.service | 10 ------ atop.spec | 16 +++------ 7 files changed, 5 insertions(+), 169 deletions(-) delete mode 100644 README.fedora delete mode 100644 atop-1.26-cron.patch delete mode 100644 atop.crondaily delete mode 100644 atop.init delete mode 100644 atop.logrotate delete mode 100644 atop.service diff --git a/README.fedora b/README.fedora deleted file mode 100644 index add1d50..0000000 --- a/README.fedora +++ /dev/null @@ -1,14 +0,0 @@ -A note on logs: - -The /var/log/atop/atop.log file is rotated by logrotate. - -The other, date-stamped logfiles, cannot be correctly handled by logrotate. -Since upstream doesn't provide a method for pruning these, I'm not attempting to do so in the -default configuration of the RPM. If you need to do so, use something like this: - -find /var/log/atop/atop_* -mtime +5 -exec rm {} \; - -This would remove anything older than 5 days, and could be placed in a cron job, etc. - --Jon Ciesla -2012-05-11 diff --git a/atop-1.26-cron.patch b/atop-1.26-cron.patch deleted file mode 100644 index 1a1ec94..0000000 --- a/atop-1.26-cron.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- atop.cron~ 2010-11-17 06:47:04.000000000 -0600 -+++ atop.cron 2012-05-10 08:55:45.101712473 -0500 -@@ -1,2 +1,2 @@ - # start atop daily at midnight --0 0 * * * root /etc/atop/atop.daily -+0 0 * * * root /bin/systemctl try-restart atop.service > /dev/null 2>&1 || : diff --git a/atop.crondaily b/atop.crondaily deleted file mode 100644 index 00071a9..0000000 --- a/atop.crondaily +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -# load sysconfig atop - -[ -f /etc/sysconfig/atop ] && . /etc/sysconfig/atop -# Current Day format -[ -z $CURDAY ] || CURDAY=`date +%Y%m%d` -# Log files path -[ -z $LOGPATH ] || LOGPATH=/var/log/atop -# Binaries path -[ -z $BINPATH ] || BINPATH=/usr/bin -# PID File -[ -z $PIDFILE ] || PIDFILE=/var/run/atop.pid -# interval (default 10 minutes) -[ -z $INTERVAL ] || INTERVAL=600 - -start_atop() { - -# start atop for all processes with interval of $INTERVAL -# (by default 10) minutes -$BINPATH/atop -a -w $LOGPATH/atop_$CURDAY $INTERVAL > $LOGPATH/atop.log 2>&1 & -echo $! > $PIDFILE -} - -# verify if atop still runs for daily logging -# -if [ -f $PIDFILE ]; then - PID=`cat $PIDFILE` - if [ -s $PIDFILE ] && ps -p $PID | grep 'atop$' > /dev/null - then - kill -USR1 $PID # take final sample - sleep 3 - kill -TERM $PID - rm $PIDFILE - sleep 1 - start_atop - else - exit 1 - fi -fi -exit 0 - diff --git a/atop.init b/atop.init deleted file mode 100644 index f3dcfc6..0000000 --- a/atop.init +++ /dev/null @@ -1,78 +0,0 @@ -#! /bin/bash -# -# atop advanced interactive monitor -# -# chkconfig: - 90 60 -# description: atop is advanced interactive monitor -# processname: atop -# pidfile: /var/run/atop.pid -# Source function library. -. /etc/init.d/functions - -RETVAL=0 - -# See how we were called. - -prog="atop" - -start() { - echo -n $"Starting $prog: " - - daemon atopd - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/atop - return $RETVAL -} - -stop() { - echo -n $"Stopping $prog: " - killproc atop 2>/dev/null - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/atop - return $RETVAL -} - -rhstatus() { - status atop -} - -restart() { - stop - start -} - -reload() { - echo -n $"Reloading atop daemon configuration: " - killproc atop -HUP - retval=$? - echo - return $RETVAL -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - restart - ;; - reload) - reload - ;; - status) - rhstatus - ;; - condrestart) - [ -f /var/lock/subsys/atop ] && restart || : - ;; - *) - echo $"Usage: $0 {start|stop|status|reload|restart|condrestart}" - exit 1 -esac - -exit $? diff --git a/atop.logrotate b/atop.logrotate deleted file mode 100644 index d558e42..0000000 --- a/atop.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/atop/atop.log { - missingok - weekly - rotate 4 - maxage 28 - notifempty - create 0600 root root -} diff --git a/atop.service b/atop.service deleted file mode 100644 index 76e16f1..0000000 --- a/atop.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=advanced interactive monitor -After=syslog.target - -[Service] -Type=forking -ExecStart=/usr/share/atop/atop.daily - -[Install] -WantedBy=multi-user.target diff --git a/atop.spec b/atop.spec index 8683382..40ad620 100644 --- a/atop.spec +++ b/atop.spec @@ -2,19 +2,15 @@ Name: atop Version: 2.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System License: GPLv2+ URL: http://www.atcomputing.nl/Tools/atop/ Source0: http://www.atcomputing.nl/download/%{name}-%{version}.tar.gz -#Source1: atop.logrotate -#Source3: atop.crondaily Source4: atop.sysconfig Source5: atop.d -#Source6: atop.service -Source7: README.fedora Patch0: nvme_support.patch Patch1: atop-sysconfig.patch @@ -62,14 +58,11 @@ ln -s atop $RPM_BUILD_ROOT%{_bindir}/atopsar install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 install -Dp -m 0644 atop.cronsystemd $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/atop -#install -Dp -m 0644 %%{SOURCE1} $RPM_BUILD_ROOT%%{_sysconfdir}/logrotate.d/atop -#install -Dp -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/atop/atop.daily install -Dp -m 0755 atop.daily $RPM_BUILD_ROOT%{_datadir}/atop/atop.daily install -Dp -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop install -Dp -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/atopd install -Dp -m 0644 atop.service $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop -install -m 0644 %{SOURCE7} . %post @@ -88,11 +81,9 @@ install -m 0644 %{SOURCE7} . %else %license COPYING %endif -%doc AUTHOR README ChangeLog README.fedora +%doc AUTHOR README ChangeLog %config(noreplace) %{_sysconfdir}/cron.d/atop -#%%config(noreplace) %%{_sysconfdir}/logrotate.d/atop %config(noreplace) %{_sysconfdir}/sysconfig/atop -#%{_sysconfdir}/atop/atop.daily %{_bindir}/atopsar %{_bindir}/atop %{_bindir}/atopd @@ -103,6 +94,9 @@ install -m 0644 %{SOURCE7} . %{_datadir}/atop/atop.daily %changelog +* Fri Dec 08 2017 Gwyn Ciesla - 2.3.0-6 +- Drop obsolete README.fedora. + * Fri Dec 08 2017 Gwyn Ciesla - 2.3.0-5 - Patch to support nvme disks, BZ 1523419. - Patch to support /etc/sysconfig/atop, BZ 1520475. From a89b55ef9c9a59ecc67d720f664cc65fd8dbd50a Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 11 Dec 2017 12:07:26 -0600 Subject: [PATCH 35/90] Restart fix. --- atop-2.3.0-restart.patch | 6 ++++++ atop.spec | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 atop-2.3.0-restart.patch diff --git a/atop-2.3.0-restart.patch b/atop-2.3.0-restart.patch new file mode 100644 index 0000000..889c462 --- /dev/null +++ b/atop-2.3.0-restart.patch @@ -0,0 +1,6 @@ +--- atop.cronsystemd~ 2017-03-25 04:00:03.000000000 -0500 ++++ atop.cronsystemd 2017-12-11 12:05:26.269480824 -0600 +@@ -1,2 +1,2 @@ + # daily restart of atop at midnight +-0 0 * * * root systemctl restart atop ++0 0 * * * root systemctl try-restart atop diff --git a/atop.spec b/atop.spec index 40ad620..17a0df8 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.3.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -14,6 +14,7 @@ Source5: atop.d Patch0: nvme_support.patch Patch1: atop-sysconfig.patch +Patch2: atop-2.3.0-restart.patch BuildRequires: zlib-devel BuildRequires: ncurses-devel @@ -94,6 +95,9 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop %{_datadir}/atop/atop.daily %changelog +* Mon Dec 11 2017 Gwyn Ciesla - 2.3.0-7 +- try-restart in cron, not restart, BZ 1524436. + * Fri Dec 08 2017 Gwyn Ciesla - 2.3.0-6 - Drop obsolete README.fedora. From 32a530dde6bf001a75ca2a2886c6a650bb5b91c4 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 29 Dec 2017 09:19:41 -0600 Subject: [PATCH 36/90] Apply patch. --- atop.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/atop.spec b/atop.spec index 17a0df8..5a42bbb 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.3.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -47,7 +47,7 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %setup -q %patch0 -p0 -b .nvme %patch1 -p0 -b .sysconfig - +%patch2 -p0 -b .cron %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -95,6 +95,9 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop %{_datadir}/atop/atop.daily %changelog +* Fri Dec 29 2017 Gwyn Ciesla - 2.3.0-8 +- Apply the patch from the previous ENVR. + * Mon Dec 11 2017 Gwyn Ciesla - 2.3.0-7 - try-restart in cron, not restart, BZ 1524436. From 764a6890227bb06d7b992100558155ef6b437ee6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 03:14:47 +0000 Subject: [PATCH 37/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 5a42bbb..b059b1e 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.3.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -95,6 +95,9 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop %{_datadir}/atop/atop.daily %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.3.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Dec 29 2017 Gwyn Ciesla - 2.3.0-8 - Apply the patch from the previous ENVR. From a362776b680cf8c7f74ec9a11f3eca0cdafe0588 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:04:09 +0100 Subject: [PATCH 38/90] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- atop.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/atop.spec b/atop.spec index b059b1e..f946aef 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.3.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -95,6 +95,9 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop %{_datadir}/atop/atop.daily %changelog +* Fri Feb 09 2018 Igor Gnatenko - 2.3.0-10 +- Escape macros in %%changelog + * Wed Feb 07 2018 Fedora Release Engineering - 2.3.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -238,7 +241,7 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop * Sun Jan 27 2008 Kairo Araujo - 1.22-2 - corrected license tag to GPLv2+ - replaced references to atop (init file) -- rebuild with Fedora mandatory flags (make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS") +- rebuild with Fedora mandatory flags (make %%{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS") - chkconfig and service added at pre/post scriptlets - improved name in logrotate file configuration - corrected english description From 68d49065e75b872c7b163624c8bb13eb486502bd Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 18 Feb 2018 11:31:19 -0600 Subject: [PATCH 39/90] Update build requirements for gcc per https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B#BuildRequires_and_Requires --- atop.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/atop.spec b/atop.spec index f946aef..0c2e845 100644 --- a/atop.spec +++ b/atop.spec @@ -16,6 +16,7 @@ Patch0: nvme_support.patch Patch1: atop-sysconfig.patch Patch2: atop-2.3.0-restart.patch +BuildRequires: gcc BuildRequires: zlib-devel BuildRequires: ncurses-devel BuildRequires: systemd From b4e25700e047739dc4a9eb8b737efbd02585b5de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:44:52 +0000 Subject: [PATCH 40/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 0c2e845..9be6552 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.3.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -96,6 +96,9 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop %{_datadir}/atop/atop.daily %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.3.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Igor Gnatenko - 2.3.0-10 - Escape macros in %%changelog From dc51b1a26c243a63a37637d8a45434b7963af12e Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sat, 22 Sep 2018 13:37:01 -0300 Subject: [PATCH 41/90] - Fix FTBFS rhbz #1603433 --- atop-2.3.0-newer-gcc.patch | 35 +++++++++++++++++++++++++++++++++++ atop.spec | 7 ++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 atop-2.3.0-newer-gcc.patch diff --git a/atop-2.3.0-newer-gcc.patch b/atop-2.3.0-newer-gcc.patch new file mode 100644 index 0000000..efa1858 --- /dev/null +++ b/atop-2.3.0-newer-gcc.patch @@ -0,0 +1,35 @@ +From 7bf30c52a37118ff4f211e67e1736099f3d1dcb3 Mon Sep 17 00:00:00 2001 +From: Gerlof Langeveld +Date: Sat, 22 Sep 2018 11:50:50 +0200 +Subject: [PATCH] Own macro's added to determine major/minor of logical volume. + The standard 'minor' and 'major' macro's are not available any more in gcc8. + +--- + photosyst.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/photosyst.c b/photosyst.c +index 19cbbe1..019b9e0 100644 +--- a/photosyst.c ++++ b/photosyst.c +@@ -184,6 +184,9 @@ static const char rcsid[] = "$Id: photosyst.c,v 1.38 2010/11/19 07:40:40 gerlof + + #define MAXCNT 64 + ++#define MAJOR(x) ((((unsigned long long)x>>8)&0xfff)|((unsigned int)((unsigned long long)x>>32)&~0xfff)) ++#define MINOR(x) ((x&0xff)|((unsigned int)((unsigned long long)x>>12)&~0xff)) ++ + /* return value of isdisk() */ + #define NONTYPE 0 + #define DSKTYPE 1 +@@ -1479,8 +1482,8 @@ lvmmapname(unsigned int major, unsigned int minor, + */ + strncpy(dmp->name, dentry->d_name, MAXDKNAM); + dmp->name[MAXDKNAM-1] = 0; +- dmp->major = major(statbuf.st_rdev); +- dmp->minor = minor(statbuf.st_rdev); ++ dmp->major = MAJOR(statbuf.st_rdev); ++ dmp->minor = MINOR(statbuf.st_rdev); + + hashix = DMHASH(dmp->major, dmp->minor); + diff --git a/atop.spec b/atop.spec index 9be6552..47c2282 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.3.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: An advanced interactive monitor to view the load on system and process level Group: Applications/System @@ -15,6 +15,7 @@ Source5: atop.d Patch0: nvme_support.patch Patch1: atop-sysconfig.patch Patch2: atop-2.3.0-restart.patch +Patch3: atop-2.3.0-newer-gcc.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -49,6 +50,7 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %patch0 -p0 -b .nvme %patch1 -p0 -b .sysconfig %patch2 -p0 -b .cron +%patch3 -p1 -b .newer-gcc %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -96,6 +98,9 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop %{_datadir}/atop/atop.daily %changelog +* Fri Sep 14 2018 Filipe Rosset - 2.3.0-12 +- Fix FTBFS rhbz #1603433 + * Thu Jul 12 2018 Fedora Release Engineering - 2.3.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 864640277931419940b4e0aea87b69e0d3df8ef3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:39 +0100 Subject: [PATCH 42/90] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- atop.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/atop.spec b/atop.spec index 47c2282..ce2f646 100644 --- a/atop.spec +++ b/atop.spec @@ -5,7 +5,6 @@ Version: 2.3.0 Release: 12%{?dist} Summary: An advanced interactive monitor to view the load on system and process level -Group: Applications/System License: GPLv2+ URL: http://www.atcomputing.nl/Tools/atop/ Source0: http://www.atcomputing.nl/download/%{name}-%{version}.tar.gz From 1466b76e69c1f30ae7653d0bafd3da3c77b64656 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 14:07:03 +0000 Subject: [PATCH 43/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index ce2f646..dbd0f38 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.3.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -97,6 +97,9 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop %{_datadir}/atop/atop.daily %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.3.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Sep 14 2018 Filipe Rosset - 2.3.0-12 - Fix FTBFS rhbz #1603433 From 3ea3ee2136a3250078193dc07a95a0a0a9c95dc9 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 25 Feb 2019 15:52:47 -0600 Subject: [PATCH 44/90] 2.4.0 --- .gitignore | 1 + atop-sysconfig.patch | 21 ++++++++++----------- atop.spec | 11 ++++++++--- sources | 2 +- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 07400d5..a3bb67c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ atop-1.23.tar.gz /atop-2.1.tar.gz /atop-2.2-3.tar.gz /atop-2.3.0.tar.gz +/atop-2.4.0.tar.gz diff --git a/atop-sysconfig.patch b/atop-sysconfig.patch index aabc017..6253b04 100644 --- a/atop-sysconfig.patch +++ b/atop-sysconfig.patch @@ -1,12 +1,11 @@ ---- atop.daily~ 2017-03-25 04:00:03.000000000 -0500 -+++ atop.daily 2017-12-08 09:56:09.231136938 -0600 -@@ -6,6 +6,9 @@ - PIDFILE=/var/run/atop.pid - INTERVAL=600 # interval 10 minutes - -+# support /etc/sysconfig/atop -+source /etc/sysconfig/atop -+ - # verify if atop still runs for daily logging +--- atop.daily~ 2019-01-12 16:37:19.000000000 -0600 ++++ atop.daily 2019-02-25 15:33:13.243363452 -0600 +@@ -7,7 +7,7 @@ + # allow administrator to overrule the variables + # defined above # - if [ -e $PIDFILE ] && ps -p `cat $PIDFILE` | grep 'atop$' > /dev/null +-DEFAULTSFILE=/etc/default/atop # possibility to overrule vars ++DEFAULTSFILE=/etc/sysconfig/atop # possibility to overrule vars + + if [ -e "$DEFAULTSFILE" ] + then diff --git a/atop.spec b/atop.spec index dbd0f38..35b5e82 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.3.0 -Release: 13%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -57,6 +57,7 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install install -Dp -m 0755 atop $RPM_BUILD_ROOT%{_bindir}/atop +install -Dp -m 0755 atopconvert $RPM_BUILD_ROOT%{_bindir}/atopconvert ln -s atop $RPM_BUILD_ROOT%{_bindir}/atopsar install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 @@ -79,7 +80,7 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop %files -%if 0%{?rhel} || 0%{?fedora} < 21 +%if 0%{?rhel} %doc COPYING %else %license COPYING @@ -90,6 +91,7 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop %{_bindir}/atopsar %{_bindir}/atop %{_bindir}/atopd +%{_bindir}/atopconvert %{_mandir}/man1/atop.1.gz %{_mandir}/man1/atopsar.1.gz %attr(0755,root,root) %dir %{_localstatedir}/log/atop @@ -97,6 +99,9 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop %{_datadir}/atop/atop.daily %changelog +* Mon Feb 25 2019 Gwyn Ciesla - 2.4.0-1 +- 2.4.0: omitting atopgpud until nvidia-ml-py is in Fedora. + * Thu Jan 31 2019 Fedora Release Engineering - 2.3.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 3466098..fb15a00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.3.0.tar.gz) = 51cc868545403cab439a66cc38fe9324c6ff7537e6dad5271fa3f0a22cbad471b0e15186d4f78f0080129301ba0a59e0c1cd1cc694bc3a4f982118a8d0cae429 +SHA512 (atop-2.4.0.tar.gz) = 2d0bbecc13bd64427263372b50f50d3278d1e0401e7f2eefe6ff20a874da6315271c885cef3492cde60a2955d1c8db4d8522c3374edcedf1a6992b8fa97c8f18 From d2f5d2e525ae8512c789c9ed5976f9748fc9a221 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:44:35 +0000 Subject: [PATCH 45/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 35b5e82..afb56ab 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -99,6 +99,9 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop %{_datadir}/atop/atop.daily %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Feb 25 2019 Gwyn Ciesla - 2.4.0-1 - 2.4.0: omitting atopgpud until nvidia-ml-py is in Fedora. From b0b7099d118945aa69832b4836a89037f7d88e5c Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 22 Aug 2019 08:24:09 -0500 Subject: [PATCH 46/90] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From ac7b7515ba028ff63d231cb6da3cfce9adb8288b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 28 Aug 2019 08:52:44 -0500 Subject: [PATCH 47/90] Fix INTERVAL --- atop.spec | 5 ++++- atop.sysconfig | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/atop.spec b/atop.spec index afb56ab..5e729f4 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -99,6 +99,9 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop %{_datadir}/atop/atop.daily %changelog +* Wed Aug 28 2019 Gwyn Ciesla - 2.4.0-3 +- Fix LOGINTERVAL in sysconfig. + * Wed Jul 24 2019 Fedora Release Engineering - 2.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/atop.sysconfig b/atop.sysconfig index 12d376a..c32995b 100644 --- a/atop.sysconfig +++ b/atop.sysconfig @@ -10,4 +10,4 @@ BINPATH=/usr/bin # PID File PIDFILE=/var/run/atop.pid # interval (default 10 minutes) -INTERVAL=600 +LOGINTERVAL=600 From d8959020681d00c5c1f86b032bf5717ca79aa793 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 5 Sep 2019 11:13:57 -0500 Subject: [PATCH 48/90] Ship atopacctd and atopgpud. --- atop-2.4.0-python3.patch | 35 +++++++++++++++++++++++++++++++++++ atop.spec | 24 ++++++++++++++++++++---- 2 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 atop-2.4.0-python3.patch diff --git a/atop-2.4.0-python3.patch b/atop-2.4.0-python3.patch new file mode 100644 index 0000000..5dcfc31 --- /dev/null +++ b/atop-2.4.0-python3.patch @@ -0,0 +1,35 @@ +--- atopgpud.orig 2019-01-12 16:37:19.000000000 -0600 ++++ atopgpud 2019-09-05 10:40:24.909804909 -0500 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python -Es ++#!/usr/bin/python3 -Es + + # ============================================================== + # Daemon that gathers statistical information from all +@@ -181,7 +181,7 @@ + self.stats.procstats[pid].memcum += proc.usedGpuMemory//1024 + self.stats.procstats[pid].sample += 1 + +- if self.stats.tasksupport & ACCOUNT: ++ if self.stats.tasksupport & ACCOUNT: + try: + stats = pynvml.nvmlDeviceGetAccountingStats(self.gpuhandle, pid) + +@@ -503,7 +503,7 @@ + # active processes for + # this GPU + # --------------------- +- for pid, stat in s.procstats.items(): ++ for pid, stat in list(s.procstats.items()): + strbuf += "#A {:d} {:d} {:d} {:d} {:d} {:d} {:d}".format(pid, + stat.gpubusy, stat.membusy, stat.timems, + stat.memnow, stat.memcum, stat.sample) +@@ -512,7 +512,7 @@ + # terminated processes + # for this GPU + # --------------------- +- for pid, stat in cliterm[clisock].items(): ++ for pid, stat in list(cliterm[clisock].items()): + strbuf += "#E {:d} {:d} {:d} {:d} {:d} {:d} {:d}".format(pid, + stat.gpubusy, stat.membusy, stat.timems, + stat.memnow, stat.memcum, stat.sample) diff --git a/atop.spec b/atop.spec index 5e729f4..710dd62 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -15,11 +15,13 @@ Patch0: nvme_support.patch Patch1: atop-sysconfig.patch Patch2: atop-2.3.0-restart.patch Patch3: atop-2.3.0-newer-gcc.patch +Patch4: atop-2.4.0-python3.patch BuildRequires: gcc BuildRequires: zlib-devel BuildRequires: ncurses-devel BuildRequires: systemd +Requires: python3-py3nvml Requires(post): systemd Requires(preun): systemd @@ -50,11 +52,11 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %patch1 -p0 -b .sysconfig %patch2 -p0 -b .cron %patch3 -p1 -b .newer-gcc +%patch4 -p0 -b .py3 %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" - %install install -Dp -m 0755 atop $RPM_BUILD_ROOT%{_bindir}/atop install -Dp -m 0755 atopconvert $RPM_BUILD_ROOT%{_bindir}/atopconvert @@ -67,16 +69,25 @@ install -Dp -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop install -Dp -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/atopd install -Dp -m 0644 atop.service $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop - +install -Dp -m 0755 atopacctd $RPM_BUILD_ROOT%{_sbindir}/atopacctd +install -Dp -m 0644 atopacct.service $RPM_BUILD_ROOT%{_unitdir}/atopacct.service +install -Dp -m 0755 atopgpud $RPM_BUILD_ROOT%{_sbindir}/atopgpud +install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service %post %systemd_post atop.service +%systemd_post atopacct.service +%systemd_post atopgpu.service %preun %systemd_preun atop.service +%systemd_preun atopacct.service +%systemd_preun atopgpu.service %postun %systemd_postun_with_restart atop.service +%systemd_postun_with_restart atopacct.service +%systemd_postun_with_restart atopgpu.service %files @@ -95,10 +106,15 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop %{_mandir}/man1/atop.1.gz %{_mandir}/man1/atopsar.1.gz %attr(0755,root,root) %dir %{_localstatedir}/log/atop -%{_unitdir}/atop.service +%{_unitdir}/atop*.service %{_datadir}/atop/atop.daily +%{_sbindir}/atopacctd +%{_sbindir}/atopgpud %changelog +* Thu Sep 05 2019 Gwyn Ciesla - 2.4.0-4 +- Package atopacctd and atopgpud. + * Wed Aug 28 2019 Gwyn Ciesla - 2.4.0-3 - Fix LOGINTERVAL in sysconfig. From f2910c68fbf72d036e618d59a53159c0aa06d9b0 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 5 Sep 2019 11:29:39 -0500 Subject: [PATCH 49/90] Don't ship atopgpud. --- atop.spec | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/atop.spec b/atop.spec index 710dd62..51b2a10 100644 --- a/atop.spec +++ b/atop.spec @@ -15,13 +15,11 @@ Patch0: nvme_support.patch Patch1: atop-sysconfig.patch Patch2: atop-2.3.0-restart.patch Patch3: atop-2.3.0-newer-gcc.patch -Patch4: atop-2.4.0-python3.patch BuildRequires: gcc BuildRequires: zlib-devel BuildRequires: ncurses-devel BuildRequires: systemd -Requires: python3-py3nvml Requires(post): systemd Requires(preun): systemd @@ -52,7 +50,6 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %patch1 -p0 -b .sysconfig %patch2 -p0 -b .cron %patch3 -p1 -b .newer-gcc -%patch4 -p0 -b .py3 %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -71,23 +68,18 @@ install -Dp -m 0644 atop.service $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop install -Dp -m 0755 atopacctd $RPM_BUILD_ROOT%{_sbindir}/atopacctd install -Dp -m 0644 atopacct.service $RPM_BUILD_ROOT%{_unitdir}/atopacct.service -install -Dp -m 0755 atopgpud $RPM_BUILD_ROOT%{_sbindir}/atopgpud -install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service %post %systemd_post atop.service %systemd_post atopacct.service -%systemd_post atopgpu.service %preun %systemd_preun atop.service %systemd_preun atopacct.service -%systemd_preun atopgpu.service %postun %systemd_postun_with_restart atop.service %systemd_postun_with_restart atopacct.service -%systemd_postun_with_restart atopgpu.service %files @@ -109,11 +101,10 @@ install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service %{_unitdir}/atop*.service %{_datadir}/atop/atop.daily %{_sbindir}/atopacctd -%{_sbindir}/atopgpud %changelog * Thu Sep 05 2019 Gwyn Ciesla - 2.4.0-4 -- Package atopacctd and atopgpud. +- Package atopacctd. * Wed Aug 28 2019 Gwyn Ciesla - 2.4.0-3 - Fix LOGINTERVAL in sysconfig. From 8d20c8cbb1ffcc9531c71f1f03f2b3014a5830a2 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Sun, 3 Nov 2019 13:54:48 -0600 Subject: [PATCH 50/90] 2.5.0 --- .gitignore | 1 + ...-python3.patch => atop-2.5.0-python3.patch | 9 ------- atop.spec | 26 +++++++++++-------- sources | 2 +- 4 files changed, 17 insertions(+), 21 deletions(-) rename atop-2.4.0-python3.patch => atop-2.5.0-python3.patch (76%) diff --git a/.gitignore b/.gitignore index a3bb67c..35fca31 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ atop-1.23.tar.gz /atop-2.2-3.tar.gz /atop-2.3.0.tar.gz /atop-2.4.0.tar.gz +/atop-2.5.0.tar.gz diff --git a/atop-2.4.0-python3.patch b/atop-2.5.0-python3.patch similarity index 76% rename from atop-2.4.0-python3.patch rename to atop-2.5.0-python3.patch index 5dcfc31..029f030 100644 --- a/atop-2.4.0-python3.patch +++ b/atop-2.5.0-python3.patch @@ -6,15 +6,6 @@ # ============================================================== # Daemon that gathers statistical information from all -@@ -181,7 +181,7 @@ - self.stats.procstats[pid].memcum += proc.usedGpuMemory//1024 - self.stats.procstats[pid].sample += 1 - -- if self.stats.tasksupport & ACCOUNT: -+ if self.stats.tasksupport & ACCOUNT: - try: - stats = pynvml.nvmlDeviceGetAccountingStats(self.gpuhandle, pid) - @@ -503,7 +503,7 @@ # active processes for # this GPU diff --git a/atop.spec b/atop.spec index 710dd62..4370345 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.4.0 -Release: 4%{?dist} +Version: 2.5.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -13,9 +13,8 @@ Source5: atop.d Patch0: nvme_support.patch Patch1: atop-sysconfig.patch -Patch2: atop-2.3.0-restart.patch -Patch3: atop-2.3.0-newer-gcc.patch -Patch4: atop-2.4.0-python3.patch +Patch2: atop-2.3.0-newer-gcc.patch +Patch3: atop-2.5.0-python3.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -50,9 +49,8 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %setup -q %patch0 -p0 -b .nvme %patch1 -p0 -b .sysconfig -%patch2 -p0 -b .cron -%patch3 -p1 -b .newer-gcc -%patch4 -p0 -b .py3 +%patch2 -p1 -b .newer-gcc +%patch3 -p0 -b .py3 %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -63,7 +61,6 @@ install -Dp -m 0755 atopconvert $RPM_BUILD_ROOT%{_bindir}/atopconvert ln -s atop $RPM_BUILD_ROOT%{_bindir}/atopsar install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 -install -Dp -m 0644 atop.cronsystemd $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/atop install -Dp -m 0755 atop.daily $RPM_BUILD_ROOT%{_datadir}/atop/atop.daily install -Dp -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop install -Dp -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/atopd @@ -73,21 +70,25 @@ install -Dp -m 0755 atopacctd $RPM_BUILD_ROOT%{_sbindir}/atopacctd install -Dp -m 0644 atopacct.service $RPM_BUILD_ROOT%{_unitdir}/atopacct.service install -Dp -m 0755 atopgpud $RPM_BUILD_ROOT%{_sbindir}/atopgpud install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service +install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %post %systemd_post atop.service %systemd_post atopacct.service %systemd_post atopgpu.service +%systemd_post atop-rotate.timer %preun %systemd_preun atop.service %systemd_preun atopacct.service %systemd_preun atopgpu.service +%systemd_preun atop-rotate.timer %postun %systemd_postun_with_restart atop.service %systemd_postun_with_restart atopacct.service %systemd_postun_with_restart atopgpu.service +%systemd_postun_with_restart atop-rotate.timer %files @@ -96,8 +97,7 @@ install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service %else %license COPYING %endif -%doc AUTHOR README ChangeLog -%config(noreplace) %{_sysconfdir}/cron.d/atop +%doc AUTHOR README* %config(noreplace) %{_sysconfdir}/sysconfig/atop %{_bindir}/atopsar %{_bindir}/atop @@ -107,11 +107,15 @@ install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service %{_mandir}/man1/atopsar.1.gz %attr(0755,root,root) %dir %{_localstatedir}/log/atop %{_unitdir}/atop*.service +%{_unitdir}/atop*.timer %{_datadir}/atop/atop.daily %{_sbindir}/atopacctd %{_sbindir}/atopgpud %changelog +* Sun Nov 03 2019 Gwyn Ciesla - 2.5.0-1 +- 2.5.0 + * Thu Sep 05 2019 Gwyn Ciesla - 2.4.0-4 - Package atopacctd and atopgpud. diff --git a/sources b/sources index fb15a00..9a88925 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.4.0.tar.gz) = 2d0bbecc13bd64427263372b50f50d3278d1e0401e7f2eefe6ff20a874da6315271c885cef3492cde60a2955d1c8db4d8522c3374edcedf1a6992b8fa97c8f18 +SHA512 (atop-2.5.0.tar.gz) = 8c50482194b60afedfd9d593ea7e916b63310bd3b43965fbd2769a2673f6f2247dec764ed1576866321a4b9c7301d5d8369c97fb6d351246395d01772ad04489 From 19d303cdb4e4078893f750453fd9d548387c8432 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 12:23:42 +0000 Subject: [PATCH 51/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 4370345..22228a3 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -113,6 +113,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_sbindir}/atopgpud %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Nov 03 2019 Gwyn Ciesla - 2.5.0-1 - 2.5.0 From 09968b749cf99ce5b6b60acbc755e1e0fe26b236 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 29 May 2020 08:57:37 -0500 Subject: [PATCH 52/90] Fix unit file path. --- atop.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 22228a3..33d4724 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -52,6 +52,9 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %patch2 -p1 -b .newer-gcc %patch3 -p0 -b .py3 +# Correct unit file path +sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service + %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -113,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_sbindir}/atopgpud %changelog +* Fri May 29 2020 Gwyn Ciesla - 2.5.1-1 +- Fix unit file path. + * Tue Jan 28 2020 Fedora Release Engineering - 2.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 4783606498d47456d0176034e9b7fcab9f44c57e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:40:02 +0000 Subject: [PATCH 53/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 33d4724..6c6b365 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -116,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_sbindir}/atopgpud %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri May 29 2020 Gwyn Ciesla - 2.5.1-1 - Fix unit file path. From 77a41b3f4c2bdb440d312f7a3dcfce9e896284a1 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 16:12:31 +0000 Subject: [PATCH 54/90] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 18dce2f8d073dc9f0d7b75b816c5268aed6d245b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 00:00:06 +0000 Subject: [PATCH 55/90] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- atop.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/atop.spec b/atop.spec index 6c6b365..67e16bc 100644 --- a/atop.spec +++ b/atop.spec @@ -20,6 +20,7 @@ BuildRequires: gcc BuildRequires: zlib-devel BuildRequires: ncurses-devel BuildRequires: systemd +BuildRequires: make Requires: python3-py3nvml Requires(post): systemd From 6fc3f412bb60224ef6b8a84be5aa9838a35e475b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 21 Dec 2020 15:13:17 -0600 Subject: [PATCH 56/90] 2.6.0 --- .gitignore | 1 + atop-2.3.0-restart.patch | 6 ------ atop-2.5.0-python3.patch | 26 -------------------------- atop.spec | 13 +++++++------ sources | 2 +- 5 files changed, 9 insertions(+), 39 deletions(-) delete mode 100644 atop-2.3.0-restart.patch delete mode 100644 atop-2.5.0-python3.patch diff --git a/.gitignore b/.gitignore index 35fca31..9bcea87 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ atop-1.23.tar.gz /atop-2.3.0.tar.gz /atop-2.4.0.tar.gz /atop-2.5.0.tar.gz +/atop-2.6.0.tar.gz diff --git a/atop-2.3.0-restart.patch b/atop-2.3.0-restart.patch deleted file mode 100644 index 889c462..0000000 --- a/atop-2.3.0-restart.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- atop.cronsystemd~ 2017-03-25 04:00:03.000000000 -0500 -+++ atop.cronsystemd 2017-12-11 12:05:26.269480824 -0600 -@@ -1,2 +1,2 @@ - # daily restart of atop at midnight --0 0 * * * root systemctl restart atop -+0 0 * * * root systemctl try-restart atop diff --git a/atop-2.5.0-python3.patch b/atop-2.5.0-python3.patch deleted file mode 100644 index 029f030..0000000 --- a/atop-2.5.0-python3.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- atopgpud.orig 2019-01-12 16:37:19.000000000 -0600 -+++ atopgpud 2019-09-05 10:40:24.909804909 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -Es -+#!/usr/bin/python3 -Es - - # ============================================================== - # Daemon that gathers statistical information from all -@@ -503,7 +503,7 @@ - # active processes for - # this GPU - # --------------------- -- for pid, stat in s.procstats.items(): -+ for pid, stat in list(s.procstats.items()): - strbuf += "#A {:d} {:d} {:d} {:d} {:d} {:d} {:d}".format(pid, - stat.gpubusy, stat.membusy, stat.timems, - stat.memnow, stat.memcum, stat.sample) -@@ -512,7 +512,7 @@ - # terminated processes - # for this GPU - # --------------------- -- for pid, stat in cliterm[clisock].items(): -+ for pid, stat in list(cliterm[clisock].items()): - strbuf += "#E {:d} {:d} {:d} {:d} {:d} {:d} {:d}".format(pid, - stat.gpubusy, stat.membusy, stat.timems, - stat.memnow, stat.memcum, stat.sample) diff --git a/atop.spec b/atop.spec index 67e16bc..94eb074 100644 --- a/atop.spec +++ b/atop.spec @@ -1,20 +1,19 @@ %define _hardened_build 1 Name: atop -Version: 2.5.0 -Release: 4%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ -URL: http://www.atcomputing.nl/Tools/atop/ -Source0: http://www.atcomputing.nl/download/%{name}-%{version}.tar.gz +URL: http://www.atoptool.nl +Source0: http://www.atoptool.nl/download/%{name}-%{version}.tar.gz Source4: atop.sysconfig Source5: atop.d Patch0: nvme_support.patch Patch1: atop-sysconfig.patch Patch2: atop-2.3.0-newer-gcc.patch -Patch3: atop-2.5.0-python3.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -51,7 +50,6 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %patch0 -p0 -b .nvme %patch1 -p0 -b .sysconfig %patch2 -p1 -b .newer-gcc -%patch3 -p0 -b .py3 # Correct unit file path sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service @@ -117,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_sbindir}/atopgpud %changelog +* Mon Dec 21 2020 Gwyn Ciesla - 2.6.0-1 +- 2.6.0 + * Mon Jul 27 2020 Fedora Release Engineering - 2.5.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 9a88925..625a61d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.5.0.tar.gz) = 8c50482194b60afedfd9d593ea7e916b63310bd3b43965fbd2769a2673f6f2247dec764ed1576866321a4b9c7301d5d8369c97fb6d351246395d01772ad04489 +SHA512 (atop-2.6.0.tar.gz) = 8d4e2ae56a63738fc615f294d1f4e27cd9eab20acaf5d36c82d87390f96d38cf28cab0a00507459c3ce6e535294a442c4546e0cf732bad253cb518a14cdf5e88 From 9922d8e17f296db833481ae3e9914960176807c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:42:44 +0000 Subject: [PATCH 57/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 94eb074..f6dd12c 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -115,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_sbindir}/atopgpud %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 21 2020 Gwyn Ciesla - 2.6.0-1 - 2.6.0 From f90556351351f24f4e067837b03e3e01bf7ebb0f Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 22 Feb 2021 08:31:26 -0600 Subject: [PATCH 58/90] Don't ship atopgpud on EL-7 --- atop.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 8123f07..168c8c1 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -20,7 +20,9 @@ BuildRequires: zlib-devel BuildRequires: ncurses-devel BuildRequires: systemd BuildRequires: make +%if 0%{?rhel} >= 8 || 0%{?fedora} Requires: python3-py3nvml +%endif Requires(post): systemd Requires(preun): systemd @@ -70,26 +72,34 @@ install -Dp -m 0644 atop.service $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop install -Dp -m 0755 atopacctd $RPM_BUILD_ROOT%{_sbindir}/atopacctd install -Dp -m 0644 atopacct.service $RPM_BUILD_ROOT%{_unitdir}/atopacct.service +%if 0%{?rhel} >= 8 || 0%{?fedora} install -Dp -m 0755 atopgpud $RPM_BUILD_ROOT%{_sbindir}/atopgpud install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service +%endif install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %post %systemd_post atop.service %systemd_post atopacct.service +%if 0%{?rhel} >= 8 || 0%{?fedora} %systemd_post atopgpu.service +%endif %systemd_post atop-rotate.timer %preun %systemd_preun atop.service %systemd_preun atopacct.service +%if 0%{?rhel} >= 8 || 0%{?fedora} %systemd_preun atopgpu.service +%endif %systemd_preun atop-rotate.timer %postun %systemd_postun_with_restart atop.service %systemd_postun_with_restart atopacct.service +%if 0%{?rhel} >= 8 || 0%{?fedora} %systemd_postun_with_restart atopgpu.service +%endif %systemd_postun_with_restart atop-rotate.timer @@ -112,9 +122,14 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_unitdir}/atop*.timer %{_datadir}/atop/atop.daily %{_sbindir}/atopacctd +%if 0%{?rhel} >= 8 || 0%{?fedora} %{_sbindir}/atopgpud +%endif %changelog +* Mon Feb 22 2021 Gwyn Ciesla - 2.6.0-3 +- Dpn't ship atopgpud on EL-7 + * Tue Jan 26 2021 Fedora Release Engineering - 2.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From ad50bae7848ac730feaa02017c62a3280cd6d8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 15:59:21 +0100 Subject: [PATCH 59/90] Coalesce systemd scriptlets It is more efficient to do callout just once. --- atop.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/atop.spec b/atop.spec index 168c8c1..2debac0 100644 --- a/atop.spec +++ b/atop.spec @@ -79,28 +79,22 @@ install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %post -%systemd_post atop.service -%systemd_post atopacct.service +%systemd_post atop.service atopacct.service atop-rotate.timer %if 0%{?rhel} >= 8 || 0%{?fedora} %systemd_post atopgpu.service %endif -%systemd_post atop-rotate.timer %preun -%systemd_preun atop.service -%systemd_preun atopacct.service +%systemd_preun atop.service atopacct.service atop-rotate.timer %if 0%{?rhel} >= 8 || 0%{?fedora} %systemd_preun atopgpu.service %endif -%systemd_preun atop-rotate.timer %postun -%systemd_postun_with_restart atop.service -%systemd_postun_with_restart atopacct.service +%systemd_postun_with_restart atop.service atopacct.service atop-rotate.timer %if 0%{?rhel} >= 8 || 0%{?fedora} %systemd_postun_with_restart atopgpu.service %endif -%systemd_postun_with_restart atop-rotate.timer %files From 10ed7aba116c4ff4fd3e85a5373ea6ba9aae309c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:14:09 +0100 Subject: [PATCH 60/90] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- atop.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 2debac0..2091b50 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -121,6 +121,10 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %endif %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.6.0-4 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Mon Feb 22 2021 Gwyn Ciesla - 2.6.0-3 - Dpn't ship atopgpud on EL-7 From a8b77fbce6c56907df5326fae9842d66b01b7719 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 23 Mar 2021 14:51:13 -0500 Subject: [PATCH 61/90] Use upstream sysconfig file. --- atop.spec | 10 ++++++---- atop.sysconfig | 13 ------------- 2 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 atop.sysconfig diff --git a/atop.spec b/atop.spec index 2091b50..3312f99 100644 --- a/atop.spec +++ b/atop.spec @@ -2,13 +2,12 @@ Name: atop Version: 2.6.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ URL: http://www.atoptool.nl Source0: http://www.atoptool.nl/download/%{name}-%{version}.tar.gz -Source4: atop.sysconfig Source5: atop.d Patch0: nvme_support.patch @@ -66,7 +65,7 @@ ln -s atop $RPM_BUILD_ROOT%{_bindir}/atopsar install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 install -Dp -m 0755 atop.daily $RPM_BUILD_ROOT%{_datadir}/atop/atop.daily -install -Dp -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop +install -Dp -m 0644 atop.default $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop install -Dp -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/atopd install -Dp -m 0644 atop.service $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop @@ -121,12 +120,15 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %endif %changelog +* Tue Mar 23 2021 Gwyn Ciesla - 2.6.0-5 +- Use upstream sysconfig file. + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.6.0-4 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. * Mon Feb 22 2021 Gwyn Ciesla - 2.6.0-3 -- Dpn't ship atopgpud on EL-7 +- Don't ship atopgpud on EL-7 * Tue Jan 26 2021 Fedora Release Engineering - 2.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/atop.sysconfig b/atop.sysconfig deleted file mode 100644 index c32995b..0000000 --- a/atop.sysconfig +++ /dev/null @@ -1,13 +0,0 @@ -# sysconfig atop -# - -# Current Day format -CURDAY=`date +%Y%m%d` -# Log files path -LOGPATH=/var/log/atop -# Binaries path -BINPATH=/usr/bin -# PID File -PIDFILE=/var/run/atop.pid -# interval (default 10 minutes) -LOGINTERVAL=600 From 665062b838f5f32f3aebdfd7a474da8df03e867b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 13 Apr 2021 08:32:17 -0500 Subject: [PATCH 62/90] Upstream service file patch. --- ...19713b5e6be43671fe1856fb4bd49ff91fa7.patch | 35 +++++++++++++++++++ atop.spec | 11 ++++-- 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch diff --git a/9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch b/9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch new file mode 100644 index 0000000..78fa578 --- /dev/null +++ b/9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch @@ -0,0 +1,35 @@ +From 9cb119713b5e6be43671fe1856fb4bd49ff91fa7 Mon Sep 17 00:00:00 2001 +From: Gerlof Langeveld +Date: Tue, 23 Mar 2021 16:50:48 +0100 +Subject: [PATCH] Correct definition of environment variable LOGOPTS The former + definition of the empty environment variable LOGOPTS in the atop.service file + (Environment=LOGOPTS="") causes an empty command line parameter for atop + running in the background. This empty parameter results in an interval timer + definition of 0 seconds which means that atop only writes one single sample + to the daily logfile and after that no more! When the environment variable is + overruled by the definition LOGOPTS="" (or another value) in the file + /etc/default/atop the problem is bypassed. + +--- + atop.service | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/atop.service b/atop.service +index 855e51b..16f24e9 100644 +--- a/atop.service ++++ b/atop.service +@@ -3,10 +3,10 @@ Description=Atop advanced performance monitor + Documentation=man:atop(1) + + [Service] +-Environment=LOGOPTS="" +-Environment=LOGINTERVAL=600 +-Environment=LOGGENERATIONS=28 +-Environment=LOGPATH=/var/log/atop ++Environment="LOGOPTS=" ++Environment="LOGINTERVAL=600" ++Environment="LOGGENERATIONS=28" ++Environment="LOGPATH=/var/log/atop" + EnvironmentFile=/etc/default/atop + ExecStartPre=/bin/sh -c 'test -n "$LOGINTERVAL" -a "$LOGINTERVAL" -eq "$LOGINTERVAL"' + ExecStartPre=/bin/sh -c 'test -n "$LOGGENERATIONS" -a "$LOGGENERATIONS" -eq "$LOGGENERATIONS"' diff --git a/atop.spec b/atop.spec index 3312f99..567810f 100644 --- a/atop.spec +++ b/atop.spec @@ -2,17 +2,18 @@ Name: atop Version: 2.6.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ URL: http://www.atoptool.nl Source0: http://www.atoptool.nl/download/%{name}-%{version}.tar.gz -Source5: atop.d +Source1: atop.d Patch0: nvme_support.patch Patch1: atop-sysconfig.patch Patch2: atop-2.3.0-newer-gcc.patch +Patch3: 9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -51,6 +52,7 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %patch0 -p0 -b .nvme %patch1 -p0 -b .sysconfig %patch2 -p1 -b .newer-gcc +%patch3 -p1 -b .service # Correct unit file path sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service @@ -66,7 +68,7 @@ install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 install -Dp -m 0755 atop.daily $RPM_BUILD_ROOT%{_datadir}/atop/atop.daily install -Dp -m 0644 atop.default $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop -install -Dp -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/atopd +install -Dp -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/atopd install -Dp -m 0644 atop.service $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop install -Dp -m 0755 atopacctd $RPM_BUILD_ROOT%{_sbindir}/atopacctd @@ -120,6 +122,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %endif %changelog +* Tue Apr 13 2021 Gwyn Ciesla - 2.6.0-6 +- Upstream patch to fix service file. + * Tue Mar 23 2021 Gwyn Ciesla - 2.6.0-5 - Use upstream sysconfig file. From c23ba78b7890c568a2a81eaa1edb3245538b0023 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:14:10 +0000 Subject: [PATCH 63/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From e1207aba47ab4d319acf854696276a116b6c63f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:10:12 +0000 Subject: [PATCH 64/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 567810f..5f4642f 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.6.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -122,6 +122,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %endif %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.6.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Apr 13 2021 Gwyn Ciesla - 2.6.0-6 - Upstream patch to fix service file. From 6b6243b52db2ca26529c1c6d97f92a27ebed5622 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 15 Dec 2021 11:29:15 -0600 Subject: [PATCH 65/90] https url, source0 --- atop.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atop.spec b/atop.spec index 5f4642f..75636cd 100644 --- a/atop.spec +++ b/atop.spec @@ -6,8 +6,8 @@ Release: 7%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ -URL: http://www.atoptool.nl -Source0: http://www.atoptool.nl/download/%{name}-%{version}.tar.gz +URL: http//www.atoptool.nl +Source0: https://www.atoptool.nl/download/%{name}-%{version}.tar.gz Source1: atop.d Patch0: nvme_support.patch From ddf1ef86afbd87297fc1aa6d8599c9d44490e5e6 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 20 Dec 2021 09:33:56 -0600 Subject: [PATCH 66/90] 2.7.0 --- .gitignore | 1 + ...19713b5e6be43671fe1856fb4bd49ff91fa7.patch | 35 ------------------- atop.spec | 9 ++--- sources | 2 +- 4 files changed, 7 insertions(+), 40 deletions(-) delete mode 100644 9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch diff --git a/.gitignore b/.gitignore index 9bcea87..1b8953e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ atop-1.23.tar.gz /atop-2.4.0.tar.gz /atop-2.5.0.tar.gz /atop-2.6.0.tar.gz +/atop-2.7.0.tar.gz diff --git a/9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch b/9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch deleted file mode 100644 index 78fa578..0000000 --- a/9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9cb119713b5e6be43671fe1856fb4bd49ff91fa7 Mon Sep 17 00:00:00 2001 -From: Gerlof Langeveld -Date: Tue, 23 Mar 2021 16:50:48 +0100 -Subject: [PATCH] Correct definition of environment variable LOGOPTS The former - definition of the empty environment variable LOGOPTS in the atop.service file - (Environment=LOGOPTS="") causes an empty command line parameter for atop - running in the background. This empty parameter results in an interval timer - definition of 0 seconds which means that atop only writes one single sample - to the daily logfile and after that no more! When the environment variable is - overruled by the definition LOGOPTS="" (or another value) in the file - /etc/default/atop the problem is bypassed. - ---- - atop.service | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/atop.service b/atop.service -index 855e51b..16f24e9 100644 ---- a/atop.service -+++ b/atop.service -@@ -3,10 +3,10 @@ Description=Atop advanced performance monitor - Documentation=man:atop(1) - - [Service] --Environment=LOGOPTS="" --Environment=LOGINTERVAL=600 --Environment=LOGGENERATIONS=28 --Environment=LOGPATH=/var/log/atop -+Environment="LOGOPTS=" -+Environment="LOGINTERVAL=600" -+Environment="LOGGENERATIONS=28" -+Environment="LOGPATH=/var/log/atop" - EnvironmentFile=/etc/default/atop - ExecStartPre=/bin/sh -c 'test -n "$LOGINTERVAL" -a "$LOGINTERVAL" -eq "$LOGINTERVAL"' - ExecStartPre=/bin/sh -c 'test -n "$LOGGENERATIONS" -a "$LOGGENERATIONS" -eq "$LOGGENERATIONS"' diff --git a/atop.spec b/atop.spec index 75636cd..c289e60 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.6.0 -Release: 7%{?dist} +Version: 2.7.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -13,7 +13,6 @@ Source1: atop.d Patch0: nvme_support.patch Patch1: atop-sysconfig.patch Patch2: atop-2.3.0-newer-gcc.patch -Patch3: 9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -52,7 +51,6 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %patch0 -p0 -b .nvme %patch1 -p0 -b .sysconfig %patch2 -p1 -b .newer-gcc -%patch3 -p1 -b .service # Correct unit file path sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service @@ -122,6 +120,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %endif %changelog +* Mon Dec 20 2021 Gwyn Ciesla - 2.7.0-1 +- 2.7.0 + * Wed Jul 21 2021 Fedora Release Engineering - 2.6.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 625a61d..85875e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.6.0.tar.gz) = 8d4e2ae56a63738fc615f294d1f4e27cd9eab20acaf5d36c82d87390f96d38cf28cab0a00507459c3ce6e535294a442c4546e0cf732bad253cb518a14cdf5e88 +SHA512 (atop-2.7.0.tar.gz) = f3de85bd041857bfdeb586edcb7b6f700e37cf3bc86bbcbde374eb4aaaa1f1d367b829ee23f299a545c57db5b3de504816c705d4f51bf3be547f79a2d0e99010 From faffa6f18a9846d6579c04a8d827c9b305a4cdce Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 11 Jan 2022 10:34:31 -0600 Subject: [PATCH 67/90] 2.7.1 Drop atopgpud per: https://docs.fedoraproject.org/en-US/packaging-guidelines/what-can-be-packaged/#_packages_which_are_not_useful_without_external_code --- .gitignore | 1 + atop.spec | 50 +++++++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 1b8953e..d606f84 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ atop-1.23.tar.gz /atop-2.5.0.tar.gz /atop-2.6.0.tar.gz /atop-2.7.0.tar.gz +/atop-2.7.1.tar.gz diff --git a/atop.spec b/atop.spec index c289e60..1dc453e 100644 --- a/atop.spec +++ b/atop.spec @@ -1,12 +1,12 @@ %define _hardened_build 1 Name: atop -Version: 2.7.0 +Version: 2.7.1 Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ -URL: http//www.atoptool.nl +URL: https://www.atoptool.nl Source0: https://www.atoptool.nl/download/%{name}-%{version}.tar.gz Source1: atop.d @@ -19,9 +19,9 @@ BuildRequires: zlib-devel BuildRequires: ncurses-devel BuildRequires: systemd BuildRequires: make -%if 0%{?rhel} >= 8 || 0%{?fedora} -Requires: python3-py3nvml -%endif +#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} +#Requires: python3-py3nvml +#%%endif Requires(post): systemd Requires(preun): systemd @@ -41,10 +41,6 @@ performance-monitors: - Watch deviations only - Accumulated process activity per user - Accumulated process activity per program -For more informations: http://www.atcomputing.nl/Tools/atop -The package does not make use of the patches available at -http://www.atcomputing.nl/Tools/atop/kernpatch.html - %prep %setup -q @@ -71,29 +67,29 @@ install -Dp -m 0644 atop.service $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop install -Dp -m 0755 atopacctd $RPM_BUILD_ROOT%{_sbindir}/atopacctd install -Dp -m 0644 atopacct.service $RPM_BUILD_ROOT%{_unitdir}/atopacct.service -%if 0%{?rhel} >= 8 || 0%{?fedora} -install -Dp -m 0755 atopgpud $RPM_BUILD_ROOT%{_sbindir}/atopgpud -install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service -%endif +#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} +#install -Dp -m 0755 atopgpud $RPM_BUILD_ROOT%%{_sbindir}/atopgpud +#install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%%{_unitdir}/atopgpu.service +#%%endif install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %post %systemd_post atop.service atopacct.service atop-rotate.timer -%if 0%{?rhel} >= 8 || 0%{?fedora} -%systemd_post atopgpu.service -%endif +#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} +#%%systemd_post atopgpu.service +#%%endif %preun %systemd_preun atop.service atopacct.service atop-rotate.timer -%if 0%{?rhel} >= 8 || 0%{?fedora} -%systemd_preun atopgpu.service -%endif +#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} +#%%systemd_preun atopgpu.service +#%%endif %postun %systemd_postun_with_restart atop.service atopacct.service atop-rotate.timer -%if 0%{?rhel} >= 8 || 0%{?fedora} -%systemd_postun_with_restart atopgpu.service -%endif +#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} +#%%systemd_postun_with_restart atopgpu.service +#%%endif %files @@ -115,11 +111,15 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_unitdir}/atop*.timer %{_datadir}/atop/atop.daily %{_sbindir}/atopacctd -%if 0%{?rhel} >= 8 || 0%{?fedora} -%{_sbindir}/atopgpud -%endif +#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} +#%%{_sbindir}/atopgpud +#%%endif %changelog +* Tue Jan 11 2022 Gwyn Ciesla - 2.7.1-1 +- 2.7.1 +- Drop atopgpud as it requires proprietary NVIDIA drivers. + * Mon Dec 20 2021 Gwyn Ciesla - 2.7.0-1 - 2.7.0 diff --git a/sources b/sources index 85875e3..b2f76b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.7.0.tar.gz) = f3de85bd041857bfdeb586edcb7b6f700e37cf3bc86bbcbde374eb4aaaa1f1d367b829ee23f299a545c57db5b3de504816c705d4f51bf3be547f79a2d0e99010 +SHA512 (atop-2.7.1.tar.gz) = f5013dbc25b86f07c9892555705bb3db2eeb949478f53e6e5545308b0c7c173c4c7a8ed0eae1f173e075210f81fceee09d7a9d90de76c4f011e38ad4a76b780b From 46b2d7eefd016ecb62fae616d3cedc43dfc88d07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:53:38 +0000 Subject: [PATCH 68/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 1dc453e..592798f 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -116,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Jan 11 2022 Gwyn Ciesla - 2.7.1-1 - 2.7.1 - Drop atopgpud as it requires proprietary NVIDIA drivers. From 268dcfd7c4774167964ae7abbc11c89ad8f45df8 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 09:02:48 -0800 Subject: [PATCH 69/90] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- .cvsignore | 0 Makefile | 21 --------------------- dead.package | 1 + sources | 0 4 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile deleted file mode 100644 index fc4c612..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: atop -# $Id$ -NAME := atop -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 From 3416fcec55855fef45491fbc2f21e6b020c6cc12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:30:22 +0000 Subject: [PATCH 70/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 592798f..ace6795 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -116,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 2.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 8f8fe77667ae46ecdd4c9404b0280079f95fb8e6 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 7 Dec 2022 12:36:59 -0600 Subject: [PATCH 71/90] Include atopacctd man page. --- atop.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index ace6795..b39a252 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -60,6 +60,7 @@ install -Dp -m 0755 atopconvert $RPM_BUILD_ROOT%{_bindir}/atopconvert ln -s atop $RPM_BUILD_ROOT%{_bindir}/atopsar install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 +install -Dp -m 0644 man/atopacctd.8 $RPM_BUILD_ROOT%{_mandir}/man8/atopacctd.8 install -Dp -m 0755 atop.daily $RPM_BUILD_ROOT%{_datadir}/atop/atop.daily install -Dp -m 0644 atop.default $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop install -Dp -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/atopd @@ -106,6 +107,7 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_bindir}/atopconvert %{_mandir}/man1/atop.1.gz %{_mandir}/man1/atopsar.1.gz +%{_mandir}/man8/atopacctd.8.gz %attr(0755,root,root) %dir %{_localstatedir}/log/atop %{_unitdir}/atop*.service %{_unitdir}/atop*.timer @@ -116,6 +118,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Wed Dec 07 2022 Gwyn Ciesla - 2.7.1-4 +- Include atopacctd man page + * Wed Jul 20 2022 Fedora Release Engineering - 2.7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d328ce2d6873508205aaa1f241ae51905d414f73 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 3 Jan 2023 15:51:04 -0600 Subject: [PATCH 72/90] 2.8.0 --- .gitignore | 1 + atop.spec | 19 ++++++++++--------- nvme_support.patch | 11 ----------- sources | 2 +- 4 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 nvme_support.patch diff --git a/.gitignore b/.gitignore index d606f84..8747407 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ atop-1.23.tar.gz /atop-2.6.0.tar.gz /atop-2.7.0.tar.gz /atop-2.7.1.tar.gz +/atop-2.8.0.tar.gz diff --git a/atop.spec b/atop.spec index b39a252..a5ce588 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.7.1 -Release: 4%{?dist} +Version: 2.8.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -10,9 +10,8 @@ URL: https://www.atoptool.nl Source0: https://www.atoptool.nl/download/%{name}-%{version}.tar.gz Source1: atop.d -Patch0: nvme_support.patch -Patch1: atop-sysconfig.patch -Patch2: atop-2.3.0-newer-gcc.patch +Patch0: atop-sysconfig.patch +Patch1: atop-2.3.0-newer-gcc.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -44,9 +43,8 @@ performance-monitors: %prep %setup -q -%patch0 -p0 -b .nvme -%patch1 -p0 -b .sysconfig -%patch2 -p1 -b .newer-gcc +%patch0 -p0 -b .sysconfig +%patch1 -p1 -b .newer-gcc # Correct unit file path sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service @@ -99,7 +97,7 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %else %license COPYING %endif -%doc AUTHOR README* +%doc AUTHORS README* %config(noreplace) %{_sysconfdir}/sysconfig/atop %{_bindir}/atopsar %{_bindir}/atop @@ -118,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Tue Jan 03 2023 Gwyn Ciesla - 2.8.0-1 +- 2.8.0 + * Wed Dec 07 2022 Gwyn Ciesla - 2.7.1-4 - Include atopacctd man page diff --git a/nvme_support.patch b/nvme_support.patch deleted file mode 100644 index bc144a6..0000000 --- a/nvme_support.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ./photosyst.c.orig ./photosyst.c ---- ./photosyst.c.orig 2017-03-25 11:00:03.000000003 +0200 -+++ ./photosyst.c 2017-12-08 01:31:13.795157092 +0200 -@@ -1537,6 +1537,7 @@ static struct { - { "^dasd[a-z][a-z]*$", {0}, nullmodname, DSKTYPE, }, - { "^mmcblk[0-9][0-9]*$", {0}, nullmodname, DSKTYPE, }, - { "^emcpower[a-z][a-z]*$", {0}, nullmodname, DSKTYPE, }, -+ { "^nvme[0-9][a-z][0-9]*$", {0}, nullmodname, DSKTYPE, }, - }; - - static int diff --git a/sources b/sources index b2f76b0..73a5e0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.7.1.tar.gz) = f5013dbc25b86f07c9892555705bb3db2eeb949478f53e6e5545308b0c7c173c4c7a8ed0eae1f173e075210f81fceee09d7a9d90de76c4f011e38ad4a76b780b +SHA512 (atop-2.8.0.tar.gz) = b9fee4c38f680f2d3a75b46627b9149ef83defdbbf5405dbedb7cc71718de2020be328354ad03bcdf48a738b96dd1a8d64610a2138649cb169263bb5cc97bff0 From 15ebd2553034129dc2e2f55a846c24d6e43e78a6 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 9 Jan 2023 08:55:21 -0600 Subject: [PATCH 73/90] 2.8.1 --- .gitignore | 1 + atop.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8747407..b3089e2 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ atop-1.23.tar.gz /atop-2.7.0.tar.gz /atop-2.7.1.tar.gz /atop-2.8.0.tar.gz +/atop-2.8.1.tar.gz diff --git a/atop.spec b/atop.spec index a5ce588..1f1372e 100644 --- a/atop.spec +++ b/atop.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: atop -Version: 2.8.0 +Version: 2.8.1 Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level @@ -116,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Mon Jan 09 2023 Gwyn Ciesla - 2.8.1-1 +- 2.8.1 + * Tue Jan 03 2023 Gwyn Ciesla - 2.8.0-1 - 2.8.0 diff --git a/sources b/sources index 73a5e0b..a38663b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.8.0.tar.gz) = b9fee4c38f680f2d3a75b46627b9149ef83defdbbf5405dbedb7cc71718de2020be328354ad03bcdf48a738b96dd1a8d64610a2138649cb169263bb5cc97bff0 +SHA512 (atop-2.8.1.tar.gz) = d84c1e7f5ba9fd1809b3c1b69db89d596d7df5a9035cc21f12c98ef623dfef90e23756f1f7fc5903234760c75f64b1c6ba314700c41a5cfd09141f16524106cd From 9dfc7630cfb1bd495f13cf8ff93ea46328def196 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 22:24:36 +0000 Subject: [PATCH 74/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 1f1372e..f0c0bd8 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -116,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 09 2023 Gwyn Ciesla - 2.8.1-1 - 2.8.1 From 8d0ea1bcf9e0960e68b95c6bf054da9777a354b2 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Sat, 4 Mar 2023 20:03:36 -0600 Subject: [PATCH 75/90] migrated to SPDX license --- atop.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/atop.spec b/atop.spec index f0c0bd8..5ffd894 100644 --- a/atop.spec +++ b/atop.spec @@ -2,10 +2,10 @@ Name: atop Version: 2.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced interactive monitor to view the load on system and process level -License: GPLv2+ +License: GPL-2.0-or-later URL: https://www.atoptool.nl Source0: https://www.atoptool.nl/download/%{name}-%{version}.tar.gz Source1: atop.d @@ -116,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Sun Mar 05 2023 Gwyn Ciesla - 2.8.1-3 +- migrated to SPDX license + * Wed Jan 18 2023 Fedora Release Engineering - 2.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 4e177691f2690b3f0d79487e3d731a51c9f3c408 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 15 May 2023 10:46:06 -0500 Subject: [PATCH 76/90] 2.9.0 --- .gitignore | 1 + atop.spec | 13 +++++++++---- format.patch | 33 +++++++++++++++++++++++++++++++++ sources | 2 +- 4 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 format.patch diff --git a/.gitignore b/.gitignore index b3089e2..fb5d8a4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ atop-1.23.tar.gz /atop-2.7.1.tar.gz /atop-2.8.0.tar.gz /atop-2.8.1.tar.gz +/atop-2.9.0.tar.gz diff --git a/atop.spec b/atop.spec index 5ffd894..b503481 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.8.1 -Release: 3%{?dist} +Version: 2.9.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -12,6 +12,7 @@ Source1: atop.d Patch0: atop-sysconfig.patch Patch1: atop-2.3.0-newer-gcc.patch +Patch2: format.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -43,8 +44,9 @@ performance-monitors: %prep %setup -q -%patch0 -p0 -b .sysconfig -%patch1 -p1 -b .newer-gcc +%patch -P 0 -p0 -b .sysconfig +%patch -P 1 -p1 -b .newer-gcc +%patch -P 2 -p0 -b .format # Correct unit file path sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service @@ -116,6 +118,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Mon May 15 2023 Gwyn Ciesla - 2.9.0-1 +- 2.9.0 + * Sun Mar 05 2023 Gwyn Ciesla - 2.8.1-3 - migrated to SPDX license diff --git a/format.patch b/format.patch new file mode 100644 index 0000000..1ebf658 --- /dev/null +++ b/format.patch @@ -0,0 +1,33 @@ +--- drawbar.c~ 2023-05-13 03:20:27.000000000 -0500 ++++ drawbar.c 2023-05-15 10:34:00.882788701 -0500 +@@ -2105,7 +2105,7 @@ + { + colorswon(headwin, statuscol); + wattron(headwin, A_REVERSE); +- mvwprintw(headwin, 0, statcol, statusmsg); ++ mvwprintw(headwin, 0, statcol, "%s", statusmsg); + wattroff(headwin, A_REVERSE); + colorswoff(headwin, statuscol); + } +--- drawbar.c~ 2023-05-15 10:34:51.232378376 -0500 ++++ drawbar.c 2023-05-15 10:35:14.888185588 -0500 +@@ -2055,7 +2055,7 @@ + + line -= 1; + wattron(w->win, A_BOLD); +- mvwprintw(w->win, line, column, text); ++ mvwprintw(w->win, line, column, "%s", text); + wattroff(w->win, A_BOLD); + + colorswoff(w->win, color); +--- drawbar.c~ 2023-05-15 10:35:14.888185588 -0500 ++++ drawbar.c 2023-05-15 10:35:35.821014989 -0500 +@@ -2328,7 +2328,7 @@ + + // show the prompt + // +- mvwprintw(mywin, 1, 1, prompt); ++ mvwprintw(mywin, 1, 1, "%s", prompt); + + // prepare reading input + // diff --git a/sources b/sources index a38663b..e6c9016 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.8.1.tar.gz) = d84c1e7f5ba9fd1809b3c1b69db89d596d7df5a9035cc21f12c98ef623dfef90e23756f1f7fc5903234760c75f64b1c6ba314700c41a5cfd09141f16524106cd +SHA512 (atop-2.9.0.tar.gz) = 460e9594bedb552b8e692d2118d38c47e629f435848fa0d6f2f2d83cafcb19c5b77c419a2b9067a39251c5af2fa955f998074efa616221c010428ec07bb3acee From f26edcb2b9a48a552024ba9e5c677670f5233dfa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:04:30 +0000 Subject: [PATCH 77/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index b503481..aabf53c 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -118,6 +118,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon May 15 2023 Gwyn Ciesla - 2.9.0-1 - 2.9.0 From 644589bbd00c1e4ec4cf41466aadee145bcdf65a Mon Sep 17 00:00:00 2001 From: Nikola Kolev Date: Mon, 7 Aug 2023 22:06:22 +0000 Subject: [PATCH 78/90] Remove redundant patch --- atop-2.3.0-newer-gcc.patch | 35 ----------------------------------- atop.spec | 6 ++---- 2 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 atop-2.3.0-newer-gcc.patch diff --git a/atop-2.3.0-newer-gcc.patch b/atop-2.3.0-newer-gcc.patch deleted file mode 100644 index efa1858..0000000 --- a/atop-2.3.0-newer-gcc.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7bf30c52a37118ff4f211e67e1736099f3d1dcb3 Mon Sep 17 00:00:00 2001 -From: Gerlof Langeveld -Date: Sat, 22 Sep 2018 11:50:50 +0200 -Subject: [PATCH] Own macro's added to determine major/minor of logical volume. - The standard 'minor' and 'major' macro's are not available any more in gcc8. - ---- - photosyst.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/photosyst.c b/photosyst.c -index 19cbbe1..019b9e0 100644 ---- a/photosyst.c -+++ b/photosyst.c -@@ -184,6 +184,9 @@ static const char rcsid[] = "$Id: photosyst.c,v 1.38 2010/11/19 07:40:40 gerlof - - #define MAXCNT 64 - -+#define MAJOR(x) ((((unsigned long long)x>>8)&0xfff)|((unsigned int)((unsigned long long)x>>32)&~0xfff)) -+#define MINOR(x) ((x&0xff)|((unsigned int)((unsigned long long)x>>12)&~0xff)) -+ - /* return value of isdisk() */ - #define NONTYPE 0 - #define DSKTYPE 1 -@@ -1479,8 +1482,8 @@ lvmmapname(unsigned int major, unsigned int minor, - */ - strncpy(dmp->name, dentry->d_name, MAXDKNAM); - dmp->name[MAXDKNAM-1] = 0; -- dmp->major = major(statbuf.st_rdev); -- dmp->minor = minor(statbuf.st_rdev); -+ dmp->major = MAJOR(statbuf.st_rdev); -+ dmp->minor = MINOR(statbuf.st_rdev); - - hashix = DMHASH(dmp->major, dmp->minor); - diff --git a/atop.spec b/atop.spec index aabf53c..1450d79 100644 --- a/atop.spec +++ b/atop.spec @@ -11,8 +11,7 @@ Source0: https://www.atoptool.nl/download/%{name}-%{version}.tar.gz Source1: atop.d Patch0: atop-sysconfig.patch -Patch1: atop-2.3.0-newer-gcc.patch -Patch2: format.patch +Patch1: format.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -45,8 +44,7 @@ performance-monitors: %prep %setup -q %patch -P 0 -p0 -b .sysconfig -%patch -P 1 -p1 -b .newer-gcc -%patch -P 2 -p0 -b .format +%patch -P 1 -p0 -b .format # Correct unit file path sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service From 9314ec167348cf764f2d598c26924246b907699c Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 4 Jan 2024 14:30:44 -0600 Subject: [PATCH 79/90] 2.10.0 --- .gitignore | 1 + atop.spec | 16 +++++++++------- format.patch | 33 --------------------------------- sources | 2 +- 4 files changed, 11 insertions(+), 41 deletions(-) delete mode 100644 format.patch diff --git a/.gitignore b/.gitignore index fb5d8a4..f278297 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ atop-1.23.tar.gz /atop-2.8.0.tar.gz /atop-2.8.1.tar.gz /atop-2.9.0.tar.gz +/atop-2.10.0.tar.gz diff --git a/atop.spec b/atop.spec index 1450d79..35b427d 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.9.0 -Release: 2%{?dist} +Version: 2.10.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -11,13 +11,13 @@ Source0: https://www.atoptool.nl/download/%{name}-%{version}.tar.gz Source1: atop.d Patch0: atop-sysconfig.patch -Patch1: format.patch BuildRequires: gcc BuildRequires: zlib-devel -BuildRequires: ncurses-devel +BuildRequires: ncurses-devel +BuildRequires: glib2-devel BuildRequires: systemd -BuildRequires: make +BuildRequires: make #%%if 0%%{?rhel} >= 8 || 0%%{?fedora} #Requires: python3-py3nvml #%%endif @@ -44,13 +44,12 @@ performance-monitors: %prep %setup -q %patch -P 0 -p0 -b .sysconfig -%patch -P 1 -p0 -b .format # Correct unit file path sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS $(pkg-config --cflags glib-2.0) -I." %install install -Dp -m 0755 atop $RPM_BUILD_ROOT%{_bindir}/atop @@ -116,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Thu Jan 04 2024 Gwyn Ciesla - 2.10.0-1 +- 2.10.0 + * Wed Jul 19 2023 Fedora Release Engineering - 2.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/format.patch b/format.patch deleted file mode 100644 index 1ebf658..0000000 --- a/format.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- drawbar.c~ 2023-05-13 03:20:27.000000000 -0500 -+++ drawbar.c 2023-05-15 10:34:00.882788701 -0500 -@@ -2105,7 +2105,7 @@ - { - colorswon(headwin, statuscol); - wattron(headwin, A_REVERSE); -- mvwprintw(headwin, 0, statcol, statusmsg); -+ mvwprintw(headwin, 0, statcol, "%s", statusmsg); - wattroff(headwin, A_REVERSE); - colorswoff(headwin, statuscol); - } ---- drawbar.c~ 2023-05-15 10:34:51.232378376 -0500 -+++ drawbar.c 2023-05-15 10:35:14.888185588 -0500 -@@ -2055,7 +2055,7 @@ - - line -= 1; - wattron(w->win, A_BOLD); -- mvwprintw(w->win, line, column, text); -+ mvwprintw(w->win, line, column, "%s", text); - wattroff(w->win, A_BOLD); - - colorswoff(w->win, color); ---- drawbar.c~ 2023-05-15 10:35:14.888185588 -0500 -+++ drawbar.c 2023-05-15 10:35:35.821014989 -0500 -@@ -2328,7 +2328,7 @@ - - // show the prompt - // -- mvwprintw(mywin, 1, 1, prompt); -+ mvwprintw(mywin, 1, 1, "%s", prompt); - - // prepare reading input - // diff --git a/sources b/sources index e6c9016..322780e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.9.0.tar.gz) = 460e9594bedb552b8e692d2118d38c47e629f435848fa0d6f2f2d83cafcb19c5b77c419a2b9067a39251c5af2fa955f998074efa616221c010428ec07bb3acee +SHA512 (atop-2.10.0.tar.gz) = 72a9307ed0cfa9c0157c81e8acbb4850ae339b50481ce2e1b828cad4b3354bfc8f56866c9c4df72ea34941359719d088f7936182d1478a6ac8f4e1bdf4bee7f4 From 08096aa8894ccb4008a1b3fc02061f80687ed62a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:51:15 +0000 Subject: [PATCH 80/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 35b427d..b57c46c 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -115,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 04 2024 Gwyn Ciesla - 2.10.0-1 - 2.10.0 From d8f97cf14a5ae23f69d441f1559da4875c3a5376 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:46:47 +0000 Subject: [PATCH 81/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index b57c46c..0ea4f00 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -115,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2ff6c7ccdb61778fd630108be5571bb47713bc23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:46:04 +0000 Subject: [PATCH 82/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 0ea4f00..dcd3700 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.10.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -115,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.10.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 2.10.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 34d28480d05969afdfb994f43c24ab525dbd8169 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 29 Jul 2024 13:54:21 -0500 Subject: [PATCH 83/90] 2.11.0 --- .gitignore | 1 + atop.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f278297..2268628 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ atop-1.23.tar.gz /atop-2.8.1.tar.gz /atop-2.9.0.tar.gz /atop-2.10.0.tar.gz +/atop-2.11.0.tar.gz diff --git a/atop.spec b/atop.spec index dcd3700..e4f5763 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.10.0 -Release: 4%{?dist} +Version: 2.11.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -115,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Mon Jul 29 2024 Gwyn Ciesla - 2.11.0-1 +- 2.11.0 + * Wed Jul 17 2024 Fedora Release Engineering - 2.10.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 322780e..5c10caa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.10.0.tar.gz) = 72a9307ed0cfa9c0157c81e8acbb4850ae339b50481ce2e1b828cad4b3354bfc8f56866c9c4df72ea34941359719d088f7936182d1478a6ac8f4e1bdf4bee7f4 +SHA512 (atop-2.11.0.tar.gz) = f43881fcc9fa8bfe6837bd8228b9fc7fc7679f84e51af80ab5e9f89915e254fbf6e24c7bf78c22814d8d9db5b012d46ca75ff5abe1dfde3b51d94fa29fed077a From 5647d2621c369f38d488cd3bb2e17b7bfc9d2f90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:54:37 +0000 Subject: [PATCH 84/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index e4f5763..c9553b3 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -115,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jul 29 2024 Gwyn Ciesla - 2.11.0-1 - 2.11.0 From bdd4cb343f7a57bc9a408996c3cbcf2da0ce9be9 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 29 Jan 2025 12:28:22 -0600 Subject: [PATCH 85/90] fix FTBFS --- atop.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/atop.spec b/atop.spec index c9553b3..2db4781 100644 --- a/atop.spec +++ b/atop.spec @@ -18,9 +18,6 @@ BuildRequires: ncurses-devel BuildRequires: glib2-devel BuildRequires: systemd BuildRequires: make -#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} -#Requires: python3-py3nvml -#%%endif Requires(post): systemd Requires(preun): systemd @@ -49,7 +46,7 @@ performance-monitors: sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS $(pkg-config --cflags glib-2.0) -I." +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS $(pkg-config --cflags glib-2.0) -I. -std=gnu17" %install install -Dp -m 0755 atop $RPM_BUILD_ROOT%{_bindir}/atop From 697cb12daf2cd6749c7949e17cbce701e716a4d9 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 31 Mar 2025 08:49:24 -0500 Subject: [PATCH 86/90] 2.11.1 --- .gitignore | 1 + atop.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2268628..a220581 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ atop-1.23.tar.gz /atop-2.9.0.tar.gz /atop-2.10.0.tar.gz /atop-2.11.0.tar.gz +/atop-2.11.1.tar.gz diff --git a/atop.spec b/atop.spec index 2db4781..2473220 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.11.0 -Release: 2%{?dist} +Version: 2.11.1 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -93,7 +93,7 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %else %license COPYING %endif -%doc AUTHORS README* +%doc README* %config(noreplace) %{_sysconfdir}/sysconfig/atop %{_bindir}/atopsar %{_bindir}/atop @@ -112,6 +112,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Mon Mar 31 2025 Gwyn Ciesla - 2.11.1-1 +- 2.11.1 + * Thu Jan 16 2025 Fedora Release Engineering - 2.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 5c10caa..1be10d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.11.0.tar.gz) = f43881fcc9fa8bfe6837bd8228b9fc7fc7679f84e51af80ab5e9f89915e254fbf6e24c7bf78c22814d8d9db5b012d46ca75ff5abe1dfde3b51d94fa29fed077a +SHA512 (atop-2.11.1.tar.gz) = 6c3301ecc7fa261bc9f9a9d285315b048aa56fdf94629b1e4ad2634b0cf048d70afe7813b1a44506756d6af05b8b78df76df995aa6f4c404bf01fd6225839a3d From 69cf1d15deb198d087ffe866668f3bf3d9c62dbe Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 16 Jun 2025 10:35:48 -0500 Subject: [PATCH 87/90] 2.12.0 --- .gitignore | 1 + atop.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a220581..59844ce 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ atop-1.23.tar.gz /atop-2.10.0.tar.gz /atop-2.11.0.tar.gz /atop-2.11.1.tar.gz +/atop-2.12.0.tar.gz diff --git a/atop.spec b/atop.spec index 2473220..9e4fd91 100644 --- a/atop.spec +++ b/atop.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: atop -Version: 2.11.1 +Version: 2.12.0 Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level @@ -112,6 +112,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Mon Jun 16 2025 Gwyn Ciesla - 2.12.0-1 +- 2.12.0 + * Mon Mar 31 2025 Gwyn Ciesla - 2.11.1-1 - 2.11.1 diff --git a/sources b/sources index 1be10d8..28b0272 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.11.1.tar.gz) = 6c3301ecc7fa261bc9f9a9d285315b048aa56fdf94629b1e4ad2634b0cf048d70afe7813b1a44506756d6af05b8b78df76df995aa6f4c404bf01fd6225839a3d +SHA512 (atop-2.12.0.tar.gz) = d0cee89b6d187b853726d025ddedb067a91aa4b71195e125d2a4a2d9057acd149b92f48a5d633729e36634c70d60334ce72f73ef8051861ba4c7e482e17cd5ff From ecd35340fe48b2d188bbaade49c087ff2ce223dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:24:31 +0000 Subject: [PATCH 88/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 9e4fd91..6eb17f0 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -112,6 +112,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.12.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 16 2025 Gwyn Ciesla - 2.12.0-1 - 2.12.0 From 384c53ff7b54aabf4c905372ed132fbfdbf12ae3 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 23 Sep 2025 14:02:50 -0500 Subject: [PATCH 89/90] 2.12.1 --- .gitignore | 1 + atop.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 59844ce..6afb65f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ atop-1.23.tar.gz /atop-2.11.0.tar.gz /atop-2.11.1.tar.gz /atop-2.12.0.tar.gz +/atop-2.12.1.tar.gz diff --git a/atop.spec b/atop.spec index 6eb17f0..6ff8297 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.12.0 -Release: 2%{?dist} +Version: 2.12.1 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -112,6 +112,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Tue Sep 23 2025 Gwyn Ciesla - 2.12.1-1 +- 2.12.1 + * Wed Jul 23 2025 Fedora Release Engineering - 2.12.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 28b0272..5ba284b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.12.0.tar.gz) = d0cee89b6d187b853726d025ddedb067a91aa4b71195e125d2a4a2d9057acd149b92f48a5d633729e36634c70d60334ce72f73ef8051861ba4c7e482e17cd5ff +SHA512 (atop-2.12.1.tar.gz) = e01db51bf025598e7bad585f62761e10d23a77f6c7be96418bc8919a72c74628851ae5cbdc0c12ed752f80b44f5b72f2102692dbbb3210cacc59b32340107ce7 From 8a5871f434992a55951824863d4956d2a44479be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 04:06:36 +0000 Subject: [PATCH 90/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 6ff8297..c7c32b4 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -112,6 +112,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Sep 23 2025 Gwyn Ciesla - 2.12.1-1 - 2.12.1