From 906611d5e38ae7894f586f7162d602431c950071 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 18 Sep 2014 17:34:24 +0200
Subject: [PATCH] vnstat: update to upstream 1.12 release

Deferring privilege dropping for now until the OpenWrt api is stable.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
---
 net/vnstat/Makefile                           |  6 +++---
 net/vnstat/patches/001-conf.patch             |  4 ++--
 net/vnstat/patches/002-no_install_strip.patch |  6 +++---
 net/vnstat/patches/003-no_install_uname.patch |  2 +-
 net/vnstat/patches/004-install_bsd_fix.patch  | 21 -------------------
 5 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 net/vnstat/patches/004-install_bsd_fix.patch

diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile
index e90d857e5c..cae144e42e 100644
--- a/net/vnstat/Makefile
+++ b/net/vnstat/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vnstat
-PKG_VERSION:=1.11
-PKG_RELEASE:=4
+PKG_VERSION:=1.12
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://humdi.net/vnstat
-PKG_MD5SUM:=a5a113f9176cd61fb954f2ba297f5fdb
+PKG_MD5SUM:=a154b2196771e06a8accd1c24374009c
 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
 
 PKG_INSTALL:=1
diff --git a/net/vnstat/patches/001-conf.patch b/net/vnstat/patches/001-conf.patch
index d41ef00a34..5fb24c3ce3 100644
--- a/net/vnstat/patches/001-conf.patch
+++ b/net/vnstat/patches/001-conf.patch
@@ -1,7 +1,7 @@
 --- a/cfg/vnstat.conf
 +++ b/cfg/vnstat.conf
-@@ -72,13 +72,13 @@ TrafficlessDays 1
- ##
+@@ -78,13 +78,13 @@ DaemonUser ""
+ DaemonGroup ""
  
  # how often (in seconds) interface data is updated
 -UpdateInterval 30
diff --git a/net/vnstat/patches/002-no_install_strip.patch b/net/vnstat/patches/002-no_install_strip.patch
index 2a0ca8592d..8f11de6f70 100644
--- a/net/vnstat/patches/002-no_install_strip.patch
+++ b/net/vnstat/patches/002-no_install_strip.patch
@@ -1,9 +1,9 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -54,11 +54,11 @@ install:
+@@ -66,11 +66,11 @@ install:
  
  # install everything else
- 	install -d -m 755 $(BIN) $(SBIN) $(MAN)/man1 $(MAN)/man5 $(DESTDIR)/var/lib/vnstat
+ 	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)
@@ -16,7 +16,7 @@
  	fi
  
  # update man pages, gzip it if previous version was done so	
-@@ -127,12 +127,12 @@ bsdinstall:
+@@ -139,12 +139,12 @@ bsdinstall:
  
  # install binaries
  	install -d -m 755 $(DESTDIR)/var/db/vnstat
diff --git a/net/vnstat/patches/003-no_install_uname.patch b/net/vnstat/patches/003-no_install_uname.patch
index 2c7859b160..14c17d5ba8 100644
--- a/net/vnstat/patches/003-no_install_uname.patch
+++ b/net/vnstat/patches/003-no_install_uname.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -22,12 +22,6 @@ clean:
+@@ -33,12 +33,6 @@ debug:
  install:
  	@echo "Installing vnStat..."
  
diff --git a/net/vnstat/patches/004-install_bsd_fix.patch b/net/vnstat/patches/004-install_bsd_fix.patch
deleted file mode 100644
index 6b2a792731..0000000000
--- a/net/vnstat/patches/004-install_bsd_fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -43,7 +43,8 @@ install:
- # install default config if such doesn't exist
- 	@if [ ! -f "$(DESTDIR)/etc/vnstat.conf" ]; \
- 	then echo "Installing config to $(DESTDIR)/etc/vnstat.conf"; \
--	install -D -m 644 cfg/vnstat.conf $(DESTDIR)/etc/vnstat.conf; \
-+	install -d -m 755 $(DESTDIR)/etc; \
-+	install -m 644 cfg/vnstat.conf $(DESTDIR)/etc/vnstat.conf; \
- 	fi
- 
- # install everything else
-@@ -63,7 +64,7 @@ install:
- 	then echo install -m 644 man/vnstati.1 $(MAN)/man1; \
- 	install -m 644 man/vnstati.1 $(MAN)/man1; \
- 	fi
--	
-+
- 	@if [ -f $(MAN)/man1/vnstat.1.gz ]; \
- 	then gzip -f9 $(MAN)/man1/vnstat.1; \
- 	gzip -f9 $(MAN)/man1/vnstatd.1; \