From 75620add1b478f27d578477badc53910f2870bd8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 11 Oct 2021 10:20:38 -0400
Subject: [PATCH] atop: update to 2.6.0.

---
 srcpkgs/atop/patches/atop-bb-compat.patch    | 28 ++++++--------------
 srcpkgs/atop/patches/fix-cflags.patch        | 11 --------
 srcpkgs/atop/patches/musl-fix-includes.patch | 20 +++++++-------
 srcpkgs/atop/template                        |  6 ++---
 4 files changed, 21 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/atop/patches/fix-cflags.patch

diff --git a/srcpkgs/atop/patches/atop-bb-compat.patch b/srcpkgs/atop/patches/atop-bb-compat.patch
index 20f849e97b9d..5995eb4a0392 100644
--- a/srcpkgs/atop/patches/atop-bb-compat.patch
+++ b/srcpkgs/atop/patches/atop-bb-compat.patch
@@ -1,36 +1,24 @@
-diff --git atop.daily atop.daily
-index c72214c..ac4b3b7 100755
---- a/atop.daily
-+++ b/atop.daily
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- CURDAY=`date +%Y%m%d`
- LOGPATH=/var/log/atop
- BINPATH=/usr/bin
-@@ -7,15 +7,20 @@ INTERVAL=600		# interval 10 minutes
+--- a/atop.daily	2021-10-11 10:06:37.318316573 -0400
++++ b/atop.daily	2021-10-11 10:10:51.593483875 -0400
+@@ -30,13 +30,18 @@
  
  # verify if atop still runs for daily logging
  #
--if [ -e $PIDFILE ] && ps -p `cat $PIDFILE` | grep 'atop$' > /dev/null
+-if [ -e "$PIDFILE" ] && ps -p `cat "$PIDFILE"` | grep 'atop$' > /dev/null
 +pid=
 +if [ -e $PIDFILE ]; then
-+       pid=$(cat $PIDFILE)
++	pid=$(cat $PIDFILE)
 +fi
 +
 +if [ -n "$pid" ] && [ -d /proc/$pid ]
  then
--	kill -USR2 `cat $PIDFILE`       # final sample and terminate
+-	kill -USR2 `cat "$PIDFILE"`       # final sample and terminate
 +	kill -USR2 $pid       # final sample and terminate
  
  	CNT=0
  
--	while ps -p `cat $PIDFILE` > /dev/null
+-	while ps -p `cat "$PIDFILE"` > /dev/null
 +	while [ -d /proc/$pid ]
  	do
--		let CNT+=1
-+		CNT=$(($CNT + 1))
+ 		CNT=$((CNT + 1))
  
- 		if [ $CNT -gt 5 ]
- 		then
diff --git a/srcpkgs/atop/patches/fix-cflags.patch b/srcpkgs/atop/patches/fix-cflags.patch
deleted file mode 100644
index 3838a87a5a14..000000000000
--- a/srcpkgs/atop/patches/fix-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile	2016-02-26 23:20:11.536799936 +0100
-+++ b/Makefile	2016-02-26 23:20:19.545799337 +0100
-@@ -39,7 +39,7 @@ atopacctd:	atopacctd.o netlink.o
- 		$(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
- 
- netlink.o:	netlink.c
--		$(CC) -I. -Wall -c netlink.c
-+		$(CC) -I. -Wall -c netlink.c $(CFLAGS)
- 
- clean:
- 		rm -f *.o
diff --git a/srcpkgs/atop/patches/musl-fix-includes.patch b/srcpkgs/atop/patches/musl-fix-includes.patch
index eac397fec348..0fc1f0520ef2 100644
--- a/srcpkgs/atop/patches/musl-fix-includes.patch
+++ b/srcpkgs/atop/patches/musl-fix-includes.patch
@@ -1,13 +1,3 @@
---- a/deviate.c
-+++ b/deviate.c
-@@ -178,6 +178,7 @@
- #include <stdio.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <limits.h>
- #include <memory.h>
 --- a/procdbase.c
 +++ b/procdbase.c
 @@ -67,7 +67,7 @@
@@ -19,3 +9,13 @@
  
  #include "atop.h"
  #include "photoproc.h"
+--- a/photosyst.c	2021-10-11 10:19:03.436752176 -0400
++++ b/photosyst.c	2021-10-11 10:19:17.451816812 -0400
+@@ -165,6 +165,7 @@
+ #include <dirent.h>
+ #include <sys/ioctl.h>
+ #include <sys/sysmacros.h>
++#include <limits.h>
+ 
+ #define SCALINGMAXCPU	8	// threshold for scaling info per CPU
+ 
diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template
index 8c981e657879..fc282b517666 100644
--- a/srcpkgs/atop/template
+++ b/srcpkgs/atop/template
@@ -1,6 +1,6 @@
 # Template file for 'atop'
 pkgname=atop
-version=2.5.0
+version=2.6.0
 revision=1
 build_style=gnu-makefile
 make_install_target="sysvinstall"
@@ -10,8 +10,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.atoptool.nl/"
 distfiles="https://www.atoptool.nl/download/atop-${version}.tar.gz"
-checksum=4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33
-python_version=2 #unverified
+checksum=9ec2ca3a571692f7efaa095f99a5106432bcb71cc22cd6c49597ef0481058f72
+python_version=3
 
 make_dirs="/var/log/atop 755 root root"