Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (800371774a8dcf39026d196a6767f50ac18c057a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (800371774a8dcf39026d196a6767f50ac18c057a)
  • Date: Wed, 15 Sep 2021 12:48:28 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

audio-soft/aumix/BUILD | 2
audio-soft/aumix/HISTORY | 4
audio-soft/aumix/PRE_BUILD | 3
net/dhcp/BUILD | 1
net/dhcp/DETAILS | 8
net/dhcp/HISTORY | 7
utils/atop/BUILD | 5
utils/atop/DETAILS | 4
utils/atop/HISTORY | 11 +
utils/atop/INSTALL | 1
utils/atop/PRE_BUILD | 5
utils/atop/gcc-8.patch | 11 -
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
++++++++++
16 files changed, 215 insertions(+), 26 deletions(-)

New commits:
commit 800371774a8dcf39026d196a6767f50ac18c057a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

aumix: Fix build with GCC 10+

commit 805aebc1cc465c7f577e4c778a73c301f956ad68
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

aumix: Fix build against musl

commit a034141885bc4cc1a642e1dd750aee6cf56a49eb
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

atop 2.6.0

commit f1c1e3b25ec5faee46c21de5d18fab5bf3a2c03a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dhcp 4.4.2-P1

diff --git a/audio-soft/aumix/BUILD b/audio-soft/aumix/BUILD
new file mode 100755
index 0000000..003018d
--- /dev/null
+++ b/audio-soft/aumix/BUILD
@@ -0,0 +1,2 @@
+CFLAGS+=' -fcommon' &&
+default_build
diff --git a/audio-soft/aumix/HISTORY b/audio-soft/aumix/HISTORY
index e70022b..d034f7d 100644
--- a/audio-soft/aumix/HISTORY
+++ b/audio-soft/aumix/HISTORY
@@ -1,3 +1,7 @@
+2021-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Fixed build against musl
+ * BUILD: Fixed build with GCC 10+
+
2019-05-18 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Update dependency; s/gettext/GETTEXT/

diff --git a/audio-soft/aumix/PRE_BUILD b/audio-soft/aumix/PRE_BUILD
index 295d53d..96eca7a 100755
--- a/audio-soft/aumix/PRE_BUILD
+++ b/audio-soft/aumix/PRE_BUILD
@@ -3,4 +3,5 @@ cd "$SOURCE_DIRECTORY" &&

if [[ $HOSS == y ]]; then
bzcat "$SPELL_DIRECTORY/aumix-2.8-hoss.patch.bz2" | patch -p0
-fi
+fi &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' build-aux/config.sub
diff --git a/net/dhcp/BUILD b/net/dhcp/BUILD
index 9d4a7ed..57d58e1 100755
--- a/net/dhcp/BUILD
+++ b/net/dhcp/BUILD
@@ -1,3 +1,4 @@
+CFLAGS+=' -fcommon' &&
OPTS="$DHCP_OPTS $OPTS" &&

make_single &&
diff --git a/net/dhcp/DETAILS b/net/dhcp/DETAILS
index 7052329..319c65e 100755
--- a/net/dhcp/DETAILS
+++ b/net/dhcp/DETAILS
@@ -1,14 +1,14 @@
SPELL=dhcp
- VERSION=4.3.4
- SECURITY_PATCH=6
+ VERSION=4.4.2-P1
+ SECURITY_PATCH=7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.isc.org/isc/dhcp/$VERSION/$SOURCE
SOURCE2_URL[0]=ftp://ftp.isc.org/isc/dhcp/$VERSION/$SOURCE2
SOURCE_GPG=isc.gpg:$SOURCE2:UPSTREAM_KEY
- WEB_SITE=http://www.isc.org/products/DHCP
- LICENSE=http://www.isc.org/products/DHCP/dhcp-copyright.html
+ WEB_SITE=https://www.isc.org/dhcp/
+ LICENSE=MPL-2.0
SOURCE2_IGNORE=signature
ENTERED=20010922
LICENSE=ISC
diff --git a/net/dhcp/HISTORY b/net/dhcp/HISTORY
index f44e9a3..194f232 100644
--- a/net/dhcp/HISTORY
+++ b/net/dhcp/HISTORY
@@ -1,3 +1,10 @@
+2021-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2-P1
+ fixed WEB_SITE
+ updated LICENSE
+ SECURITY_PATCH++ (CVE-2021-25217)
+ * BUILD: added -fcommon to CFLAGS (required with GCC 10+)
+
2016-07-14 David C. Haley <khoralin AT gmail.com>
* DETAILS: security_patch++, failed to mark in prior commit
CVE-2015-8605, CVE-2016-2774, CVE-2010-2156, CVE-2010-3616,
diff --git a/utils/atop/BUILD b/utils/atop/BUILD
index 6709de4..6dfecc1 100755
--- a/utils/atop/BUILD
+++ b/utils/atop/BUILD
@@ -1,4 +1 @@
-sedit "s/-O./$CFLAGS/" Makefile &&
-sedit "s/-z/-n/" Makefile &&
-
-make
+default_build_make
diff --git a/utils/atop/DETAILS b/utils/atop/DETAILS
index 68b0a24..7ab89ac 100755
--- a/utils/atop/DETAILS
+++ b/utils/atop/DETAILS
@@ -1,8 +1,8 @@
SPELL=atop
- VERSION=2.5.0
+ VERSION=2.6.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://www.atoptool.nl/download/${SOURCE}
-
SOURCE_HASH=sha512:675bbd902d8fe584b1ff47c275ee06d7bfe9127fadf79825ca64bbb6bcb6c34cab485e0686854d805bbdfaf69ebb40d790f7cc00c788544bff73b49c3d24dc08
+
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 0124dc1..fcbfd42 100644
--- a/utils/atop/HISTORY
+++ b/utils/atop/HISTORY
@@ -1,3 +1,14 @@
+2021-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.0
+ * INSTALL, gcc-8.patch: removed, no longer needed
+ * BUILD: switched to default_build_make
+ * PRE_BUILD: added apply_patch_dir
+ * patches/0001-Fix-undefined-PATH_MAX.patch,
+ patches/0003-Replace-vwprintw-with-vw_printw.patch,
+ patches/0002-Remove-O2-from-CFLAGS.patch,
+ patches/0004-Makefile-Cleanup-install-target.patch:
+ fixed build system and build errors
+
2020-01-06 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 2.5.0

diff --git a/utils/atop/INSTALL b/utils/atop/INSTALL
deleted file mode 100755
index 44d8121..0000000
--- a/utils/atop/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-make genericinstall
diff --git a/utils/atop/PRE_BUILD b/utils/atop/PRE_BUILD
index 0f02b4f..4bc94aa 100755
--- a/utils/atop/PRE_BUILD
+++ b/utils/atop/PRE_BUILD
@@ -1,4 +1,3 @@
default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-message "${MESSAGE_COLOR}Applying GCC 8.x patch...${DEFAULT_COLOR}" &&
-patch -p1 < "${SPELL_DIRECTORY}"/gcc-8.patch
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/utils/atop/gcc-8.patch b/utils/atop/gcc-8.patch
deleted file mode 100644
index faf86307..0000000
--- a/utils/atop/gcc-8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur atop-2.3.0.orig/photosyst.c atop-2.3.0/photosyst.c
---- atop-2.3.0.orig/photosyst.c 2018-09-13 22:20:39.955394816 -0700
-+++ atop-2.3.0/photosyst.c 2018-09-13 22:21:11.137004992 -0700
-@@ -151,6 +151,7 @@
-
- static const char rcsid[] = "$Id: photosyst.c,v 1.38 2010/11/19 07:40:40
gerlof Exp $";
-
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <stdio.h>
- #include <string.h>
diff --git a/utils/atop/patches/0001-Fix-undefined-PATH_MAX.patch
b/utils/atop/patches/0001-Fix-undefined-PATH_MAX.patch
new file mode 100644
index 0000000..2bf1761
--- /dev/null
+++ b/utils/atop/patches/0001-Fix-undefined-PATH_MAX.patch
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 0000000..90626ae
--- /dev/null
+++ b/utils/atop/patches/0002-Remove-O2-from-CFLAGS.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 0000000..a004f48
--- /dev/null
+++ b/utils/atop/patches/0003-Replace-vwprintw-with-vw_printw.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 0000000..57188ba
--- /dev/null
+++ b/utils/atop/patches/0004-Makefile-Cleanup-install-target.patch
@@ -0,0 +1,102 @@
+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 Ismael Luceno (800371774a8dcf39026d196a6767f50ac18c057a), Ismael Luceno, 09/15/2021

Archive powered by MHonArc 2.6.24.

Top of Page