Compare commits
No commits in common. "rawhide" and "f37" have entirely different histories.
5 changed files with 82 additions and 49 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -12,8 +12,3 @@ 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
|
||||
/atop-2.11.0.tar.gz
|
||||
/atop-2.11.1.tar.gz
|
||||
/atop-2.12.0.tar.gz
|
||||
/atop-2.12.1.tar.gz
|
||||
|
|
|
|||
35
atop-2.3.0-newer-gcc.patch
Normal file
35
atop-2.3.0-newer-gcc.patch
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
From 7bf30c52a37118ff4f211e67e1736099f3d1dcb3 Mon Sep 17 00:00:00 2001
|
||||
From: Gerlof Langeveld <gerlof.langeveld@atoptool.nl>
|
||||
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);
|
||||
|
||||
56
atop.spec
56
atop.spec
|
|
@ -1,8 +1,8 @@
|
|||
%define _hardened_build 1
|
||||
|
||||
Name: atop
|
||||
Version: 2.12.1
|
||||
Release: 2%{?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
|
||||
|
|
@ -11,13 +11,17 @@ 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
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: systemd
|
||||
BuildRequires: make
|
||||
BuildRequires: make
|
||||
#%%if 0%%{?rhel} >= 8 || 0%%{?fedora}
|
||||
#Requires: python3-py3nvml
|
||||
#%%endif
|
||||
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
|
|
@ -41,12 +45,14 @@ performance-monitors:
|
|||
%prep
|
||||
%setup -q
|
||||
%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
|
||||
|
||||
%build
|
||||
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS $(pkg-config --cflags glib-2.0) -I. -std=gnu17"
|
||||
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
|
||||
|
||||
%install
|
||||
install -Dp -m 0755 atop $RPM_BUILD_ROOT%{_bindir}/atop
|
||||
|
|
@ -93,7 +99,7 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/
|
|||
%else
|
||||
%license COPYING
|
||||
%endif
|
||||
%doc README*
|
||||
%doc AUTHORS README*
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/atop
|
||||
%{_bindir}/atopsar
|
||||
%{_bindir}/atop
|
||||
|
|
@ -112,42 +118,6 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/
|
|||
#%%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Tue Sep 23 2025 Gwyn Ciesla <gwync@protonmail.com> - 2.12.1-1
|
||||
- 2.12.1
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Mon Jun 16 2025 Gwyn Ciesla <gwync@protonmail.com> - 2.12.0-1
|
||||
- 2.12.0
|
||||
|
||||
* Mon Mar 31 2025 Gwyn Ciesla <gwync@protonmail.com> - 2.11.1-1
|
||||
- 2.11.1
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Mon Jul 29 2024 Gwyn Ciesla <gwync@protonmail.com> - 2.11.0-1
|
||||
- 2.11.0
|
||||
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Jan 04 2024 Gwyn Ciesla <gwync@protonmail.com> - 2.10.0-1
|
||||
- 2.10.0
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Mon May 15 2023 Gwyn Ciesla <gwync@protonmail.com> - 2.9.0-1
|
||||
- 2.9.0
|
||||
|
||||
|
|
|
|||
33
format.patch
Normal file
33
format.patch
Normal file
|
|
@ -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
|
||||
//
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (atop-2.12.1.tar.gz) = e01db51bf025598e7bad585f62761e10d23a77f6c7be96418bc8919a72c74628851ae5cbdc0c12ed752f80b44f5b72f2102692dbbb3210cacc59b32340107ce7
|
||||
SHA512 (atop-2.9.0.tar.gz) = 460e9594bedb552b8e692d2118d38c47e629f435848fa0d6f2f2d83cafcb19c5b77c419a2b9067a39251c5af2fa955f998074efa616221c010428ec07bb3acee
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue