Revert "vnstat: update to v1.16"

This reverts commit 79b6e9dc61dc37e4745f08d83ce44593d256fd12.

Undo the recent vnstat update due to upstream bugs preventing database
restoration.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile
index 9d9d3ba524fab77fdb231f520e0fc67d7582d356..921597dcf1512277e44c74b6f745d16c0fc3ca00 100644 (file)
--- a/net/vnstat/Makefile
+++ b/net/vnstat/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vnstat
-PKG_VERSION:=1.16
+PKG_VERSION:=1.12
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://humdi.net/vnstat
-PKG_HASH:=420fec6c89229a100697f3189e824a1b81f7148dd651558f2ff03cc298308e8b
+PKG_MD5SUM:=a154b2196771e06a8accd1c24374009c
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 
 PKG_INSTALL:=1
@@ -86,7 +86,7 @@ define Package/vnstat/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/vnstatd $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc
-       $(INSTALL_CONF) $(PKG_BUILD_DIR)/cfg/vnstat.conf $(1)/etc/
+       $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/vnstat.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/config
        $(INSTALL_CONF) ./files/vnstat.config $(1)/etc/config/vnstat
        $(INSTALL_DIR) $(1)/etc/init.d

diff --git a/net/vnstat/patches/001-conf.patch b/net/vnstat/patches/001-conf.patch
new file mode 100644 (file)
index 0000000..5fb24c3
--- /dev/null
+++ b/net/vnstat/patches/001-conf.patch
@@ -0,0 +1,19 @@
+--- a/cfg/vnstat.conf
++++ b/cfg/vnstat.conf
+@@ -78,13 +78,13 @@ DaemonUser ""
+ DaemonGroup ""
+ 
+ # how often (in seconds) interface data is updated
+-UpdateInterval 30
++UpdateInterval 60
+ 
+ # how often (in seconds) interface status changes are checked
+-PollInterval 5
++PollInterval 30
+ 
+ # how often (in minutes) data is saved to file
+-SaveInterval 5
++SaveInterval 30
+ 
+ # how often (in minutes) data is saved when all interface are offline
+ OfflineSaveInterval 30

diff --git a/net/vnstat/patches/002-no_install_strip.patch b/net/vnstat/patches/002-no_install_strip.patch
new file mode 100644 (file)
index 0000000..8f11de6
--- /dev/null
+++ b/net/vnstat/patches/002-no_install_strip.patch
@@ -0,0 +1,35 @@
+--- a/Makefile
++++ b/Makefile
+@@ -66,11 +66,11 @@ install:
+ 
+ # install everything else
+       install -d -m 755 $(BIN) $(SBIN) $(MAN)/man1 $(MAN)/man5
+-      install -s -m 755 src/vnstat $(BIN)
+-      install -s -m 755 src/vnstatd $(SBIN)
++      install -m 755 src/vnstat $(BIN)
++      install -m 755 src/vnstatd $(SBIN)
+       @if [ -f "src/vnstati" ]; \
+-      then echo install -s -m 755 src/vnstati $(BIN); \
+-      install -s -m 755 src/vnstati $(BIN); \
++      then echo install -m 755 src/vnstati $(BIN); \
++      install -m 755 src/vnstati $(BIN); \
+       fi
+ 
+ # update man pages, gzip it if previous version was done so   
+@@ -139,12 +139,12 @@ bsdinstall:
+ 
+ # install binaries
+       install -d -m 755 $(DESTDIR)/var/db/vnstat
+-      install -s -m 755 src/vnstat $(BIN_BSD)
+-      install -s -m 755 src/vnstatd $(SBIN_BSD)
++      install -m 755 src/vnstat $(BIN_BSD)
++      install -m 755 src/vnstatd $(SBIN_BSD)
+ 
+       @if [ -f "src/vnstati" ]; \
+-      then echo install -s -m 755 src/vnstati $(BIN_BSD); \
+-      install -s -m 755 src/vnstati $(BIN_BSD); \
++      then echo install -m 755 src/vnstati $(BIN_BSD); \
++      install -m 755 src/vnstati $(BIN_BSD); \
+       fi
+ 
+ # install default config if such doesn't exist

diff --git a/net/vnstat/patches/003-no_install_uname.patch b/net/vnstat/patches/003-no_install_uname.patch
new file mode 100644 (file)
index 0000000..14c17d5
--- /dev/null
+++ b/net/vnstat/patches/003-no_install_uname.patch
@@ -0,0 +1,15 @@
+--- a/Makefile
++++ b/Makefile
+@@ -33,12 +33,6 @@ debug:
+ install:
+       @echo "Installing vnStat..."
+ 
+-# check that system is really Linux
+-      @if [ `uname` != "Linux" ]; \
+-      then echo "This isn't a Linux system. Maybe 'make bsdinstall' is what you need?"; \
+-      false; \
+-      fi
+-
+ # check that there's something to install
+       @if [ ! -f "src/vnstat" ] || [ ! -f "src/vnstatd" ]; \
+       then echo "Nothing to install, run make first."; \

diff --git a/net/vnstat/patches/100-musl-compat.patch b/net/vnstat/patches/100-musl-compat.patch
new file mode 100644 (file)
index 0000000..0512389
--- /dev/null
+++ b/net/vnstat/patches/100-musl-compat.patch
@@ -0,0 +1,10 @@
+--- a/src/common.h
++++ b/src/common.h
+@@ -22,6 +22,7 @@
+ #include <pwd.h>
+ #include <grp.h>
+ #include <libgen.h>
++#include <fcntl.h>
+ 
+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__FreeBSD_kernel__)
+ #include <sys/param.h>

diff --git a/net/vnstat/patches/990-adjust-configuration-defaults.patch b/net/vnstat/patches/990-adjust-configuration-defaults.patch
deleted file mode 100644 (file)
index 1627b4d..0000000
--- a/net/vnstat/patches/990-adjust-configuration-defaults.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Jo-Philipp Wich <jo@mein.io>
-Date: Thu, 26 Jan 2017 15:30:00 +0100
-Subject: [PATCH] config: adjust default values
-
-Adjust the default interval settings to be better suited for slower embedded
-devices.
-
-Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-
---- a/cfg/vnstat.conf
-+++ b/cfg/vnstat.conf
-@@ -87,13 +87,13 @@ DaemonUser ""
- DaemonGroup ""
- 
- # how often (in seconds) interface data is updated
--UpdateInterval 30
-+UpdateInterval 60
- 
- # how often (in seconds) interface status changes are checked
--PollInterval 5
-+PollInterval 30
- 
- # how often (in minutes) data is saved to file
--SaveInterval 5
-+SaveInterval 30
- 
- # how often (in minutes) data is saved when all interface are offline
- OfflineSaveInterval 30

diff --git a/net/vnstat/patches/991-no-invocation.patch b/net/vnstat/patches/991-no-invocation.patch
deleted file mode 100644 (file)
index b56950b..0000000
--- a/net/vnstat/patches/991-no-invocation.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Jo-Philipp Wich <jo@mein.io>
-Date: Thu, 26 Jan 2017 15:31:00 +0100
-Subject: [PATCH] make: do not invoke vnstat --showconfig
-
-In a cross-compile setting we cannot invoke the complied target executable,
-therfore commit out the --showconfig call in order to prevent make from
-exiting with an error.
-
-Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -104,9 +104,9 @@ release: distcheck
-       ls -l $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz
- 
- install-data-hook:
--      $(DESTDIR)$(bindir)/vnstat$(EXEEXT) --showconfig >vnstat.conf && \
--        $(MKDIR_P) $(DESTDIR)$(sysconfdir) && \
--        mv -f vnstat.conf $(DESTDIR)$(sysconfdir)/vnstat.conf
-+      #$(DESTDIR)$(bindir)/vnstat$(EXEEXT) --showconfig >vnstat.conf && \
-+      #  $(MKDIR_P) $(DESTDIR)$(sysconfdir) && \
-+      #  mv -f vnstat.conf $(DESTDIR)$(sysconfdir)/vnstat.conf
-       @echo
-       @echo "============================================================================"
-       @echo "  Note: No service file has been installed for starting the daemon"
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -2051,9 +2051,9 @@ release: distcheck
-       ls -l $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz
- 
- install-data-hook:
--      $(DESTDIR)$(bindir)/vnstat$(EXEEXT) --showconfig >vnstat.conf && \
--        $(MKDIR_P) $(DESTDIR)$(sysconfdir) && \
--        mv -f vnstat.conf $(DESTDIR)$(sysconfdir)/vnstat.conf
-+      #$(DESTDIR)$(bindir)/vnstat$(EXEEXT) --showconfig >vnstat.conf && \
-+      #  $(MKDIR_P) $(DESTDIR)$(sysconfdir) && \
-+      #  mv -f vnstat.conf $(DESTDIR)$(sysconfdir)/vnstat.conf
-       @echo
-       @echo "============================================================================"
-       @echo "  Note: No service file has been installed for starting the daemon"