From 89f4a3f281184946133be644150a3b00a9707983 Mon Sep 17 00:00:00 2001 From: Marko Ratkaj Date: Fri, 8 Jun 2018 13:16:01 +0200 Subject: [PATCH] sysstat: bump to 11.6.4 Signed-off-by: Marko Ratkaj --- utils/sysstat/Makefile | 8 +- utils/sysstat/patches/100-musl-compat.patch | 4 +- utils/sysstat/patches/110-remove-sccsid.patch | 131 ------------------ 3 files changed, 6 insertions(+), 137 deletions(-) delete mode 100644 utils/sysstat/patches/110-remove-sccsid.patch diff --git a/utils/sysstat/Makefile b/utils/sysstat/Makefile index 60df6f5799..1ce603c357 100644 --- a/utils/sysstat/Makefile +++ b/utils/sysstat/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sysstat -PKG_VERSION:=11.6.0 -PKG_RELEASE:=2 +PKG_VERSION:=11.6.4 +PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 PKG_MAINTAINER:=Marko Ratkaj -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://pagesperso-orange.fr/sebastien.godard/ -PKG_HASH:=14bb696545cba0d99e3492092c9ed15fe9b6da79df349695251b41d345e969a7 +PKG_HASH:=6aa6398b200f09a2874fffc9c31eb943aea64d707a4afe5f5f1751d876157b09 PKG_INSTALL:=1 diff --git a/utils/sysstat/patches/100-musl-compat.patch b/utils/sysstat/patches/100-musl-compat.patch index 06c7813275..4eb1f3381c 100644 --- a/utils/sysstat/patches/100-musl-compat.patch +++ b/utils/sysstat/patches/100-musl-compat.patch @@ -7,10 +7,10 @@ +#include #include #include - + #include --- a/common.c +++ b/common.c -@@ -30,6 +30,7 @@ +@@ -32,6 +32,7 @@ #include #include #include diff --git a/utils/sysstat/patches/110-remove-sccsid.patch b/utils/sysstat/patches/110-remove-sccsid.patch deleted file mode 100644 index 05c1032d48..0000000000 --- a/utils/sysstat/patches/110-remove-sccsid.patch +++ /dev/null @@ -1,131 +0,0 @@ -From: Robert Luberda -Date: Wed, 9 Sep 2015 21:37:37 +0200 -Subject: Remove scscid() - -Remove sccsid() function togethwe with SCCSID string that -contained __DATE__ and __TIME__ macros. This should cause -binary to be more reproducible, see -https://wiki.debian.org/ReproducibleBuilds/TimestampsFromCPPMacros ---- - cifsiostat.c | 3 --- - iostat.c | 3 --- - mpstat.c | 3 --- - pidstat.c | 3 --- - sadc.c | 3 --- - sadf.c | 3 --- - sar.c | 3 --- - tapestat.c | 3 --- - 8 files changed, 24 deletions(-) - -diff --git a/cifsiostat.c b/cifsiostat.c -index a3c81d0..4668a7c 100644 ---- a/cifsiostat.c -+++ b/cifsiostat.c -@@ -41,9 +41,6 @@ - #define _(string) (string) - #endif - --#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ --char *sccsid(void) { return (SCCSID); } -- - unsigned long long uptime0[2] = {0, 0}; - struct cifs_stats *st_cifs[2]; - struct io_hdr_stats *st_hdr_cifs; -diff --git a/iostat.c b/iostat.c -index 7b346e2..a0199d2 100644 ---- a/iostat.c -+++ b/iostat.c -@@ -48,9 +48,6 @@ - #define _(string) (string) - #endif - --#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ --char *sccsid(void) { return (SCCSID); } -- - struct stats_cpu *st_cpu[2]; - unsigned long long uptime[2] = {0, 0}; - unsigned long long uptime0[2] = {0, 0}; -diff --git a/mpstat.c b/mpstat.c -index 1c83ea2..e4a040b 100644 ---- a/mpstat.c -+++ b/mpstat.c -@@ -43,9 +43,6 @@ - #define _(string) (string) - #endif - --#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ --char *sccsid(void) { return (SCCSID); } -- - unsigned long long uptime[3] = {0, 0, 0}; - unsigned long long uptime0[3] = {0, 0, 0}; - -diff --git a/pidstat.c b/pidstat.c -index 876635c..5372176 100644 ---- a/pidstat.c -+++ b/pidstat.c -@@ -47,9 +47,6 @@ - #define _(string) (string) - #endif - --#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ --char *sccsid(void) { return (SCCSID); } -- - unsigned long long uptime[3] = {0, 0, 0}; - unsigned long long uptime0[3] = {0, 0, 0}; - struct pid_stats *st_pid_list[3] = {NULL, NULL, NULL}; -diff --git a/sadc.c b/sadc.c -index 7cdbc38..bfb4dac 100644 ---- a/sadc.c -+++ b/sadc.c -@@ -52,9 +52,6 @@ - #include "sensors/error.h" - #endif - --#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ --char *sccsid(void) { return (SCCSID); } -- - long interval = 0; - unsigned int flags = 0; - -diff --git a/sadf.c b/sadf.c -index 160b485..0c0017c 100644 ---- a/sadf.c -+++ b/sadf.c -@@ -41,9 +41,6 @@ - # define _(string) (string) - #endif - --#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ --char *sccsid(void) { return (SCCSID); } -- - long interval = -1, count = 0; - - unsigned int flags = 0; -diff --git a/sar.c b/sar.c -index ccf426e..07a9b4a 100644 ---- a/sar.c -+++ b/sar.c -@@ -42,9 +42,6 @@ - #define _(string) (string) - #endif - --#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ --char *sccsid(void) { return (SCCSID); } -- - /* Interval and count parameters */ - long interval = -1, count = 0; - -diff --git a/tapestat.c b/tapestat.c -index 268e4a5..df0a01b 100644 ---- a/tapestat.c -+++ b/tapestat.c -@@ -58,9 +58,6 @@ - #define _(string) (string) - #endif - --#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ --char *sccsid(void) { return (SCCSID); } -- - int cpu_nr = 0; /* Nb of processors on the machine */ - int flags = 0; /* Flag for common options and system state */ -