X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fvnstat%2FMakefile;h=2b940b4121b5a5157f72bc9d8d4106c6ae04fa7f;hb=0b623ab1362512330dd5e5df0929443302b0e9d1;hp=7051b5be7836c8accccf767c7281f708d77674d3;hpb=bec6c933c2a8614ce6d1b358275cdc366315f546;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile
index 7051b5be78..2b940b4121 100644
--- a/net/vnstat/Makefile
+++ b/net/vnstat/Makefile
@@ -9,13 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vnstat
-PKG_VERSION:=1.4
+PKG_VERSION:=1.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://humdi.net/vnstat
-PKG_MD5SUM:=9184f79b5e60499bc059f670032291e5
-PKG_CAT:=zcat
+PKG_MD5SUM:=ccaffe8e70d47e0cf2f25e52daa25712
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -25,14 +24,20 @@ define Package/vnstat
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Console-based network traffic monitor
-  DESCRIPTION:=\
-	vnStat is a network traffic monitor for Linux that keeps a log of daily \\\
-	network traffic for the selected interface(s). vnStat isn't a packet \\\
-	sniffer. The traffic information is analyzed from the /proc -filesystem, \\\
-	so vnStat can be used without root permissions.
   URL:=http://humdi.net/vnstat/
 endef
 
+define Package/vnstat/description
+	vnStat is a network traffic monitor for Linux that keeps a log of daily 
+	network traffic for the selected interface(s). vnStat isn't a packet 
+	sniffer. The traffic information is analyzed from the /proc -filesystem, 
+	so vnStat can be used without root permissions.
+endef
+
+define Package/vnstat/conffiles
+/etc/config/vnstat
+endef
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
@@ -40,8 +45,28 @@ define Build/Compile
 endef
 
 define Package/vnstat/install	
-	install -d -m0755 $(1)/usr/bin
-	install -m0755 $(PKG_BUILD_DIR)/src/vnstat $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/vnstat $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/vnstat.conf $(1)/etc/config/vnstat
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/vnstat.init $(1)/etc/init.d/vnstat
+endef
+
+define Package/vnstat/postinst
+#!/bin/sh
+BIN=$${IPKG_INSTROOT}/usr/bin/vnstat
+CRONTAB=$${IPKG_INSTROOT}/etc/crontabs/root
+LIB_D=$${IPKG_INSTROOT}/var/lib/vnstat
+mkdir -p $${IPKG_INSTROOT}/etc/crontabs/
+[ -d $$LIB_D ] || mkdir -p $$LIB_D
+IFACE_WAN=$$(uci get network.wan.ifname)
+if [ -n $$IFACE_WAN ]; then
+	[ -e $$LIB_D/$$IFACE_WAN ] || ( [ -x $$BIN ] && $$BIN -u -i $$IFACE_WAN )
+fi
+grep -q "$$BIN -u" $$CRONTAB 2>/dev/null
+[ $$? -ne 0 ] && echo "0-55/5 *   * * *   root    if [ -x $$BIN ] && [ \`ls $$LIB_D | wc -l\` -ge 1 ]; then $$BIN -u; fi" >> $$CRONTAB
+true
 endef
 
 $(eval $(call BuildPackage,vnstat))