Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (2709c3da0e43f18194e2796a94750d7a9295bb1f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (2709c3da0e43f18194e2796a94750d7a9295bb1f)
  • Date: Sun, 14 May 2023 02:14:11 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

utils/atop/DETAILS | 4
utils/atop/HISTORY | 4
utils/atop/PRE_BUILD | 3
utils/atop/patches/0001-Fix-undefined-PATH_MAX.patch | 25 --
utils/atop/patches/0002-Remove-O2-from-CFLAGS.patch | 26 --
utils/atop/patches/0003-Replace-vwprintw-with-vw_printw.patch | 26 --
utils/atop/patches/0004-Makefile-Cleanup-install-target.patch | 102
----------
7 files changed, 6 insertions(+), 184 deletions(-)

New commits:
commit 2709c3da0e43f18194e2796a94750d7a9295bb1f
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

utils/atop: version 2.9.0

diff --git a/utils/atop/DETAILS b/utils/atop/DETAILS
index 7ab89ac..e13b774 100755
--- a/utils/atop/DETAILS
+++ b/utils/atop/DETAILS
@@ -1,8 +1,8 @@
SPELL=atop
- VERSION=2.6.0
+ VERSION=2.9.0
+
SOURCE_HASH=sha512:460e9594bedb552b8e692d2118d38c47e629f435848fa0d6f2f2d83cafcb19c5b77c419a2b9067a39251c5af2fa955f998074efa616221c010428ec07bb3acee
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://www.atoptool.nl/download/${SOURCE}
-
SOURCE_HASH=sha512:8d4e2ae56a63738fc615f294d1f4e27cd9eab20acaf5d36c82d87390f96d38cf28cab0a00507459c3ce6e535294a442c4546e0cf732bad253cb518a14cdf5e88
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=https://www.atoptool.nl/
ENTERED=20020725
diff --git a/utils/atop/HISTORY b/utils/atop/HISTORY
index fcbfd42..96c3995 100644
--- a/utils/atop/HISTORY
+++ b/utils/atop/HISTORY
@@ -1,3 +1,7 @@
+2023-05-13 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 2.9.0
+ * PRE_BUILD, patches/*: deleted
+
2021-09-15 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 2.6.0
* INSTALL, gcc-8.patch: removed, no longer needed
diff --git a/utils/atop/PRE_BUILD b/utils/atop/PRE_BUILD
deleted file mode 100755
index 4bc94aa..0000000
--- a/utils/atop/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir patches
diff --git a/utils/atop/patches/0001-Fix-undefined-PATH_MAX.patch
b/utils/atop/patches/0001-Fix-undefined-PATH_MAX.patch
deleted file mode 100644
index 2bf1761..0000000
--- a/utils/atop/patches/0001-Fix-undefined-PATH_MAX.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6bfbe45d03e7878aaf8167485f981005c055c300 Mon Sep 17 00:00:00 2001
-From: Ismael Luceno <ismael AT iodev.co.uk>
-Date: Wed, 15 Sep 2021 00:03:15 +0200
-Subject: [PATCH 1/4] Fix undefined PATH_MAX
-
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- photosyst.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/photosyst.c b/photosyst.c
-index 3de874b5a422..3a8253c971e3 100644
---- a/photosyst.c
-+++ b/photosyst.c
-@@ -149,6 +149,7 @@
- **
- */
-
-+#include <limits.h>
- #include <sys/types.h>
- #include <stdio.h>
- #include <string.h>
---
-2.33.0
-
diff --git a/utils/atop/patches/0002-Remove-O2-from-CFLAGS.patch
b/utils/atop/patches/0002-Remove-O2-from-CFLAGS.patch
deleted file mode 100644
index 90626ae..0000000
--- a/utils/atop/patches/0002-Remove-O2-from-CFLAGS.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4611e43b6475c2d12fdaf4dd895f979aacfe401b Mon Sep 17 00:00:00 2001
-From: Ismael Luceno <ismael AT iodev.co.uk>
-Date: Wed, 15 Sep 2021 00:03:15 +0200
-Subject: [PATCH 2/4] Remove -O2 from CFLAGS
-
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 62e81ef74788..ad31de91cfa1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -20,7 +20,7 @@ PMPATH1 = /usr/lib/pm-utils/sleep.d
- PMPATH2 = /usr/lib64/pm-utils/sleep.d
- PMPATHD = /usr/lib/systemd/system-sleep
-
--CFLAGS += -O2 -I. -Wall -Wno-stringop-truncation # -DNOPERFEVENT #
-DHTTPSTATS
-+CFLAGS += -I. -Wall -Wno-stringop-truncation
- OBJMOD0 = version.o
- OBJMOD1 = various.o deviate.o procdbase.o
- OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o
---
-2.33.0
-
diff --git a/utils/atop/patches/0003-Replace-vwprintw-with-vw_printw.patch
b/utils/atop/patches/0003-Replace-vwprintw-with-vw_printw.patch
deleted file mode 100644
index a004f48..0000000
--- a/utils/atop/patches/0003-Replace-vwprintw-with-vw_printw.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9d11df0b6b9213e49524496c793d3c58fbbe1537 Mon Sep 17 00:00:00 2001
-From: Ismael Luceno <ismael AT iodev.co.uk>
-Date: Wed, 15 Sep 2021 00:03:15 +0200
-Subject: [PATCH 3/4] Replace vwprintw with vw_printw
-
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- showgeneric.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/showgeneric.c b/showgeneric.c
-index 2fc63ca1e72e..380f98b28068 100644
---- a/showgeneric.c
-+++ b/showgeneric.c
-@@ -2682,7 +2682,7 @@ printg(const char *format, ...)
- va_start(args, format);
-
- if (screen)
-- vwprintw(stdscr, (char *) format, args);
-+ vw_printw(stdscr, format, args);
- else
- vprintf(format, args);
-
---
-2.33.0
-
diff --git a/utils/atop/patches/0004-Makefile-Cleanup-install-target.patch
b/utils/atop/patches/0004-Makefile-Cleanup-install-target.patch
deleted file mode 100644
index 57188ba..0000000
--- a/utils/atop/patches/0004-Makefile-Cleanup-install-target.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From a2c914b375abbc5476acadbb3375049c2a48b070 Mon Sep 17 00:00:00 2001
-From: Ismael Luceno <ismael AT iodev.co.uk>
-Date: Wed, 15 Sep 2021 00:03:54 +0200
-Subject: [PATCH 4/4] Makefile: Cleanup install target
-
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- Makefile | 71 ++++++++++++++++++++++----------------------------------
- 1 file changed, 28 insertions(+), 43 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 62e81ef74788..d2dac721db69 100644
---- a/Makefile
-+++ b/Makefile
-@@ -55,8 +55,8 @@ distr:
- tar czvf /tmp/atop.tar.gz *
-
-
--install:
-- @echo Choose either \'make systemdinstall\' or \'make
sysvinstall\'
-+.PHONY: all install genericinstall
-+install: genericinstall
-
- systemdinstall: genericinstall
- if [ ! -d $(DESTDIR)$(SYSDPATH) ]; \
-@@ -137,49 +137,32 @@ sysvinstall: genericinstall
- fi
-
- genericinstall: atop atopacctd atopconvert atopcat
-- if [ ! -d $(DESTDIR)$(LOGPATH) ]; \
-- then mkdir -p $(DESTDIR)$(LOGPATH); fi
-- if [ ! -d $(DESTDIR)$(DEFPATH) ]; \
-- then mkdir -p $(DESTDIR)$(DEFPATH); fi
-- if [ ! -d $(DESTDIR)$(BINPATH) ]; \
-- then mkdir -p $(DESTDIR)$(BINPATH); fi
-- if [ ! -d $(DESTDIR)$(SBINPATH) ]; \
-- then mkdir -p $(DESTDIR)$(SBINPATH); fi
-- if [ ! -d $(DESTDIR)$(MAN1PATH) ]; \
-- then mkdir -p $(DESTDIR)$(MAN1PATH); fi
-- if [ ! -d $(DESTDIR)$(MAN5PATH) ]; \
-- then mkdir -p $(DESTDIR)$(MAN5PATH); fi
-- if [ ! -d $(DESTDIR)$(MAN8PATH) ]; \
-- then mkdir -p $(DESTDIR)$(MAN8PATH); fi
-- #
-+ install -d $(DESTDIR)$(LOGPATH) \
-+ $(DESTDIR)$(DEFPATH) \
-+ $(DESTDIR)$(BINPATH) \
-+ $(DESTDIR)$(SBINPATH) \
-+ $(DESTDIR)$(MAN1PATH) \
-+ $(DESTDIR)$(MAN5PATH) \
-+ $(DESTDIR)$(MAN8PATH)
- touch $(DESTDIR)$(DEFPATH)/atop
- chmod 644 $(DESTDIR)$(DEFPATH)/atop
-- #
-- cp atop $(DESTDIR)$(BINPATH)/atop
-- chown root $(DESTDIR)$(BINPATH)/atop
-- chmod 04711 $(DESTDIR)$(BINPATH)/atop
-- ln -sf atop $(DESTDIR)$(BINPATH)/atopsar
-- cp atopacctd $(DESTDIR)$(SBINPATH)/atopacctd
-- chown root $(DESTDIR)$(SBINPATH)/atopacctd
-- chmod 0700 $(DESTDIR)$(SBINPATH)/atopacctd
-- cp atopgpud $(DESTDIR)$(SBINPATH)/atopgpud
-- chown root $(DESTDIR)$(SBINPATH)/atopgpud
-- chmod 0700 $(DESTDIR)$(SBINPATH)/atopgpud
-- cp atop $(DESTDIR)$(BINPATH)/atop-$(VERS)
-- ln -sf atop-$(VERS) $(DESTDIR)$(BINPATH)/atopsar-$(VERS)
-- cp atopconvert $(DESTDIR)$(BINPATH)/atopconvert
-- chown root $(DESTDIR)$(BINPATH)/atopconvert
-- chmod 0711 $(DESTDIR)$(BINPATH)/atopconvert
-- cp atopcat $(DESTDIR)$(BINPATH)/atopcat
-- chown root $(DESTDIR)$(BINPATH)/atopcat
-- chmod 0711 $(DESTDIR)$(BINPATH)/atopcat
-- cp man/atop.1 $(DESTDIR)$(MAN1PATH)
-- cp man/atopsar.1 $(DESTDIR)$(MAN1PATH)
-- cp man/atopconvert.1 $(DESTDIR)$(MAN1PATH)
-- cp man/atopcat.1 $(DESTDIR)$(MAN1PATH)
-- cp man/atoprc.5 $(DESTDIR)$(MAN5PATH)
-- cp man/atopacctd.8 $(DESTDIR)$(MAN8PATH)
-- cp man/atopgpud.8 $(DESTDIR)$(MAN8PATH)
-+ install -m500 atopacctd atopgpud $(DESTDIR)$(SBINPATH)
-+ install -m4511 atop $(DESTDIR)$(BINPATH)/
-+ install -m511 atop $(DESTDIR)$(BINPATH)/atopsar
-+ install -m511 atopconvert atopcat $(DESTDIR)$(BINPATH)
-+ install -m444 \
-+ man/atop.1 \
-+ man/atopsar.1 \
-+ man/atopconvert.1 \
-+ man/atopcat.1 \
-+ $(DESTDIR)$(MAN1PATH)
-+ install -m444 \
-+ man/atoprc.5 \
-+ $(DESTDIR)$(MAN5PATH)
-+ install -m444 \
-+ man/atopacctd.8 \
-+ man/atopgpud.8 \
-+ $(DESTDIR)$(MAN8PATH)
-
- ##########################################################################
-
---
-2.33.0
-



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (2709c3da0e43f18194e2796a94750d7a9295bb1f), Pavel Vinogradov, 05/13/2023

Archive powered by MHonArc 2.6.24.

Top of Page