Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] atop: update to 2.6.0.
@ 2021-10-11 14:24 TinfoilSubmarine
  2021-10-11 19:53 ` [PR REVIEW] " Chocimier
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: TinfoilSubmarine @ 2021-10-11 14:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages atop
https://github.com/void-linux/void-packages/pull/33480

atop: update to 2.6.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33480.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-atop-33480.patch --]
[-- Type: text/x-diff, Size: 4177 bytes --]

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"
 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR REVIEW] atop: update to 2.6.0.
  2021-10-11 14:24 [PR PATCH] atop: update to 2.6.0 TinfoilSubmarine
@ 2021-10-11 19:53 ` Chocimier
  2021-10-12  1:07 ` [PR PATCH] [Updated] " TinfoilSubmarine
  2021-10-12 18:30 ` [PR PATCH] [Merged]: " ericonr
  2 siblings, 0 replies; 4+ messages in thread
From: Chocimier @ 2021-10-11 19:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/33480#discussion_r726532487

Comment:
I think this don't rewrite shebang, because script already have python2 one, and python_version= can be dropped.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] atop: update to 2.6.0.
  2021-10-11 14:24 [PR PATCH] atop: update to 2.6.0 TinfoilSubmarine
  2021-10-11 19:53 ` [PR REVIEW] " Chocimier
@ 2021-10-12  1:07 ` TinfoilSubmarine
  2021-10-12 18:30 ` [PR PATCH] [Merged]: " ericonr
  2 siblings, 0 replies; 4+ messages in thread
From: TinfoilSubmarine @ 2021-10-12  1:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages atop
https://github.com/void-linux/void-packages/pull/33480

atop: update to 2.6.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33480.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-atop-33480.patch --]
[-- Type: text/x-diff, Size: 4158 bytes --]

From f7c18254e74f0ec9ef371ed48cb68e3aa91b0ad8 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                        |  5 ++--
 4 files changed, 20 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..eec97dfae5fa 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,7 @@ 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
 
 make_dirs="/var/log/atop 755 root root"
 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Merged]: atop: update to 2.6.0.
  2021-10-11 14:24 [PR PATCH] atop: update to 2.6.0 TinfoilSubmarine
  2021-10-11 19:53 ` [PR REVIEW] " Chocimier
  2021-10-12  1:07 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2021-10-12 18:30 ` ericonr
  2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-10-12 18:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1433 bytes --]

There's a merged pull request on the void-packages repository

atop: update to 2.6.0.
https://github.com/void-linux/void-packages/pull/33480

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-10-12 18:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-11 14:24 [PR PATCH] atop: update to 2.6.0 TinfoilSubmarine
2021-10-11 19:53 ` [PR REVIEW] " Chocimier
2021-10-12  1:07 ` [PR PATCH] [Updated] " TinfoilSubmarine
2021-10-12 18:30 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).