'[Ipcop-svn] SF.net SVN: ipcop:[7698] ipcop/trunk'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[7698] ipcop/trunk
From:       owes () users ! sourceforge ! net
Date:       2014-11-12 11:29:02
Message-ID: E1XoW6j-0003uP-VU () sfs-ml-4 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 7698
          http://sourceforge.net/p/ipcop/svn/7698
Author:   owes
Date:     2014-11-12 11:29:01 +0000 (Wed, 12 Nov 2014)
Log Message:
-----------
Update vnstat to 1.12. Change MaxBandwidth from 100 to 1000.

Modified Paths:
--------------
    ipcop/trunk/lfs/vnstat
    ipcop/trunk/updates/2.1.8/ROOTFILES.i486-2.1.8
    ipcop/trunk/updates/2.1.8/information.xml

Added Paths:
-----------
    ipcop/trunk/src/patches/vnstat-1.12_db-dir.patch

Removed Paths:
-------------
    ipcop/trunk/src/patches/vnstat-1.11_db-dir.patch

Modified: ipcop/trunk/lfs/vnstat
===================================================================
--- ipcop/trunk/lfs/vnstat	2014-11-12 11:25:20 UTC (rev 7697)
+++ ipcop/trunk/lfs/vnstat	2014-11-12 11:29:01 UTC (rev 7698)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = vnstat
-VER        = 1.11
+VER        = 1.12
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -51,7 +51,7 @@
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a5a113f9176cd61fb954f2ba297f5fdb
+$(DL_FILE)_MD5 = a154b2196771e06a8accd1c24374009c
 
 install : $(TARGET)
 
@@ -89,6 +89,7 @@
 	# Change some settings in vnstat.conf to match our environment
 	sed -i -e 's+DatabaseDir.*+DatabaseDir "/var/log/traffic/vnstat"+' \
 		-e 's+Interface.*+Interface "lan-1"+' \
+		-e 's+MaxBandwidth.*+MaxBandwidth 1000+' \
 		-e 's+SaveInterval.*+SaveInterval 1+' /etc/vnstat.conf
 
 	@rm -rf $(DIR_APP)

Deleted: ipcop/trunk/src/patches/vnstat-1.11_db-dir.patch
===================================================================
--- ipcop/trunk/src/patches/vnstat-1.11_db-dir.patch	2014-11-12 11:25:20 UTC (rev \
                7697)
+++ ipcop/trunk/src/patches/vnstat-1.11_db-dir.patch	2014-11-12 11:29:01 UTC (rev \
7698) @@ -1,34 +0,0 @@
---- vnstat-1.10/Makefile.orig	2010-08-13 10:24:18.000000000 +0200
-+++ vnstat-1.10/Makefile	2010-08-13 10:26:51.000000000 +0200
-@@ -2,11 +2,13 @@
- BIN = $(DESTDIR)/usr/bin
- SBIN = $(DESTDIR)/usr/sbin
- MAN = $(DESTDIR)/usr/share/man
-+DB := $(DESTDIR)/var/lib/vnstat
- 
- # bin and man dirs for *BSD
- BIN_BSD = $(DESTDIR)/usr/local/bin
- SBIN_BSD = $(DESTDIR)/usr/local/sbin
- MAN_BSD = $(DESTDIR)/usr/local/man
-+DB_BSD := $(DESTDIR)/var/db/vnstat
- 
- default: vnstat
- 
-@@ -53,7 +55,7 @@
- 	fi
- 
- # 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 $(DB)
- 	install -s -m 755 src/vnstat $(BIN)
- 	install -s -m 755 src/vnstatd $(SBIN)
- 	@if [ -f "src/vnstati" ]; \
-@@ -126,7 +128,7 @@
- 	fi
- 
- # install binaries
--	install -d -m 755 $(DESTDIR)/var/db/vnstat
-+	install -d -m 755 $(DB_BSD)
- 	install -s -m 755 src/vnstat $(BIN_BSD)
- 	install -s -m 755 src/vnstatd $(SBIN_BSD)
- 

Copied: ipcop/trunk/src/patches/vnstat-1.12_db-dir.patch (from rev 7696, \
ipcop/trunk/src/patches/vnstat-1.11_db-dir.patch) \
                ===================================================================
--- ipcop/trunk/src/patches/vnstat-1.12_db-dir.patch	                        (rev 0)
+++ ipcop/trunk/src/patches/vnstat-1.12_db-dir.patch	2014-11-12 11:29:01 UTC (rev \
7698) @@ -0,0 +1,35 @@
+--- vnstat-1.10/Makefile.orig	2010-08-13 10:24:18.000000000 +0200
++++ vnstat-1.10/Makefile	2010-08-13 10:26:51.000000000 +0200
+@@ -2,11 +2,13 @@
+ BIN = $(DESTDIR)/usr/bin
+ SBIN = $(DESTDIR)/usr/sbin
+ MAN = $(DESTDIR)/usr/share/man
++DB := $(DESTDIR)/var/lib/vnstat
+ 
+ # bin and man dirs for *BSD
+ BIN_BSD = $(DESTDIR)/usr/local/bin
+ SBIN_BSD = $(DESTDIR)/usr/local/sbin
+ MAN_BSD = $(DESTDIR)/usr/local/man
++DB_BSD := $(DESTDIR)/var/db/vnstat
+ 
+ default: vnstat
+ 
+@@ -66,6 +66,9 @@
+ 	install -m 644 cfg/vnstat.conf $(DESTDIR)/etc/vnstat.conf; \
+ 	fi
+ 
++# install db directory
++	install -d -m 755 $(DB)
++
+ # install everything else
+ 	install -d -m 755 $(BIN) $(SBIN) $(MAN)/man1 $(MAN)/man5
+ 	install -s -m 755 src/vnstat $(BIN)
+@@ -126,7 +128,7 @@
+ 	fi
+ 
+ # install binaries
+-	install -d -m 755 $(DESTDIR)/var/db/vnstat
++	install -d -m 755 $(DB_BSD)
+ 	install -s -m 755 src/vnstat $(BIN_BSD)
+ 	install -s -m 755 src/vnstatd $(SBIN_BSD)
+ 

Modified: ipcop/trunk/updates/2.1.8/ROOTFILES.i486-2.1.8
===================================================================
--- ipcop/trunk/updates/2.1.8/ROOTFILES.i486-2.1.8	2014-11-12 11:25:20 UTC (rev 7697)
+++ ipcop/trunk/updates/2.1.8/ROOTFILES.i486-2.1.8	2014-11-12 11:29:01 UTC (rev 7698)
@@ -13,5 +13,10 @@
 ## smartmontools-6.3
 /usr/sbin/smartctl
 ##
+## vnstat-1.12
+/etc/vnstat.conf
+/usr/bin/vnstat
+/usr/sbin/vnstatd
+##
 ## wget-1.16
 /usr/bin/wget

Modified: ipcop/trunk/updates/2.1.8/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.8/information.xml	2014-11-12 11:25:20 UTC (rev 7697)
+++ ipcop/trunk/updates/2.1.8/information.xml	2014-11-12 11:29:01 UTC (rev 7698)
@@ -6,7 +6,7 @@
         <isoimages>no</isoimages>
         <description>
         Upgrade acpid to 2.0.23, dhcpcd to 6.6.0, hdparm to 9.45,
-        smartmontools to 6.3, wget to 1.16.
+        smartmontools to 6.3, vnstat to 1.12, wget to 1.16.
         </description>
         <previousversion>2.1.7</previousversion>
         <installdate>INSTALLDATE</installdate>

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic