public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/
@ 2024-08-11 21:14 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-08-11 21:14 UTC (permalink / raw
  To: gentoo-commits

commit:     9447f32d8725376b2d3f3865717e7302bc50d3cd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 21:01:27 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 21:14:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9447f32d

sys-process/atop: tweak PKG_CONFIG patch

This matches the upstream version more closely.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch | 4 ++--
 sys-process/atop/files/atop-2.10.0-respect-opt.patch        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch b/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch
index 483506043490..edfa88c7a889 100644
--- a/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch
+++ b/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch
@@ -7,8 +7,8 @@
 -CFLAGS  += -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
 -LDFLAGS += $(shell pkg-config --libs glib-2.0)
 +PKG_CONFIG ?= pkg-config
-+CFLAGS  += -O2 -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
-+LDFLAGS += $(shell ${PKG_CONFIG} --libs glib-2.0)
++CFLAGS  += -O2 -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
++LDFLAGS += $(shell $(PKG_CONFIG) --libs glib-2.0)
  OBJMOD0  = version.o
  OBJMOD1  = various.o  deviate.o   procdbase.o
  OBJMOD2  = acctproc.o photoproc.o photosyst.o  rawlog.o ifprop.o parseable.o

diff --git a/sys-process/atop/files/atop-2.10.0-respect-opt.patch b/sys-process/atop/files/atop-2.10.0-respect-opt.patch
index 5a55e6f2f835..2acb4ec53f51 100644
--- a/sys-process/atop/files/atop-2.10.0-respect-opt.patch
+++ b/sys-process/atop/files/atop-2.10.0-respect-opt.patch
@@ -5,8 +5,8 @@ Don't force -O2.
  PMPATHD  = /usr/lib/systemd/system-sleep
  
  PKG_CONFIG ?= pkg-config
--CFLAGS  += -O2 -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
-+CFLAGS  += -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
+-CFLAGS  += -O2 -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
++CFLAGS  += -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
  LDFLAGS += $(shell ${PKG_CONFIG} --libs glib-2.0)
  OBJMOD0  = version.o
  OBJMOD1  = various.o  deviate.o   procdbase.o


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/
@ 2024-08-12 17:52 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-08-12 17:52 UTC (permalink / raw
  To: gentoo-commits

commit:     2217cdf56cb81085933c4c373178c154f58f8c72
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 17:51:33 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 17:52:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2217cdf5

sys-process/atop: fix patches for 2.10.0

Closes: https://bugs.gentoo.org/937830
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch | 4 ++--
 sys-process/atop/files/atop-2.10.0-respect-opt.patch        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch b/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch
index edfa88c7a889..483506043490 100644
--- a/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch
+++ b/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch
@@ -7,8 +7,8 @@
 -CFLAGS  += -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
 -LDFLAGS += $(shell pkg-config --libs glib-2.0)
 +PKG_CONFIG ?= pkg-config
-+CFLAGS  += -O2 -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
-+LDFLAGS += $(shell $(PKG_CONFIG) --libs glib-2.0)
++CFLAGS  += -O2 -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
++LDFLAGS += $(shell ${PKG_CONFIG} --libs glib-2.0)
  OBJMOD0  = version.o
  OBJMOD1  = various.o  deviate.o   procdbase.o
  OBJMOD2  = acctproc.o photoproc.o photosyst.o  rawlog.o ifprop.o parseable.o

diff --git a/sys-process/atop/files/atop-2.10.0-respect-opt.patch b/sys-process/atop/files/atop-2.10.0-respect-opt.patch
index 2acb4ec53f51..5a55e6f2f835 100644
--- a/sys-process/atop/files/atop-2.10.0-respect-opt.patch
+++ b/sys-process/atop/files/atop-2.10.0-respect-opt.patch
@@ -5,8 +5,8 @@ Don't force -O2.
  PMPATHD  = /usr/lib/systemd/system-sleep
  
  PKG_CONFIG ?= pkg-config
--CFLAGS  += -O2 -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
-+CFLAGS  += -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
+-CFLAGS  += -O2 -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
++CFLAGS  += -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
  LDFLAGS += $(shell ${PKG_CONFIG} --libs glib-2.0)
  OBJMOD0  = version.o
  OBJMOD1  = various.o  deviate.o   procdbase.o


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/
@ 2023-12-31  2:38 Conrad Kostecki
  0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2023-12-31  2:38 UTC (permalink / raw
  To: gentoo-commits

commit:     c178370cc41fd7194e0289592538df9a15103cb7
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Dec 29 14:22:56 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 02:36:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c178370c

sys-process/atop: remove unused files

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34541
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sys-process/atop/files/atop.rc-r2       |  8 -------
 sys-process/atop/files/atop.service     | 11 ---------
 sys-process/atop/files/atopacct.rc      | 40 ---------------------------------
 sys-process/atop/files/atopacct.service | 14 ------------
 4 files changed, 73 deletions(-)

diff --git a/sys-process/atop/files/atop.rc-r2 b/sys-process/atop/files/atop.rc-r2
deleted file mode 100644
index ce66821dbdd5..000000000000
--- a/sys-process/atop/files/atop.rc-r2
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Resource-specific view of processes"
-pidfile="/var/run/atop.pid"
-command="/usr/share/atop/atop.daily"
-command_background="true"

diff --git a/sys-process/atop/files/atop.service b/sys-process/atop/files/atop.service
deleted file mode 100644
index 09295b9acd12..000000000000
--- a/sys-process/atop/files/atop.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Atop advanced performance monitor
-Documentation=man:atop(1)
-
-[Service]
-Type=simple
-ExecStart=/etc/atop/atop.daily
-KillSignal=SIGUSR2
-
-[Install]
-WantedBy=multi-user.target

diff --git a/sys-process/atop/files/atopacct.rc b/sys-process/atop/files/atopacct.rc
deleted file mode 100644
index c68ca3e6b3a8..000000000000
--- a/sys-process/atop/files/atopacct.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Resource-specific view of processes"
-command="/usr/sbin/atopacctd"
-lockfile="/var/lock/subsys/atopacctd"
-
-start_pre() {
-	# Check if process accounting already in use via psacct
-        for PACCTFILE in /var/account/pacct /var/log/pacct ; do
-                if [ -f "${PACCTFILE}" ] ; then
-                        BEFORSIZE=$(stat -c %s "${PACCTFILE}")
-                        AFTERSIZE=$(stat -c %s "${PACCTFILE}")
-
-                        # verify if accounting file grows, so is in use
-                        if [ ${BEFORSIZE} -lt ${AFTERSIZE} ] ; then
-				ewarn "Process accounting already used by psacct!"
-				return 1
-			fi
-		fi
-	done
-
-	checkpath -d -q ${lockfile%/*} || return 1
-}
-
-start() {
-	ebegin "Starting atopacctd"
-	start-stop-daemon --start --exec ${command}
-	touch ${lockfile}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping atopacctd"
-	start-stop-daemon --stop --exec ${command}
-	rm ${lockfile}
-	eend $?
-}
-

diff --git a/sys-process/atop/files/atopacct.service b/sys-process/atop/files/atopacct.service
deleted file mode 100644
index 1f51ec41916a..000000000000
--- a/sys-process/atop/files/atopacct.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Atop process accounting daemon
-Documentation=man:atopacctd(8)
-Conflicts=psacct.service
-After=syslog.target
-Before=atop.service
-
-[Service]
-Type=forking
-PIDFile=/var/run/atopacctd.pid
-ExecStart=/usr/sbin/atopacctd
-
-[Install]
-WantedBy=multi-user.target


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/
@ 2022-03-12 18:45 David Seifert
  0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2022-03-12 18:45 UTC (permalink / raw
  To: gentoo-commits

commit:     505802aa5de5dd0531dba4a8229d03664d02785b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Mar 12 18:45:05 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 18:45:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=505802aa

sys-process/atop: remove unused file

Closes: https://github.com/gentoo/gentoo/pull/24378
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-process/atop/files/atop.service-r1 | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/sys-process/atop/files/atop.service-r1 b/sys-process/atop/files/atop.service-r1
deleted file mode 100644
index ba1575ba835e..000000000000
--- a/sys-process/atop/files/atop.service-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Atop advanced performance monitor
-Documentation=man:atop(1)
-
-[Service]
-Type=simple
-ExecStart=/usr/share/atop/atop.daily
-KillSignal=SIGUSR2
-
-[Install]
-WantedBy=multi-user.target


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/
@ 2017-08-02 12:56 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2017-08-02 12:56 UTC (permalink / raw
  To: gentoo-commits

commit:     a1d059a3a560a5c93d3b9f6fe38d9789bf37b99c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  2 12:55:16 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Aug  2 12:56:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1d059a3

sys-process/atop: Fixed init script for atop-2.2 (bug #553246).

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sys-process/atop/files/atop.rc-r1 | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/sys-process/atop/files/atop.rc-r1 b/sys-process/atop/files/atop.rc-r1
index e4d894e7328..c5172283a21 100644
--- a/sys-process/atop/files/atop.rc-r1
+++ b/sys-process/atop/files/atop.rc-r1
@@ -1,14 +1,8 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="Resource-specific view of processes"
 pidfile="/var/run/atop.pid"
-command="/usr/bin/atop"
-
-start() {
-	ebegin "Starting atop"
-	start-stop-daemon --start --pidfile ${pidfile} \
-		--exec /etc/atop/atop.daily
-	eend $?
-}
+command="/etc/atop/atop.daily"
+command_background="true"


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

end of thread, other threads:[~2024-08-12 17:52 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-11 21:14 [gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-08-12 17:52 Sam James
2023-12-31  2:38 Conrad Kostecki
2022-03-12 18:45 David Seifert
2017-08-02 12:56 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox