From a1a91bde95b7afc04429287beb5cbdade0d59c3c Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Wed, 22 Jan 2020 20:29:54 -0800
Subject: [PATCH] sysstat: update to 2.2.1

Fixes CVE-2019-16167.

Fixed CPE_ID.

Added PKG_LICENSE_FILES.

Added PKG_BUILD_PARALLEL for faster compilation.

Added nls capability.

Ran init script through shellcheck.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 utils/sysstat/Makefile                      | 20 +++++++-------
 utils/sysstat/files/sysstat.init            | 14 +++++-----
 utils/sysstat/patches/100-musl-compat.patch | 30 ---------------------
 3 files changed, 19 insertions(+), 45 deletions(-)
 delete mode 100644 utils/sysstat/patches/100-musl-compat.patch

diff --git a/utils/sysstat/Makefile b/utils/sysstat/Makefile
index 0c31291c4..2ed73f3b0 100644
--- a/utils/sysstat/Makefile
+++ b/utils/sysstat/Makefile
@@ -8,26 +8,30 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sysstat
-PKG_VERSION:=12.0.5
+PKG_VERSION:=12.2.1
 PKG_RELEASE:=1
 
-PKG_LICENSE:=GPL-2.0
-PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
-PKG_CPE_ID:=cpe:/a:sysstat:sysstat
-
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://pagesperso-orange.fr/sebastien.godard/
-PKG_HASH:=58583b0776b9addec69e42eebd6dd1a8e976da8a36bad2422659a1ad6c1a2600
+PKG_HASH:=8edb0e19b514ac560a098a02933a4735b881296d61014db89bf80f05dd7a4732
+
+PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
+PKG_LICENSE:=GPL-2.0-or-later
+PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:sysstat_project:sysstat
 
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/sysstat
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Sysstat performance monitoring tools
   URL:=http://pagesperso-orange.fr/sebastien.godard/index.html
+  DEPENDS:=$(INTL_DEPENDS)
 endef
 
 define Package/sysstat/description
@@ -47,9 +51,7 @@ CONFIGURE_VARS+= \
 
 CONFIGURE_ARGS+= \
 	--disable-documentation \
-	--disable-largefile \
-	--disable-sensors \
-	--disable-nls
+	--disable-sensors
 
 define Package/sysstat/install
 	$(INSTALL_DIR) $(1)/usr/lib/sysstat
diff --git a/utils/sysstat/files/sysstat.init b/utils/sysstat/files/sysstat.init
index 9975d5ea6..e7b75e246 100755
--- a/utils/sysstat/files/sysstat.init
+++ b/utils/sysstat/files/sysstat.init
@@ -26,12 +26,14 @@ start_sysstat_instance() {
 
 	[ -d /var/log/sysstat ] || mkdir -p /var/log/sysstat
 
-	echo "HISTORY=$log_history" > $SYSSTAT_CFG
-	echo "COMPRESSAFTER=$compressafter" >> $SYSSTAT_CFG
-	echo "SADC_OPTIONS=\"$sadc_options\"" >> $SYSSTAT_CFG
-	echo "SA_DIR=\"$sa_dir\"" >> $SYSSTAT_CFG
-	echo "ZIP=\"$zip\"" >> $SYSSTAT_CFG
-	echo "ENABLED=\"$enabled\"" >> $SYSSTAT_CFG
+	{
+		echo "HISTORY=$log_history"
+		echo "COMPRESSAFTER=$compressafter"
+		echo "SADC_OPTIONS=\"$sadc_options\""
+		echo "SA_DIR=\"$sa_dir\""
+		echo "ZIP=\"$zip\""
+		echo "ENABLED=\"$enabled\""
+	} > $SYSSTAT_CFG
 
 	procd_open_instance
 	procd_set_param command $PROG -S DISK -F -L -
diff --git a/utils/sysstat/patches/100-musl-compat.patch b/utils/sysstat/patches/100-musl-compat.patch
deleted file mode 100644
index 2d71c88bf..000000000
--- a/utils/sysstat/patches/100-musl-compat.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/sa_common.c
-+++ b/sa_common.c
-@@ -29,6 +29,7 @@
- #include <dirent.h>
- #include <fcntl.h>
- #include <libgen.h>
-+#include <limits.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <ctype.h>
---- a/common.c
-+++ b/common.c
-@@ -32,6 +32,7 @@
- #include <dirent.h>
- #include <ctype.h>
- #include <libgen.h>
-+#include <limits.h>
- 
- #include "version.h"
- #include "common.h"
---- a/ioconf.c
-+++ b/ioconf.c
-@@ -27,6 +27,7 @@
- #include <errno.h>
- #include <dirent.h>
- #include <sys/stat.h>
-+#include <sys/types.h>
- 
- #include "ioconf.h"
- #include "common.h"