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>
This commit is contained in:
parent
7d44d48c66
commit
906611d5e3
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=vnstat
|
PKG_NAME:=vnstat
|
||||||
PKG_VERSION:=1.11
|
PKG_VERSION:=1.12
|
||||||
PKG_RELEASE:=4
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=http://humdi.net/vnstat
|
PKG_SOURCE_URL:=http://humdi.net/vnstat
|
||||||
PKG_MD5SUM:=a5a113f9176cd61fb954f2ba297f5fdb
|
PKG_MD5SUM:=a154b2196771e06a8accd1c24374009c
|
||||||
PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
|
PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
|
||||||
|
|
||||||
PKG_INSTALL:=1
|
PKG_INSTALL:=1
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
--- a/cfg/vnstat.conf
|
--- a/cfg/vnstat.conf
|
||||||
+++ b/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
|
# how often (in seconds) interface data is updated
|
||||||
-UpdateInterval 30
|
-UpdateInterval 30
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -54,11 +54,11 @@ install:
|
@@ -66,11 +66,11 @@ install:
|
||||||
|
|
||||||
# install everything else
|
# 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/vnstat $(BIN)
|
||||||
- install -s -m 755 src/vnstatd $(SBIN)
|
- install -s -m 755 src/vnstatd $(SBIN)
|
||||||
+ install -m 755 src/vnstat $(BIN)
|
+ install -m 755 src/vnstat $(BIN)
|
||||||
|
@ -16,7 +16,7 @@
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# update man pages, gzip it if previous version was done so
|
# update man pages, gzip it if previous version was done so
|
||||||
@@ -127,12 +127,12 @@ bsdinstall:
|
@@ -139,12 +139,12 @@ bsdinstall:
|
||||||
|
|
||||||
# install binaries
|
# install binaries
|
||||||
install -d -m 755 $(DESTDIR)/var/db/vnstat
|
install -d -m 755 $(DESTDIR)/var/db/vnstat
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -22,12 +22,6 @@ clean:
|
@@ -33,12 +33,6 @@ debug:
|
||||||
install:
|
install:
|
||||||
@echo "Installing vnStat..."
|
@echo "Installing vnStat..."
|
||||||
|
|
||||||
|
|
|
@ -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; \
|
|
Loading…
Reference in New Issue