diff options
Diffstat (limited to 'app-admin/sysstat/files')
4 files changed, 45 insertions, 49 deletions
diff --git a/app-admin/sysstat/files/sysstat-11.0.4-cron.patch b/app-admin/sysstat/files/sysstat-11.0.4-cron.patch deleted file mode 100644 index 9d047ac6e9fe..000000000000 --- a/app-admin/sysstat/files/sysstat-11.0.4-cron.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -368,25 +368,19 @@ - $(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR) - ifdef SYSTEMD_UNIT_DIR - mkdir -p $(DESTDIR)$(SYSTEMD_UNIT_DIR) --else -- if [ -d /etc/cron.d ]; then \ -- mkdir -p $(DESTDIR)/etc/cron.d; \ -- elif [ -d /etc/cron.hourly -a -d /etc/cron.daily ]; then \ -- mkdir -p $(DESTDIR)/etc/cron.hourly $(DESTDIR)/etc/cron.daily; \ -- fi -- if [ -d $(INIT_DIR) ]; then \ -- mkdir -p $(DESTDIR)$(INIT_DIR); \ -- elif [ -d $(RC_DIR) ]; then \ -+endif -+ifeq ($(INSTALL_CRON),y) -+ mkdir -p $(DESTDIR)/etc/cron.d; \ -+ mkdir -p $(DESTDIR)$(INIT_DIR); \ -+ if [ -d $(RC_DIR) ]; then \ - mkdir -p $(DESTDIR)$(RC_DIR); \ - fi - endif -- if [ -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" ]; then \ -- if [ -d $(DESTDIR)/etc/cron.d ]; then \ -- $(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \ -- elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \ -- $(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \ -- $(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \ -- fi \ -+ if [ -d $(DESTDIR)/etc/cron.d ]; then \ -+ $(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \ -+ elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \ -+ $(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \ -+ $(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \ - fi - ifeq ($(COPY_ONLY),n) - if [ \( -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" \) -a ! -d $(DESTDIR)/etc/cron.d ]; then \ diff --git a/app-admin/sysstat/files/sysstat-11.7.3-flags.patch b/app-admin/sysstat/files/sysstat-11.7.3-flags.patch deleted file mode 100644 index 9438a0fd8f74..000000000000 --- a/app-admin/sysstat/files/sysstat-11.7.3-flags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -71,7 +71,7 @@ - # Compiler flags - CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2 - DFLAGS = @DFLAGS@ --LFLAGS = @STRIP@ -+LFLAGS = $(LDFLAGS) - DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\" - DFLAGS += $(DFSENSORS) - diff --git a/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch b/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch new file mode 100644 index 000000000000..413cdad8b015 --- /dev/null +++ b/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch @@ -0,0 +1,27 @@ +From 954ff2e2673cef48f0ed44668c466eab041db387 Mon Sep 17 00:00:00 2001 +From: Pavel Kopylov <pkopylov@cloudlinux.com> +Date: Wed, 17 May 2023 11:33:45 +0200 +Subject: [PATCH] Fix an overflow which is still possible for some values. + +--- + common.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/common.c b/common.c +index 48493b5f..12cd8d9f 100644 +--- a/common.c ++++ b/common.c +@@ -431,8 +431,11 @@ int check_dir(char *dirname) + void check_overflow(unsigned int val1, unsigned int val2, + unsigned int val3) + { +- if ((unsigned long long) val1 * (unsigned long long) val2 * +- (unsigned long long) val3 > UINT_MAX) { ++ if ((val1 != 0) && (val2 != 0) && (val3 != 0) && ++ (((unsigned long long)UINT_MAX / (unsigned long long)val1 < ++ (unsigned long long)val2) || ++ ((unsigned long long)UINT_MAX / ((unsigned long long)val1 * ++ (unsigned long long)val2) < (unsigned long long)val3))) { + #ifdef DEBUG + fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n", + __FUNCTION__, (unsigned long long) val1 * (unsigned long long) val2 * diff --git a/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch b/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch new file mode 100644 index 000000000000..854a66219ff9 --- /dev/null +++ b/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch @@ -0,0 +1,18 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -94,10 +94,14 @@ + endif + + # Compiler flags ++ifndef CPPFLAGS ++CPPFLAGS = @CPPFLAGS@ ++endif ++CPPFLAGS += @DEFS@ + ifndef CFLAGS + CFLAGS = @CFLAGS@ + endif +-CFLAGS += -Wall -Wstrict-prototypes -pipe -O2 ++CFLAGS += $(CPPFLAGS) + + ifndef DFLAGS + DFLAGS = @DFLAGS@ |