From nobody@FreeBSD.org Mon Feb 18 19:29:38 2008 Return-Path: Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBB2D16A418 for ; Mon, 18 Feb 2008 19:29:38 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 18DCB13C447 for ; Mon, 18 Feb 2008 19:29:38 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m1IJR9XM071274 for ; Mon, 18 Feb 2008 19:27:09 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m1IJR9Cr071273; Mon, 18 Feb 2008 19:27:09 GMT (envelope-from nobody) Message-Id: <200802181927.m1IJR9Cr071273@www.freebsd.org> Date: Mon, 18 Feb 2008 19:27:09 GMT From: Dennis Herrmann To: freebsd-gnats-submit@FreeBSD.org Subject: New Port: (A console-based network traffic monitor) X-Send-Pr-Version: www-3.1 X-GNATS-Notify: >Number: 120825 >Category: ports >Synopsis: New Port: net/vnstat, A console-based network traffic monitor >Confidential: no >Severity: non-critical >Priority: low >Responsible: beech >State: closed >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Feb 18 19:30:01 UTC 2008 >Closed-Date: Tue Feb 19 20:20:13 UTC 2008 >Last-Modified: Tue Feb 19 20:30:01 UTC 2008 >Originator: Dennis Herrmann >Release: FreeBSD 6.3-RELEASE >Organization: >Environment: FreeBSD contempt 6.3-RELEASE-p1 FreeBSD 6.3-RELEASE-p1 #3: Sun Feb 17 06:44:17 CET 2008 root@contempt:/usr/obj/usr/src/sys/CONTEMPT i386 >Description: vnStat is a console-based network traffic monitor. It keeps a log of hourly, daily and monthly network traffic for the selected inter- face(s). However, it isn't a packet sniffer. The traffic information is analyzed from the filesystem. That way vnStat can be used even without root permissions. >How-To-Repeat: >Fix: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # vnstat # vnstat/Makefile # vnstat/distinfo # vnstat/pkg-message # vnstat/pkg-plist # vnstat/files # vnstat/files/patch-cfg.c # vnstat/files/patch-vnstat.c # vnstat/files/patch-Makefile # vnstat/pkg-descr # echo c - vnstat mkdir -p vnstat > /dev/null 2>&1 echo x - vnstat/Makefile sed 's/^X//' >vnstat/Makefile << 'END-of-vnstat/Makefile' X# New ports collection makefile for: vnstat X# Date created: February 17, 2008 X# Whom: Dennis Herrmann X# X# $FreeBSD$ X# X XPORTNAME= vnstat XPORTVERSION= 1.6 XCATEGORIES= net XMASTER_SITES= http://humdi.net/vnstat/:vnstat \ X http://mcx2.org/files/:vnstat XDISTNAME= ${PORTNAME}-${PORTVERSION}_bsd X XMAINTAINER= adox@mcx2.org XCOMMENT= A console-based network traffic monitor X XMAN1= vnstat.1 XMANCOMPRESSED= yes X Xpost-install: X @${ECHO_MSG} X @${CAT} ${PKGMESSAGE} X @${ECHO_MSG} X X.include END-of-vnstat/Makefile echo x - vnstat/distinfo sed 's/^X//' >vnstat/distinfo << 'END-of-vnstat/distinfo' XMD5 (vnstat-1.6_bsd.tar.gz) = e186b05ea3994c4b5c14185f9e730e08 XSHA256 (vnstat-1.6_bsd.tar.gz) = dc04518731f9c07b3e0b43762337bb4357670cf3b0c042c12b4b8d039a141807 XSIZE (vnstat-1.6_bsd.tar.gz) = 37085 END-of-vnstat/distinfo echo x - vnstat/pkg-message sed 's/^X//' >vnstat/pkg-message << 'END-of-vnstat/pkg-message' X########################################################################### X XvnStat - Copyright (c) 2002-08 Teemu Toivola X X This program is free software; you can redistribute it and/or modify X it under the terms of the GNU General Public License as published by X the Free Software Foundation; version 2 dated June, 1991. X X This program is distributed in the hope that it will be useful, X but WITHOUT ANY WARRANTY; without even the implied warranty of X MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the X GNU General Public License for more details. X X You should have received a copy of the GNU General Public License X along with this program; if not, write to the Free Software X Foundation, Inc., 675 Mass Ave., Cambridge, MA 02139, USA. X X########################################################################### XIf you delete vnStat ,you needs the cron entry from /etc/crontab removed Xmanually. X########################################################################### END-of-vnstat/pkg-message echo x - vnstat/pkg-plist sed 's/^X//' >vnstat/pkg-plist << 'END-of-vnstat/pkg-plist' Xbin/vnstat Xetc/vnstat.conf X@unexec rm -rf /var/db/vnstat END-of-vnstat/pkg-plist echo c - vnstat/files mkdir -p vnstat/files > /dev/null 2>&1 echo x - vnstat/files/patch-cfg.c sed 's/^X//' >vnstat/files/patch-cfg.c << 'END-of-vnstat/files/patch-cfg.c' X--- src/cfg.c.orig 2008-02-01 23:11:50.000000000 +0100 X+++ src/cfg.c 2008-02-18 18:23:22.000000000 +0100 X@@ -36,8 +36,8 @@ X printf("MaxBandwidth %d\n\n", cfg.maxbw); X X printf("# interface specific limits\n"); X- printf("# example 8Mbit limit for eth0 (remove # to activate):\n"); X- printf("#MaxBWeth0 8\n"); X+ printf("# example 8Mbit limit for fxp0 (remove # to activate):\n"); X+ printf("#MaxBWfxp0 8\n"); X X while (p != NULL) { X printf("MaxBW%s %d\n", p->interface, p->limit); X@@ -86,7 +86,7 @@ X /* load default config */ X defaultcfg(); X X- /* possible config files: 1) --config 2) $HOME/.vnstatrc 3) /etc/vnstat.conf 4) none */ X+ /* possible config files: 1) --config 2) $HOME/.vnstatrc 3) /usr/local/etc/vnstat.conf 4) none */ X X if (cfgfile[0]!='\0') { X X@@ -112,7 +112,7 @@ X if (tryhome && (fd=fopen(buffer, "r"))!=NULL) { X if (debug) X printf("Config file: $HOME/.vnstatrc\n"); X- } else if ((fd=fopen("/etc/vnstat.conf", "r"))!=NULL) { X+ } else if ((fd=fopen("/usr/local/etc/vnstat.conf", "r"))!=NULL) { X if (debug) X printf("Config file: /etc/vnstat.conf\n"); X } else { END-of-vnstat/files/patch-cfg.c echo x - vnstat/files/patch-vnstat.c sed 's/^X//' >vnstat/files/patch-vnstat.c << 'END-of-vnstat/files/patch-vnstat.c' X--- src/vnstat.c.orig 2008-02-01 23:11:50.000000000 +0100 X+++ src/vnstat.c 2008-02-18 18:18:30.000000000 +0100 X@@ -524,8 +524,8 @@ X if (files==0) { X printf("No database found, nothing to do. Use --help for help.\n\n"); X printf("A new database can be created with the following command:\n"); X- printf(" %s -u -i eth0\n\n", argv[0]); X- printf("Replace 'eth0' with the interface that should be monitored. A list\n"); X+ printf(" %s -u -i fxp0\n\n", argv[0]); X+ printf("Replace 'fxp0' with the interface that should be monitored. A list\n"); X printf("of available interfaces can be seen with the 'ifconfig' command.\n"); X } else { X printf("Nothing to do. Use --help for help.\n"); END-of-vnstat/files/patch-vnstat.c echo x - vnstat/files/patch-Makefile sed 's/^X//' >vnstat/files/patch-Makefile << 'END-of-vnstat/files/patch-Makefile' X--- Makefile-e 2008-02-18 18:00:05.000000000 +0100 X+++ Makefile 2008-02-18 18:10:17.000000000 +0100 X@@ -1,84 +1,19 @@ X-# bin, man and cron dirs X-BIN = $(DESTDIR)/usr/bin X-MAN = $(DESTDIR)/usr/share/man X-CRON = $(DESTDIR)/etc/cron.d X+# FreeBSD port by Dennis Herrmann X X-vnstat: X+all: X +make -C src vnstat X X clean: X make -C src clean X X install: X- @echo "Installing vnStat..." X- X-# move some really old version database(s) if found X- @if [ -d $(DESTDIR)/var/spool/vnstat ]; \ X- then echo "Moving old database(s) to new location..."; \ X- mv -f $(DESTDIR)/var/spool/vnstat $(DESTDIR)/var/lib/; \ X- fi X- X-# remove some really old version binary if found X- @if [ -x $(DESTDIR)/usr/local/bin/vnstat ]; \ X- then echo "Removing old binary..."; \ X- rm -f $(DESTDIR)/usr/local/bin/vnstat; \ X- fi X- X-# install ppp scripts if directory is found X- @if [ -d $(DESTDIR)/etc/ppp/ip-up.d ]; \ X- then echo "Installing ppp/ip-up script"; \ X- cp -f pppd/vnstat_ip-up $(DESTDIR)/etc/ppp/ip-up.d/vnstat; \ X- chmod 755 $(DESTDIR)/etc/ppp/ip-up.d/vnstat; \ X- fi X- @if [ -d $(DESTDIR)/etc/ppp/ip-down.d ]; \ X- then echo "Installing ppp/ip-down script"; \ X- cp -f pppd/vnstat_ip-down $(DESTDIR)/etc/ppp/ip-down.d/vnstat; \ X- chmod 755 $(DESTDIR)/etc/ppp/ip-down.d/vnstat; \ X- fi X- X-# install default config if such doesn't exist X- @if [ ! -f $(DESTDIR)/etc/vnstat.conf ]; \ X- then install -m 644 cfg/vnstat.conf $(DESTDIR)/etc; \ X- fi X- X- install -d $(BIN) $(MAN)/man1 $(CRON) $(DESTDIR)/var/lib/vnstat X- install -s -m 755 src/vnstat $(BIN) X- X-# update man page, gzip it if previous version was done so X- @if [ -f $(MAN)/man1/vnstat.1.gz ]; \ X- then install -m 644 man/vnstat.1 $(MAN)/man1; \ X- gzip -f9 $(MAN)/man1/vnstat.1; \ X- else install -m 644 man/vnstat.1 $(MAN)/man1; \ X- fi X- X- install -m 644 cron/vnstat $(CRON) X- X-uninstall: X- @echo "Uninstalling vnStat..." X- @echo X- @echo "Note: this will also remove the database directory" X- @echo "including any database located there" X- @echo X- @echo "Press CTRL-C to abort within 10 sec." X- @sleep 10 X- rm -fr $(DESTDIR)/var/lib/vnstat X- rm -f $(BIN)/vnstat X- rm -f $(MAN)/man1/vnstat.1* X- rm -f $(CRON)/vnstat X- rm -f $(DESTDIR)/etc/vnstat.conf X- rm -f $(DESTDIR)/etc/ppp/ip-up.d/vnstat X- rm -f $(DESTDIR)/etc/ppp/ip-down.d/vnstat X- X-bsdinstall: X- @echo "Installing vnStat (BSD)..." X- X install -dm 755 /var/db/vnstat X install -m 755 src/vnstat /usr/local/bin X X # install default config if such doesn't exist X- @if [ ! -f /etc/vnstat.conf ]; \ X- then install -m 644 cfg/vnstat.conf /etc; \ X- sed -i "" -e 's/lib/db/g' /etc/vnstat.conf; \ X+ @if [ ! -f /usr/local/etc/vnstat.conf ]; \ X+ then install -m 644 cfg/vnstat.conf /usr/local/etc; \ X+ sed -i "" -e 's/lib/db/g' /usr/local/etc/vnstat.conf; \ X fi X X # install cron if it isn' there already X@@ -91,16 +26,8 @@ X install -m 644 man/vnstat.1 /usr/local/man/man1 X gzip -f9 /usr/local/man/man1/vnstat.1 X X-bsduninstall: X- @echo "Uninstalling vnStat (BSD)..." X- @echo X- @echo "Note: this will also remove the database directory" X- @echo "including any database located there" X- @echo X- @echo "Press CTRL-C to abort within 10 sec." X- @sleep 10 X+deinstall: X rm -fr /var/db/vnstat X rm -f /usr/local/bin/vnstat X rm -f /usr/local/man/man1/vnstat.1* X- rm -f /etc/vnstat.conf X- @echo "The cron entry from /etc/crontab needs to be removed manually." X+ rm -f /usr/local/etc/vnstat.conf END-of-vnstat/files/patch-Makefile echo x - vnstat/pkg-descr sed 's/^X//' >vnstat/pkg-descr << 'END-of-vnstat/pkg-descr' XvnStat is a console-based network traffic monitor. It keeps a log of Xhourly, daily and monthly network traffic for the selected inter- Xface(s). However, it isn't a packet sniffer. The traffic information is Xanalyzed from the proc(5) filesystem. That way vnStat can be used even Xwithout root permissions. X XWWW: http://humdi.net/vnstat/ END-of-vnstat/pkg-descr exit >Release-Note: >Audit-Trail: From: "Dennis Herrmann" To: bug-followup@FreeBSD.org, adox@mcx2.org Cc: Subject: Re: ports/120825: New Port: Date: Mon, 18 Feb 2008 21:52:00 +0100 ------=_Part_14771_31325732.1203367920949 Content-Type: multipart/alternative; boundary="----=_Part_14772_2973546.1203367920949" ------=_Part_14772_2973546.1203367920949 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline I am so stupid ,i posted the wrong sha file :/ ,please use this: ------=_Part_14772_2973546.1203367920949 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline I am so stupid ,i posted the wrong sha file :/ ,please use this: ------=_Part_14772_2973546.1203367920949-- ------=_Part_14771_31325732.1203367920949 Content-Type: application/octet-stream; name=vnstat Content-Transfer-Encoding: base64 X-Attachment-Id: f_fcti62yl Content-Disposition: attachment; filename=vnstat IyBUaGlzIGlzIGEgc2hlbGwgYXJjaGl2ZS4gIFNhdmUgaXQgaW4gYSBmaWxlLCByZW1vdmUgYW55 dGhpbmcgYmVmb3JlCiMgdGhpcyBsaW5lLCBhbmQgdGhlbiB1bnBhY2sgaXQgYnkgZW50ZXJpbmcg InNoIGZpbGUiLiAgTm90ZSwgaXQgbWF5CiMgY3JlYXRlIGRpcmVjdG9yaWVzOyBmaWxlcyBhbmQg ZGlyZWN0b3JpZXMgd2lsbCBiZSBvd25lZCBieSB5b3UgYW5kCiMgaGF2ZSBkZWZhdWx0IHBlcm1p c3Npb25zLgojCiMgVGhpcyBhcmNoaXZlIGNvbnRhaW5zOgojCiMJdm5zdGF0CiMJdm5zdGF0L01h a2VmaWxlCiMJdm5zdGF0L2Rpc3RpbmZvCiMJdm5zdGF0L3BrZy1tZXNzYWdlCiMJdm5zdGF0L3Br Zy1wbGlzdAojCXZuc3RhdC9maWxlcwojCXZuc3RhdC9maWxlcy9wYXRjaC1jZmcuYwojCXZuc3Rh dC9maWxlcy9wYXRjaC12bnN0YXQuYwojCXZuc3RhdC9maWxlcy9wYXRjaC1NYWtlZmlsZQojCXZu c3RhdC9wa2ctZGVzY3IKIwplY2hvIGMgLSB2bnN0YXQKbWtkaXIgLXAgdm5zdGF0ID4gL2Rldi9u dWxsIDI+JjEKZWNobyB4IC0gdm5zdGF0L01ha2VmaWxlCnNlZCAncy9eWC8vJyA+dm5zdGF0L01h a2VmaWxlIDw8ICdFTkQtb2Ytdm5zdGF0L01ha2VmaWxlJwpYIyBOZXcgcG9ydHMgY29sbGVjdGlv biBtYWtlZmlsZSBmb3I6IHZuc3RhdApYIyBEYXRlIGNyZWF0ZWQ6IEZlYnJ1YXJ5IDE3LCAyMDA4 ClgjIFdob206IERlbm5pcyBIZXJybWFubiA8YWRveEBtY3gyLm9yZz4KWCMKWCMgJEZyZWVCU0Qk ClgjClgKWFBPUlROQU1FPSB2bnN0YXQKWFBPUlRWRVJTSU9OPSAxLjYKWENBVEVHT1JJRVM9IG5l dApYTUFTVEVSX1NJVEVTPSBodHRwOi8vaHVtZGkubmV0L3Zuc3RhdC8gXApYCSAgICAgIGh0dHA6 Ly9tY3gyLm9yZy9maWxlcy8KWERJU1ROQU1FPSAke1BPUlROQU1FfS0ke1BPUlRWRVJTSU9OfV9i c2QKWApYTUFJTlRBSU5FUj0JYWRveEBtY3gyLm9yZwpYQ09NTUVOVD0gQSBjb25zb2xlLWJhc2Vk IG5ldHdvcmsgdHJhZmZpYyBtb25pdG9yClgKWE1BTjE9IHZuc3RhdC4xClhNQU5DT01QUkVTU0VE PSB5ZXMKWFdSS1NSQz0gJHtXUktESVJ9LyR7UE9SVE5BTUV9LSR7UE9SVFZFUlNJT059ClgKWHBv c3QtaW5zdGFsbDoKWAlAJHtFQ0hPX01TR30KWAlAJHtDQVR9ICR7UEtHTUVTU0FHRX0KWAlAJHtF Q0hPX01TR30KWApYLmluY2x1ZGUgPGJzZC5wb3J0Lm1rPgpFTkQtb2Ytdm5zdGF0L01ha2VmaWxl CmVjaG8geCAtIHZuc3RhdC9kaXN0aW5mbwpzZWQgJ3MvXlgvLycgPnZuc3RhdC9kaXN0aW5mbyA8 PCAnRU5ELW9mLXZuc3RhdC9kaXN0aW5mbycKWE1ENSAodm5zdGF0LTEuNl9ic2QudGFyLmd6KSA9 IGUxODZiMDVlYTM5OTRjNGI1YzE0MTg1ZjllNzMwZTA4ClhTSEEyNTYgKHZuc3RhdC0xLjZfYnNk LnRhci5neikgPSBkYzA0NTE4NzMxZjljMDdiM2UwYjQzNzYyMzM3YmI0MzU3NjcwY2YzYjBjMDQy YzEyYjRiOGQwMzlhMTQxODA3ClhTSVpFICh2bnN0YXQtMS42X2JzZC50YXIuZ3opID0gMzcwODUK RU5ELW9mLXZuc3RhdC9kaXN0aW5mbwplY2hvIHggLSB2bnN0YXQvcGtnLW1lc3NhZ2UKc2VkICdz L15YLy8nID52bnN0YXQvcGtnLW1lc3NhZ2UgPDwgJ0VORC1vZi12bnN0YXQvcGtnLW1lc3NhZ2Un ClgjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMKWApYdm5TdGF0IC0gQ29weXJpZ2h0IChjKSAyMDAyLTA4IFRl ZW11IFRvaXZvbGEgPHRzdEBpa2kuZmk+ClgKWCAgIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3 YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5ClggICBpdCB1bmRlciB0 aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBi eQpYICAgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgdmVyc2lvbiAyIGRhdGVkIEp1bmUs IDE5OTEuClgKWCAgIFRoaXMgcHJvZ3JhbSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0 IGl0IHdpbGwgYmUgdXNlZnVsLApYICAgYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0 IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKWCAgIE1FUkNIQU5UQUJJTElUWSBvciBGSVRO RVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUKWCAgIEdOVSBHZW5lcmFsIFB1 YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuClgKWCAgIFlvdSBzaG91bGQgaGF2ZSByZWNl aXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlClggICBhbG9uZyB3 aXRoIHRoaXMgcHJvZ3JhbTsgIGlmIG5vdCwgd3JpdGUgdG8gdGhlIEZyZWUgU29mdHdhcmUKWCAg IEZvdW5kYXRpb24sIEluYy4sIDY3NSBNYXNzIEF2ZS4sIENhbWJyaWRnZSwgTUEgMDIxMzksIFVT QS4KWApYIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjClhJZiB5b3UgZGVsZXRlIHZuU3RhdCAseW91IG5lZWRz IHRoZSBjcm9uIGVudHJ5IGZyb20gL2V0Yy9jcm9udGFiIHJlbW92ZWQgClhtYW51YWxseS4KWCMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIwpFTkQtb2Ytdm5zdGF0L3BrZy1tZXNzYWdlCmVjaG8geCAtIHZuc3Rh dC9wa2ctcGxpc3QKc2VkICdzL15YLy8nID52bnN0YXQvcGtnLXBsaXN0IDw8ICdFTkQtb2Ytdm5z dGF0L3BrZy1wbGlzdCcKWGJpbi92bnN0YXQKWGV0Yy92bnN0YXQuY29uZgpYQHVuZXhlYyBybSAt cmYgL3Zhci9kYi92bnN0YXQKRU5ELW9mLXZuc3RhdC9wa2ctcGxpc3QKZWNobyBjIC0gdm5zdGF0 L2ZpbGVzCm1rZGlyIC1wIHZuc3RhdC9maWxlcyA+IC9kZXYvbnVsbCAyPiYxCmVjaG8geCAtIHZu c3RhdC9maWxlcy9wYXRjaC1jZmcuYwpzZWQgJ3MvXlgvLycgPnZuc3RhdC9maWxlcy9wYXRjaC1j ZmcuYyA8PCAnRU5ELW9mLXZuc3RhdC9maWxlcy9wYXRjaC1jZmcuYycKWC0tLSBzcmMvY2ZnLmMu b3JpZwkyMDA4LTAyLTAxIDIzOjExOjUwLjAwMDAwMDAwMCArMDEwMApYKysrIHNyYy9jZmcuYwky MDA4LTAyLTE4IDE4OjIzOjIyLjAwMDAwMDAwMCArMDEwMApYQEAgLTM2LDggKzM2LDggQEAKWCAJ cHJpbnRmKCJNYXhCYW5kd2lkdGggJWRcblxuIiwgY2ZnLm1heGJ3KTsKWCAKWCAJcHJpbnRmKCIj IGludGVyZmFjZSBzcGVjaWZpYyBsaW1pdHNcbiIpOwpYLQlwcmludGYoIiMgIGV4YW1wbGUgOE1i aXQgbGltaXQgZm9yIGV0aDAgKHJlbW92ZSAjIHRvIGFjdGl2YXRlKTpcbiIpOwpYLQlwcmludGYo IiNNYXhCV2V0aDAgOFxuIik7ClgrCXByaW50ZigiIyAgZXhhbXBsZSA4TWJpdCBsaW1pdCBmb3Ig ZnhwMCAocmVtb3ZlICMgdG8gYWN0aXZhdGUpOlxuIik7ClgrCXByaW50ZigiI01heEJXZnhwMCA4 XG4iKTsKWCAKWCAJd2hpbGUgKHAgIT0gTlVMTCkgewpYIAkJcHJpbnRmKCJNYXhCVyVzICVkXG4i LCBwLT5pbnRlcmZhY2UsIHAtPmxpbWl0KTsKWEBAIC04Niw3ICs4Niw3IEBAClggCS8qIGxvYWQg ZGVmYXVsdCBjb25maWcgKi8KWCAJZGVmYXVsdGNmZygpOwpYIApYLQkvKiBwb3NzaWJsZSBjb25m aWcgZmlsZXM6IDEpIC0tY29uZmlnICAgMikgJEhPTUUvLnZuc3RhdHJjICAgMykgL2V0Yy92bnN0 YXQuY29uZiAgIDQpIG5vbmUgKi8KWCsJLyogcG9zc2libGUgY29uZmlnIGZpbGVzOiAxKSAtLWNv bmZpZyAgIDIpICRIT01FLy52bnN0YXRyYyAgIDMpIC91c3IvbG9jYWwvZXRjL3Zuc3RhdC5jb25m ICAgNCkgbm9uZSAqLwpYIApYIAlpZiAoY2ZnZmlsZVswXSE9J1wwJykgewpYIAkKWEBAIC0xMTIs NyArMTEyLDcgQEAKWCAJCWlmICh0cnlob21lICYmIChmZD1mb3BlbihidWZmZXIsICJyIikpIT1O VUxMKSB7ClggCQkJaWYgKGRlYnVnKQpYIAkJCQlwcmludGYoIkNvbmZpZyBmaWxlOiAkSE9NRS8u dm5zdGF0cmNcbiIpOwpYLQkJfSBlbHNlIGlmICgoZmQ9Zm9wZW4oIi9ldGMvdm5zdGF0LmNvbmYi LCAiciIpKSE9TlVMTCkgewpYKwkJfSBlbHNlIGlmICgoZmQ9Zm9wZW4oIi91c3IvbG9jYWwvZXRj L3Zuc3RhdC5jb25mIiwgInIiKSkhPU5VTEwpIHsKWCAJCQlpZiAoZGVidWcpClggCQkJCXByaW50 ZigiQ29uZmlnIGZpbGU6IC9ldGMvdm5zdGF0LmNvbmZcbiIpOwpYIAkJfSBlbHNlIHsKRU5ELW9m LXZuc3RhdC9maWxlcy9wYXRjaC1jZmcuYwplY2hvIHggLSB2bnN0YXQvZmlsZXMvcGF0Y2gtdm5z dGF0LmMKc2VkICdzL15YLy8nID52bnN0YXQvZmlsZXMvcGF0Y2gtdm5zdGF0LmMgPDwgJ0VORC1v Zi12bnN0YXQvZmlsZXMvcGF0Y2gtdm5zdGF0LmMnClgtLS0gc3JjL3Zuc3RhdC5jLm9yaWcJMjAw OC0wMi0wMSAyMzoxMTo1MC4wMDAwMDAwMDAgKzAxMDAKWCsrKyBzcmMvdm5zdGF0LmMJMjAwOC0w Mi0xOCAxODoxODozMC4wMDAwMDAwMDAgKzAxMDAKWEBAIC01MjQsOCArNTI0LDggQEAKWCAJCWlm IChmaWxlcz09MCkgewpYIAkJCXByaW50ZigiTm8gZGF0YWJhc2UgZm91bmQsIG5vdGhpbmcgdG8g ZG8uIFVzZSAtLWhlbHAgZm9yIGhlbHAuXG5cbiIpOwpYIAkJCXByaW50ZigiQSBuZXcgZGF0YWJh c2UgY2FuIGJlIGNyZWF0ZWQgd2l0aCB0aGUgZm9sbG93aW5nIGNvbW1hbmQ6XG4iKTsKWC0JCQlw cmludGYoIiAgICAlcyAtdSAtaSBldGgwXG5cbiIsIGFyZ3ZbMF0pOwpYLQkJCXByaW50ZigiUmVw bGFjZSAnZXRoMCcgd2l0aCB0aGUgaW50ZXJmYWNlIHRoYXQgc2hvdWxkIGJlIG1vbml0b3JlZC4g QSBsaXN0XG4iKTsKWCsJCQlwcmludGYoIiAgICAlcyAtdSAtaSBmeHAwXG5cbiIsIGFyZ3ZbMF0p OwpYKwkJCXByaW50ZigiUmVwbGFjZSAnZnhwMCcgd2l0aCB0aGUgaW50ZXJmYWNlIHRoYXQgc2hv dWxkIGJlIG1vbml0b3JlZC4gQSBsaXN0XG4iKTsKWCAJCQlwcmludGYoIm9mIGF2YWlsYWJsZSBp bnRlcmZhY2VzIGNhbiBiZSBzZWVuIHdpdGggdGhlICdpZmNvbmZpZycgY29tbWFuZC5cbiIpOwpY IAkJfSBlbHNlIHsKWCAJCQlwcmludGYoIk5vdGhpbmcgdG8gZG8uIFVzZSAtLWhlbHAgZm9yIGhl bHAuXG4iKTsKRU5ELW9mLXZuc3RhdC9maWxlcy9wYXRjaC12bnN0YXQuYwplY2hvIHggLSB2bnN0 YXQvZmlsZXMvcGF0Y2gtTWFrZWZpbGUKc2VkICdzL15YLy8nID52bnN0YXQvZmlsZXMvcGF0Y2gt TWFrZWZpbGUgPDwgJ0VORC1vZi12bnN0YXQvZmlsZXMvcGF0Y2gtTWFrZWZpbGUnClgtLS0gTWFr ZWZpbGUtZQkyMDA4LTAyLTE4IDE4OjAwOjA1LjAwMDAwMDAwMCArMDEwMApYKysrIE1ha2VmaWxl CTIwMDgtMDItMTggMTg6MTA6MTcuMDAwMDAwMDAwICswMTAwClhAQCAtMSw4NCArMSwxOSBAQApY LSMgYmluLCBtYW4gYW5kIGNyb24gZGlycwpYLUJJTiA9ICQoREVTVERJUikvdXNyL2JpbgpYLU1B TiA9ICQoREVTVERJUikvdXNyL3NoYXJlL21hbgpYLUNST04gPSAkKERFU1RESVIpL2V0Yy9jcm9u LmQKWCsjIEZyZWVCU0QgcG9ydCBieSBEZW5uaXMgSGVycm1hbm4KWCAKWC12bnN0YXQ6ClgrYWxs OgpYIAkrbWFrZSAtQyBzcmMgdm5zdGF0ClggClggY2xlYW46ClggCW1ha2UgLUMgc3JjIGNsZWFu ClggClggaW5zdGFsbDoKWC0JQGVjaG8gIkluc3RhbGxpbmcgdm5TdGF0Li4uIgpYLQpYLSMgbW92 ZSBzb21lIHJlYWxseSBvbGQgdmVyc2lvbiBkYXRhYmFzZShzKSBpZiBmb3VuZApYLQlAaWYgWyAt ZCAkKERFU1RESVIpL3Zhci9zcG9vbC92bnN0YXQgXTsgXApYLQl0aGVuIGVjaG8gIk1vdmluZyBv bGQgZGF0YWJhc2UocykgdG8gbmV3IGxvY2F0aW9uLi4uIjsgXApYLQltdiAtZiAkKERFU1RESVIp L3Zhci9zcG9vbC92bnN0YXQgJChERVNURElSKS92YXIvbGliLzsgXApYLQlmaQpYLQpYLSMgcmVt b3ZlIHNvbWUgcmVhbGx5IG9sZCB2ZXJzaW9uIGJpbmFyeSBpZiBmb3VuZApYLQlAaWYgWyAteCAk KERFU1RESVIpL3Vzci9sb2NhbC9iaW4vdm5zdGF0IF07IFwKWC0JdGhlbiBlY2hvICJSZW1vdmlu ZyBvbGQgYmluYXJ5Li4uIjsgXApYLQlybSAtZiAkKERFU1RESVIpL3Vzci9sb2NhbC9iaW4vdm5z dGF0OyBcClgtCWZpClgtClgtIyBpbnN0YWxsIHBwcCBzY3JpcHRzIGlmIGRpcmVjdG9yeSBpcyBm b3VuZApYLQlAaWYgWyAtZCAkKERFU1RESVIpL2V0Yy9wcHAvaXAtdXAuZCBdOyBcClgtCXRoZW4g ZWNobyAiSW5zdGFsbGluZyBwcHAvaXAtdXAgc2NyaXB0IjsgXApYLQljcCAtZiBwcHBkL3Zuc3Rh dF9pcC11cCAkKERFU1RESVIpL2V0Yy9wcHAvaXAtdXAuZC92bnN0YXQ7IFwKWC0JY2htb2QgNzU1 ICQoREVTVERJUikvZXRjL3BwcC9pcC11cC5kL3Zuc3RhdDsgXApYLQlmaQpYLQlAaWYgWyAtZCAk KERFU1RESVIpL2V0Yy9wcHAvaXAtZG93bi5kIF07IFwKWC0JdGhlbiBlY2hvICJJbnN0YWxsaW5n IHBwcC9pcC1kb3duIHNjcmlwdCI7IFwKWC0JY3AgLWYgcHBwZC92bnN0YXRfaXAtZG93biAkKERF U1RESVIpL2V0Yy9wcHAvaXAtZG93bi5kL3Zuc3RhdDsgXApYLQljaG1vZCA3NTUgJChERVNURElS KS9ldGMvcHBwL2lwLWRvd24uZC92bnN0YXQ7IFwKWC0JZmkKWC0KWC0jIGluc3RhbGwgZGVmYXVs dCBjb25maWcgaWYgc3VjaCBkb2Vzbid0IGV4aXN0ClgtCUBpZiBbICEgLWYgJChERVNURElSKS9l dGMvdm5zdGF0LmNvbmYgXTsgXApYLQl0aGVuIGluc3RhbGwgLW0gNjQ0IGNmZy92bnN0YXQuY29u ZiAkKERFU1RESVIpL2V0YzsgXApYLQlmaQpYLQpYLQlpbnN0YWxsIC1kICQoQklOKSAkKE1BTikv bWFuMSAkKENST04pICQoREVTVERJUikvdmFyL2xpYi92bnN0YXQKWC0JaW5zdGFsbCAtcyAtbSA3 NTUgc3JjL3Zuc3RhdCAkKEJJTikKWC0KWC0jIHVwZGF0ZSBtYW4gcGFnZSwgZ3ppcCBpdCBpZiBw cmV2aW91cyB2ZXJzaW9uIHdhcyBkb25lIHNvCQpYLQlAaWYgWyAtZiAkKE1BTikvbWFuMS92bnN0 YXQuMS5neiBdOyBcClgtCXRoZW4gaW5zdGFsbCAtbSA2NDQgbWFuL3Zuc3RhdC4xICQoTUFOKS9t YW4xOyBcClgtCWd6aXAgLWY5ICQoTUFOKS9tYW4xL3Zuc3RhdC4xOyBcClgtCWVsc2UgaW5zdGFs bCAtbSA2NDQgbWFuL3Zuc3RhdC4xICQoTUFOKS9tYW4xOyBcClgtCWZpClgtClgtCWluc3RhbGwg LW0gNjQ0IGNyb24vdm5zdGF0ICQoQ1JPTikKWC0KWC11bmluc3RhbGw6ClgtCUBlY2hvICJVbmlu c3RhbGxpbmcgdm5TdGF0Li4uIgpYLQlAZWNobwpYLQlAZWNobyAiTm90ZTogdGhpcyB3aWxsIGFs c28gcmVtb3ZlIHRoZSBkYXRhYmFzZSBkaXJlY3RvcnkiClgtCUBlY2hvICJpbmNsdWRpbmcgYW55 IGRhdGFiYXNlIGxvY2F0ZWQgdGhlcmUiClgtCUBlY2hvClgtCUBlY2hvICJQcmVzcyBDVFJMLUMg dG8gYWJvcnQgd2l0aGluIDEwIHNlYy4iClgtCUBzbGVlcCAxMApYLQlybSAtZnIgJChERVNURElS KS92YXIvbGliL3Zuc3RhdApYLQlybSAtZiAkKEJJTikvdm5zdGF0ClgtCXJtIC1mICQoTUFOKS9t YW4xL3Zuc3RhdC4xKgpYLQlybSAtZiAkKENST04pL3Zuc3RhdApYLQlybSAtZiAkKERFU1RESVIp L2V0Yy92bnN0YXQuY29uZgpYLQlybSAtZiAkKERFU1RESVIpL2V0Yy9wcHAvaXAtdXAuZC92bnN0 YXQKWC0Jcm0gLWYgJChERVNURElSKS9ldGMvcHBwL2lwLWRvd24uZC92bnN0YXQKWC0KWC1ic2Rp bnN0YWxsOgpYLQlAZWNobyAiSW5zdGFsbGluZyB2blN0YXQgKEJTRCkuLi4iClgtClggCWluc3Rh bGwgLWRtIDc1NSAvdmFyL2RiL3Zuc3RhdApYIAlpbnN0YWxsIC1tIDc1NSBzcmMvdm5zdGF0IC91 c3IvbG9jYWwvYmluClggClggIyBpbnN0YWxsIGRlZmF1bHQgY29uZmlnIGlmIHN1Y2ggZG9lc24n dCBleGlzdApYLQlAaWYgWyAhIC1mIC9ldGMvdm5zdGF0LmNvbmYgXTsgXApYLQl0aGVuIGluc3Rh bGwgLW0gNjQ0IGNmZy92bnN0YXQuY29uZiAvZXRjOyBcClgtCXNlZCAtaSAiIiAtZSAncy9saWIv ZGIvZycgL2V0Yy92bnN0YXQuY29uZjsgXApYKwlAaWYgWyAhIC1mIC91c3IvbG9jYWwvZXRjL3Zu c3RhdC5jb25mIF07IFwKWCsJdGhlbiBpbnN0YWxsIC1tIDY0NCBjZmcvdm5zdGF0LmNvbmYgL3Vz ci9sb2NhbC9ldGM7IFwKWCsJc2VkIC1pICIiIC1lICdzL2xpYi9kYi9nJyAvdXNyL2xvY2FsL2V0 Yy92bnN0YXQuY29uZjsgXApYIAlmaQpYIApYICMgaW5zdGFsbCBjcm9uIGlmIGl0IGlzbicgdGhl cmUgYWxyZWFkeQpYQEAgLTkxLDE2ICsyNiw4IEBAClggCWluc3RhbGwgLW0gNjQ0IG1hbi92bnN0 YXQuMSAvdXNyL2xvY2FsL21hbi9tYW4xClggCWd6aXAgLWY5IC91c3IvbG9jYWwvbWFuL21hbjEv dm5zdGF0LjEKWCAKWC1ic2R1bmluc3RhbGw6ClgtCUBlY2hvICJVbmluc3RhbGxpbmcgdm5TdGF0 IChCU0QpLi4uIgpYLQlAZWNobwpYLQlAZWNobyAiTm90ZTogdGhpcyB3aWxsIGFsc28gcmVtb3Zl IHRoZSBkYXRhYmFzZSBkaXJlY3RvcnkiClgtCUBlY2hvICJpbmNsdWRpbmcgYW55IGRhdGFiYXNl IGxvY2F0ZWQgdGhlcmUiClgtCUBlY2hvClgtCUBlY2hvICJQcmVzcyBDVFJMLUMgdG8gYWJvcnQg d2l0aGluIDEwIHNlYy4iClgtCUBzbGVlcCAxMApYK2RlaW5zdGFsbDoKWCAJcm0gLWZyIC92YXIv ZGIvdm5zdGF0ClggCXJtIC1mIC91c3IvbG9jYWwvYmluL3Zuc3RhdApYIAlybSAtZiAvdXNyL2xv Y2FsL21hbi9tYW4xL3Zuc3RhdC4xKgpYLQlybSAtZiAvZXRjL3Zuc3RhdC5jb25mClgtCUBlY2hv ICJUaGUgY3JvbiBlbnRyeSBmcm9tIC9ldGMvY3JvbnRhYiBuZWVkcyB0byBiZSByZW1vdmVkIG1h bnVhbGx5LiIKWCsJcm0gLWYgL3Vzci9sb2NhbC9ldGMvdm5zdGF0LmNvbmYKRU5ELW9mLXZuc3Rh dC9maWxlcy9wYXRjaC1NYWtlZmlsZQplY2hvIHggLSB2bnN0YXQvcGtnLWRlc2NyCnNlZCAncy9e WC8vJyA+dm5zdGF0L3BrZy1kZXNjciA8PCAnRU5ELW9mLXZuc3RhdC9wa2ctZGVzY3InClh2blN0 YXQgaXMgYSBjb25zb2xlLWJhc2VkIG5ldHdvcmsgdHJhZmZpYyBtb25pdG9yLiBJdCBrZWVwcyAg YSAgbG9nICBvZgpYaG91cmx5LCAgZGFpbHkgIGFuZCAgbW9udGhseSAgbmV0d29yayAgdHJhZmZp YyAgZm9yIHRoZSBzZWxlY3RlZCBpbnRlci0KWGZhY2UocykuIEhvd2V2ZXIsIGl0IGlzbid0IGEg cGFja2V0IHNuaWZmZXIuIFRoZSB0cmFmZmljIGluZm9ybWF0aW9uIGlzClhhbmFseXplZCAgZnJv bSB0aGUgcHJvYyg1KSBmaWxlc3lzdGVtLiBUaGF0IHdheSB2blN0YXQgY2FuIGJlIHVzZWQgZXZl bgpYd2l0aG91dCByb290IHBlcm1pc3Npb25zLgpYClhXV1c6IGh0dHA6Ly9odW1kaS5uZXQvdm5z dGF0LwpFTkQtb2Ytdm5zdGF0L3BrZy1kZXNjcgpleGl0Cgo= ------=_Part_14771_31325732.1203367920949-- Responsible-Changed-From-To: freebsd-ports-bugs->beech Responsible-Changed-By: beech Responsible-Changed-When: Tue Feb 19 06:14:02 UTC 2008 Responsible-Changed-Why: I'll take it http://www.freebsd.org/cgi/query-pr.cgi?pr=120825 State-Changed-From-To: open->feedback State-Changed-By: beech State-Changed-When: Tue Feb 19 17:21:06 UTC 2008 State-Changed-Why: Waiting for maintainer feedback http://www.freebsd.org/cgi/query-pr.cgi?pr=120825 State-Changed-From-To: feedback->closed State-Changed-By: beech State-Changed-When: Tue Feb 19 20:19:45 UTC 2008 State-Changed-Why: Committed (with minor changes), Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=120825 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/120825: commit references a PR Date: Tue, 19 Feb 2008 20:19:18 +0000 (UTC) beech 2008-02-19 20:18:53 UTC FreeBSD ports repository Modified files: net Makefile Added files: net/vnstat Makefile distinfo pkg-descr pkg-plist net/vnstat/files patch-Makefile patch-cfg.c patch-vnstat.c pkg-message.in Log: vnStat is a console-based network traffic monitor. It keeps a log of hourly, daily and monthly network traffic for the selected interface(s). However, it isn't a packet sniffer. The traffic information is analyzed from the proc(5) filesystem. That way vnStat can be used even without root permissions. PR: ports/120825 Submitted by: Dennis Herrmann (maintainer) Revision Changes Path 1.1967 +1 -0 ports/net/Makefile 1.1 +38 -0 ports/net/vnstat/Makefile (new) 1.1 +3 -0 ports/net/vnstat/distinfo (new) 1.1 +123 -0 ports/net/vnstat/files/patch-Makefile (new) 1.1 +31 -0 ports/net/vnstat/files/patch-cfg.c (new) 1.1 +13 -0 ports/net/vnstat/files/patch-vnstat.c (new) 1.1 +9 -0 ports/net/vnstat/files/pkg-message.in (new) 1.1 +7 -0 ports/net/vnstat/pkg-descr (new) 1.1 +3 -0 ports/net/vnstat/pkg-plist (new) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" >Unformatted: From nobody@FreeBSD.org Fri Feb 22 14:13:42 2008 Return-Path: Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C598416A404 for ; Fri, 22 Feb 2008 14:13:42 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 92D6F13C478 for ; Fri, 22 Feb 2008 14:13:42 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m1MEB6tl024420 for ; Fri, 22 Feb 2008 14:11:06 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m1MEB6m2024419; Fri, 22 Feb 2008 14:11:06 GMT (envelope-from nobody) Message-Id: <200802221411.m1MEB6m2024419@www.freebsd.org> Date: Fri, 22 Feb 2008 14:11:06 GMT From: Dennis Herrmann To: freebsd-gnats-submit@FreeBSD.org Subject: PATCH port net/vnstat (change few things) X-Send-Pr-Version: www-3.1 X-GNATS-Notify: >Number: 120968 >Category: ports >Synopsis: PATCH port net/vnstat (change few things) >Confidential: no >Severity: non-critical >Priority: low >Responsible: beech >State: closed >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Feb 22 14:20:01 UTC 2008 >Closed-Date: Sun Feb 24 11:13:52 UTC 2008 >Last-Modified: Sun Feb 24 11:20:01 UTC 2008 >Originator: Dennis Herrmann >Release: FreeBSD 6.3-RELEASE-p1 >Organization: >Environment: FreeBSD contempt 6.3-RELEASE-p1 FreeBSD 6.3-RELEASE-p1 #3: Sun Feb 17 06:44:17 CET 2008 root@contempt:/usr/obj/usr/src/sys/CONTEMPT i386 >Description: Attached diff to change var/lib: to "var/db" in vnstat.cron . Randy Pratt make me advertent of few things: 1. The PR 120880 that was committed missed changing "var/lib: to "var/db" in vnstat.cron. 2. The port will removed /var/db/vnstat entirely even during an update so you will lose all your data. 3. The same situation exists for vnstat.conf. (thanks Randy Pratt) He sended me an patch ,i fix few things but the most work come by Randy Pratt >How-To-Repeat: >Fix: diff -ruN vnstat.orig/Makefile vnstat/Makefile --- vnstat.orig/Makefile 2008-02-22 14:41:22.000000000 +0100 +++ vnstat/Makefile 2008-02-22 14:42:43.000000000 +0100 @@ -25,7 +25,7 @@ post-extract: @cd ${WRKSRC} && ${CP} cron/vnstat vnstat-cron @${REINPLACE_CMD} -e 's|/usr/bin|/usr/local/bin|g' \ - ${WRKSRC}/vnstat-cron + -e 's|/var/lib|/var/db|g' ${WRKSRC}/vnstat-cron post-install: .if !defined(NOPORTDOCS) diff -ruN vnstat.orig/files/patch-Makefile vnstat/files/patch-Makefile --- vnstat.orig/files/patch-Makefile 2008-02-22 14:41:22.000000000 +0100 +++ vnstat/files/patch-Makefile 2008-02-22 14:42:43.000000000 +0100 @@ -1,5 +1,5 @@ ---- Makefile.orig 2008-02-03 19:23:03.000000000 +0100 -+++ Makefile 2008-02-19 18:02:58.000000000 +0100 +--- Makefile.orig 2008-02-03 13:23:03.000000000 -0500 ++++ Makefile 2008-02-21 19:51:31.000000000 -0500 @@ -1,106 +1,29 @@ -# bin, man and cron dirs -BIN = $(DESTDIR)/usr/bin @@ -93,9 +93,9 @@ - @if [ `grep -c vnstat /etc/crontab` -eq 0 ]; \ - then cat cron/vnstat >>/etc/crontab; \ - sed -i "" -e 's/lib\/vnstat/db\/vnstat/g' -e 's/\/usr\/bin\/vnstat/\/usr\/local\/bin\/vnstat/g' /etc/crontab; \ -+ @if [ ! -f ${PREFIX}/etc/vnstat.conf ]; \ -+ then install -m 644 cfg/vnstat.conf ${PREFIX}/etc; \ -+ sed -i "" -e 's/lib/db/g' ${PREFIX}/etc/vnstat.conf; \ ++ @if [ ! -f ${PREFIX}/etc/vnstat.conf.sample ]; \ ++ then install -m 644 cfg/vnstat.conf ${PREFIX}/etc/vnstat.conf.sample; \ ++ sed -i "" -e 's/lib/db/g' ${PREFIX}/etc/vnstat.conf.sample; \ fi # update man page @@ -120,4 +120,4 @@ - @echo "The cron entry from /etc/crontab needs to be removed manually." + rm -f ${PREFIX}/bin/vnstat + rm -f ${PREFIX}/man/man1/vnstat.1* -+ rm -f ${PREFIX}/etc/vnstat.conf ++ rm -f ${PREFIX}/etc/vnstat.conf.sample diff -ruN vnstat.orig/files/pkg-message.in vnstat/files/pkg-message.in --- vnstat.orig/files/pkg-message.in 2008-02-22 14:41:22.000000000 +0100 +++ vnstat/files/pkg-message.in 2008-02-22 14:44:58.000000000 +0100 @@ -2,7 +2,8 @@ vnstat has been installed. This port neeeds a cron entry. Please copy the contents of: -%%DOCSDIR%%/vnstat-cron to your crontab. +%%DOCSDIR%%/vnstat-cron to your crontab. A Sample +configuration file has be installed in %%PREFIX%%/etc/ For more information about vnStat use "man vnstat" or visit: http://humdi.net/vnstat/ diff -ruN vnstat.orig/pkg-plist vnstat/pkg-plist --- vnstat.orig/pkg-plist 2008-02-22 14:41:22.000000000 +0100 +++ vnstat/pkg-plist 2008-02-22 14:43:34.000000000 +0100 @@ -1,3 +1,4 @@ +@exec mkdir -p /var/db/vnstat bin/vnstat -etc/vnstat.conf -@unexec rm -rf /var/db/vnstat 2>&1 >/dev/null || true +etc/vnstat.conf.sample +@dirrmtry /var/db/vnstat >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-ports-bugs->beech Responsible-Changed-By: beech Responsible-Changed-When: Sun Feb 24 09:14:45 UTC 2008 Responsible-Changed-Why: I'll take it http://www.freebsd.org/cgi/query-pr.cgi?pr=120968 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/120968: commit references a PR Date: Sun, 24 Feb 2008 11:03:59 +0000 (UTC) beech 2008-02-24 11:03:55 UTC FreeBSD ports repository Modified files: net/vnstat Makefile Log: - Fix install/uninstall of vnstat.conf and var/db/vnstat so data won't be overwritten. - Minor tweaks - Bump portrevision PR: ports/120968 Submitted by: Dennis Herrmann (maintainer) Revision Changes Path 1.3 +2 -2 ports/net/vnstat/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" State-Changed-From-To: open->closed State-Changed-By: beech State-Changed-When: Sun Feb 24 11:13:39 UTC 2008 State-Changed-Why: Committed, Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=120968 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/120968: commit references a PR Date: Sun, 24 Feb 2008 11:13:18 +0000 (UTC) beech 2008-02-24 11:13:09 UTC FreeBSD ports repository Modified files: net/vnstat pkg-plist net/vnstat/files patch-Makefile pkg-message.in Log: - Add files missed in last commit PR: ports/120968 Submitted by: Dennis Herrmann (maintainer) Revision Changes Path 1.2 +6 -6 ports/net/vnstat/files/patch-Makefile 1.2 +2 -1 ports/net/vnstat/files/pkg-message.in 1.2 +3 -2 ports/net/vnstat/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" >Unformatted: From nobody@FreeBSD.org Thu Mar 6 16:15:35 2008 Return-Path: Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1626A106566B for ; Thu, 6 Mar 2008 16:15:35 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id CF3588FC18 for ; Thu, 6 Mar 2008 16:15:34 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m26GCUmU034371 for ; Thu, 6 Mar 2008 16:12:30 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m26GCUCH034370; Thu, 6 Mar 2008 16:12:30 GMT (envelope-from nobody) Message-Id: <200803061612.m26GCUCH034370@www.freebsd.org> Date: Thu, 6 Mar 2008 16:12:30 GMT From: Dennis Herrmann To: freebsd-gnats-submit@FreeBSD.org Subject: Add search function into ncmpc X-Send-Pr-Version: www-3.1 X-GNATS-Notify: ports@mark.reidel.info ports@mark.reidel.info ports@mark.reidel.info >Number: 121432 >Category: ports >Synopsis: Add search function into audio/ncmpc >Confidential: no >Severity: non-critical >Priority: low >Responsible: tmclaugh >State: closed >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Mar 06 16:20:00 UTC 2008 >Closed-Date: Sat Aug 30 19:49:54 UTC 2008 >Last-Modified: Sat Aug 30 19:50:01 UTC 2008 >Originator: Dennis Herrmann >Release: FreeBSD 7.0-RELEASE >Organization: >Environment: FreeBSD contempt 7.0-RELEASE FreeBSD 7.0-RELEASE #2: Sun Mar 2 17:31:14 CET 2008 root@contempt:/usr/obj/usr/src/sys/CONTEMPT i386 >Description: I missed the search function into ncmpc (a music player daemon client), i implement it :) . I think it's a nice feature >How-To-Repeat: >Fix: --- Makefile.orig 2005-11-05 06:19:43.000000000 +0100 +++ Makefile 2008-03-06 16:58:33.000000000 +0100 @@ -21,7 +21,8 @@ LDFLAGS="-L${LOCALBASE}/lib" OPTIONS= NLS "Native language support" on \ - CLOCK_SCREEN "Enable clock screen" on + CLOCK_SCREEN "Enable clock screen" on \ + SEARCH_SCREEN "Enable search screen" on .include @@ -47,6 +48,10 @@ CONFIGURE_ARGS+=--enable-clock-screen .endif +.if !defined(WITHOUT_SEARCH_SCREEN) +CONFIGURE_ARGS+=--enable-search-screen +.endif + MAN1= ncmpc.1 do-install: >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-ports-bugs->gavin Responsible-Changed-By: edwin Responsible-Changed-When: Thu Mar 6 18:15:13 UTC 2008 Responsible-Changed-Why: Submitter has GNATS access (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=121432 State-Changed-From-To: open->feedback State-Changed-By: edwin State-Changed-When: Thu Mar 6 18:15:16 UTC 2008 State-Changed-Why: Awaiting maintainers feedback (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=121432 State-Changed-From-To: feedback->open State-Changed-By: gavin State-Changed-When: Thu Mar 6 18:19:30 UTC 2008 State-Changed-Why: Oops http://www.freebsd.org/cgi/query-pr.cgi?pr=121432 Responsible-Changed-From-To: gavin->freebsd-bugs Responsible-Changed-By: gavin Responsible-Changed-When: Thu Mar 6 18:20:38 UTC 2008 Responsible-Changed-Why: Oops http://www.freebsd.org/cgi/query-pr.cgi?pr=121432 State-Changed-From-To: open->feedback State-Changed-By: edwin State-Changed-When: Thu Mar 6 18:22:14 UTC 2008 State-Changed-Why: Awaiting maintainers feedback (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=121432 Responsible-Changed-From-To: freebsd-bugs->freebsd-ports-bugs Responsible-Changed-By: vwe Responsible-Changed-When: Thu Mar 6 22:17:35 UTC 2008 Responsible-Changed-Why: correct assignment http://www.freebsd.org/cgi/query-pr.cgi?pr=121432 Responsible-Changed-From-To: freebsd-ports-bugs->tmclaugh Responsible-Changed-By: tmclaugh Responsible-Changed-When: Fri Apr 18 03:16:57 UTC 2008 Responsible-Changed-Why: Just curious, why is this and the CLOCK_SCREEN an option since they don't bring in any extra dependencies. Do these options alter the behavior of the program in a way the user can't disable? If not, can we do away with the OPTIONS? http://www.freebsd.org/cgi/query-pr.cgi?pr=121432 From: Henrik Friedrichsen To: bug-followup@freebsd.org Cc: Subject: Re: ports/121432: Add search function into audio/ncmpc Date: Sat, 23 Aug 2008 00:13:50 +0200 I'd like to see this patch being committed too. It's just a small change in the Makefile .. State-Changed-From-To: feedback->closed State-Changed-By: tmclaugh State-Changed-When: Sat Aug 30 19:49:28 UTC 2008 State-Changed-Why: Patch committed, thanks. http://www.freebsd.org/cgi/query-pr.cgi?pr=121432 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/121432: commit references a PR Date: Sat, 30 Aug 2008 19:49:23 +0000 (UTC) tmclaugh 2008-08-30 19:49:14 UTC FreeBSD ports repository Modified files: audio/ncmpc Makefile Log: - Add SEARCH_SCREEN OPTION defaulting to on. PR: 121432 Submitted by: Dennis Herrmann Approved by: maintainer timeout Revision Changes Path 1.11 +6 -1 ports/audio/ncmpc/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" >Unformatted: From nobody@FreeBSD.org Thu Mar 20 23:31:11 2008 Return-Path: Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0192E10657BA for ; Thu, 20 Mar 2008 23:31:11 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id B40D18FC1E for ; Thu, 20 Mar 2008 23:31:10 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m2KNV7OU016437 for ; Thu, 20 Mar 2008 23:31:07 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m2KNV6fj016435; Thu, 20 Mar 2008 23:31:07 GMT (envelope-from nobody) Message-Id: <200803202331.m2KNV6fj016435@www.freebsd.org> Date: Thu, 20 Mar 2008 23:31:07 GMT From: Dennis Herrmann To: freebsd-gnats-submit@FreeBSD.org Subject: New Port: Brute-force dictionary attack against WPA-PSK. X-Send-Pr-Version: www-3.1 X-GNATS-Notify: >Number: 121931 >Category: ports >Synopsis: New Port: net-mgmt/cowpatty - Brute-force dictionary attack against WPA-PSK. >Confidential: no >Severity: non-critical >Priority: low >Responsible: rafan >State: closed >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Mar 20 23:40:03 UTC 2008 >Closed-Date: Sat Mar 22 12:08:00 UTC 2008 >Last-Modified: Sat Mar 22 12:10:07 UTC 2008 >Originator: Dennis Herrmann >Release: FreeBSD 7.0-RELEASE >Organization: >Environment: FreeBSD contempt 7.0-RELEASE FreeBSD 7.0-RELEASE #2: Sun Mar 2 17:31:14 CET 2008 root@contempt:/usr/obj/usr/src/sys/CONTEMPT i386 >Description: coWPAtty is designed to audit the security of pre-shared keys (PSK) selected in WiFi Protected Access (WPA) networks. >How-To-Repeat: >Fix: Patch attached with submission follows: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # cowpatty # cowpatty/distinfo # cowpatty/Makefile # cowpatty/files # cowpatty/files/patch-Makefile # cowpatty/files/pkg-message.in # cowpatty/pkg-descr # cowpatty/pkg-plist # echo c - cowpatty mkdir -p cowpatty > /dev/null 2>&1 echo x - cowpatty/distinfo sed 's/^X//' >cowpatty/distinfo << 'END-of-cowpatty/distinfo' XMD5 (cowpatty-4.3.tgz) = deccac0763a05ef7014107d347bf9190 XSHA256 (cowpatty-4.3.tgz) = b82154c9183fed3c26226c124f5e50ef38adaaafc84c5a13d9256b1ebd489bca XSIZE (cowpatty-4.3.tgz) = 103720 END-of-cowpatty/distinfo echo x - cowpatty/Makefile sed 's/^X//' >cowpatty/Makefile << 'END-of-cowpatty/Makefile' X# New ports collection makefile for: cowpatty X# Date created: March 20, 2008 X# Whom: Dennis Herrmann X# X# $FreeBSD:$ X# X XPORTNAME= cowpatty XPORTVERSION= 4.3 XPORTREVISION= 1 XCATEGORIES= net-mgmt XMASTER_SITES= http://www.willhackforsushi.com/code/cowpatty/4.3/ \ X http://mcx2.org/files/ XEXTRACT_SUFX= .tgz X XMAINTAINER= adox@mcx2.org XCOMMENT= Brute-force dictionary attack against WPA-PSK X XBUILD_DEPENDS= openssl:${PORTSDIR}/security/openssl-stable X XPORTDOCS= FAQ README XSUB_FILES= pkg-message X Xpost-install: X.if !defined(NOPORTDOCS) X @${ECHO_MSG} "Installing additional documentation to ${DOCSDIR}" X @${MKDIR} ${DOCSDIR} X @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} X.endif X X @${ECHO_MSG} "" X @${CAT} ${PKGMESSAGE} X @${ECHO_MSG} "" X X.include END-of-cowpatty/Makefile echo c - cowpatty/files mkdir -p cowpatty/files > /dev/null 2>&1 echo x - cowpatty/files/patch-Makefile sed 's/^X//' >cowpatty/files/patch-Makefile << 'END-of-cowpatty/files/patch-Makefile' X--- Makefile.orig 2008-03-20 21:36:01.000000000 +0100 X+++ Makefile 2008-03-20 21:40:39.000000000 +0100 X@@ -1,21 +1,11 @@ X-################################## X-# Well, I may be doing stupid things with make X-# OK, it was Makefile stupid'ness X-# I don't really understand what the hell I am doing with Make, I'm X-# just copying other files and seeing what works. X-# heh X-# i think thats all anyone does X-# make is a twisted beast X-################################## X LDLIBS = -lpcap X CFLAGS = -pipe -Wall -DOPENSSL X CFLAGS += -O2 X LDLIBS += -lcrypto X CFLAGS += -g3 -ggdb X-#CFLAGS += -static X PROGOBJ = md5.o sha1.o utils.o cowpatty.o genpmk.o X PROG = cowpatty genpmk X-BINDIR = /usr/local/bin X+PREFIX?= /usr/local X X all: $(PROGOBJ) $(PROG) X X@@ -44,8 +34,5 @@ X @ls -l $(PROG) X X install: all X- install -d $(DESTDIR)$(BINDIR) X- install -m 755 $(PROG) $(BINDIR)$(DESTDIR) X- X-love: X- @echo "Not right now, I have a headache." X+ install -d $(DESTDIR)$(PREFIX)/bin X+ install -m 755 $(PROG) $(PREFIX)/bin END-of-cowpatty/files/patch-Makefile echo x - cowpatty/files/pkg-message.in sed 's/^X//' >cowpatty/files/pkg-message.in << 'END-of-cowpatty/files/pkg-message.in' X########################################################################### Xcowpatty has been installed X XIf you have questions read %%DOCSDIR%%/FAQ XFor more information about coWPAtty visit: X Xhttp://www.willhackforsushi.com/Cowpatty.html X########################################################################### END-of-cowpatty/files/pkg-message.in echo x - cowpatty/pkg-descr sed 's/^X//' >cowpatty/pkg-descr << 'END-of-cowpatty/pkg-descr' XcoWPAtty is designed to audit the security of pre-shared keys X(PSK) selected in WiFi Protected Access (WPA) networks. X XWWW: http://www.willhackforsushi.com/Cowpatty.html END-of-cowpatty/pkg-descr echo x - cowpatty/pkg-plist sed 's/^X//' >cowpatty/pkg-plist << 'END-of-cowpatty/pkg-plist' Xbin/cowpatty Xbin/genpmk END-of-cowpatty/pkg-plist exit >Release-Note: >Audit-Trail: From: Edwin Groothuis To: Dennis Herrmann Cc: freebsd-gnats-submit@FreeBSD.org Subject: Re: ports/121931: New Port: Brute-force dictionary attack against WPA-PSK. Date: Fri, 21 Mar 2008 13:02:14 +1100 On Thu, Mar 20, 2008 at 11:31:07PM +0000, Dennis Herrmann wrote: > XCATEGORIES= net-mgmt > XCOMMENT= Brute-force dictionary attack against WPA-PSK Wouldn't security/ or net/ not be a better category? Edwin -- Edwin Groothuis | Personal website: http://www.mavetju.org edwin@mavetju.org | Weblog: http://www.mavetju.org/weblog/ Responsible-Changed-From-To: freebsd-ports-bugs->rafan Responsible-Changed-By: rafan Responsible-Changed-When: Sat Mar 22 05:05:07 UTC 2008 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=121931 State-Changed-From-To: open->closed State-Changed-By: rafan State-Changed-When: Sat Mar 22 12:07:57 UTC 2008 State-Changed-Why: New port added. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=121931 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/121931: commit references a PR Date: Sat, 22 Mar 2008 12:06:03 +0000 (UTC) rafan 2008-03-22 12:05:59 UTC FreeBSD ports repository Modified files: net-mgmt Makefile Added files: net-mgmt/cowpatty Makefile distinfo pkg-descr net-mgmt/cowpatty/files patch-Makefile pkg-message.in Log: coWPAtty is designed to audit the security of pre-shared keys (PSK) selected in WiFi Protected Access (WPA) networks. WWW: http://www.willhackforsushi.com/Cowpatty.html PR: ports/121931 Submitted by: Dennis Herrmann Revision Changes Path 1.153 +1 -0 ports/net-mgmt/Makefile 1.1 +36 -0 ports/net-mgmt/cowpatty/Makefile (new) 1.1 +3 -0 ports/net-mgmt/cowpatty/distinfo (new) 1.1 +36 -0 ports/net-mgmt/cowpatty/files/patch-Makefile (new) 1.1 +8 -0 ports/net-mgmt/cowpatty/files/pkg-message.in (new) 1.1 +4 -0 ports/net-mgmt/cowpatty/pkg-descr (new) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" >Unformatted: From nobody@FreeBSD.org Fri Jun 20 15:42:20 2008 Return-Path: Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED6A7106566C for ; Fri, 20 Jun 2008 15:42:19 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id BAAAA8FC2A for ; Fri, 20 Jun 2008 15:42:19 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m5KFgIvA004385 for ; Fri, 20 Jun 2008 15:42:18 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m5KFgIt3004382; Fri, 20 Jun 2008 15:42:18 GMT (envelope-from nobody) Message-Id: <200806201542.m5KFgIt3004382@www.freebsd.org> Date: Fri, 20 Jun 2008 15:42:18 GMT From: Dennis Herrmann To: freebsd-gnats-submit@FreeBSD.org Subject: Cronline fix in vnstat X-Send-Pr-Version: www-3.1 X-GNATS-Notify: >Number: 124789 >Category: ports >Synopsis: Cronline fix in net/vnstat >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: closed >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jun 20 15:50:01 UTC 2008 >Closed-Date: Sat Jun 21 00:57:12 UTC 2008 >Last-Modified: Sat Jun 21 01:00:13 UTC 2008 >Originator: Dennis Herrmann >Release: FreeBSD 7.0-RELEASE >Organization: >Environment: FreeBSD contempt 7.0-RELEASE FreeBSD 7.0-RELEASE #4: Mon Mar 24 11:53:38 CET 2008 root@contempt:/usr/obj/usr/src/sys/MCX i386 >Description: Dan Pelleg found a bug in the cron line alias vnstat-cron ,he writed me an email and send me a patch file i checked it and fix few things. Accessorily i add two more Mirrors. The crontab entry is run as "root". So the test may fail, because the number of files is greater than one. Here an example by Dan: mail2# whoami root mail2# ls -l /variable/db/vnstat/ total 20 -rw-r--r-- 1 root wheel 2272 Apr 24 17:50 .sk0 -rw-r--r-- 1 root wheel 2272 Jun 15 11:25 .tun0 -rw-r--r-- 1 root wheel 2272 Apr 24 17:50 .xl0 -rw-r--r-- 1 root wheel 2272 Apr 24 17:50 .xl1 -rw-r--r-- 1 root wheel 2272 Jun 15 11:30 tun0 mail2# su ftp1 -c "ls -l /variable/db/vnstat" total 4 -rw-r--r-- 1 root wheel 2272 Jun 15 11:30 tun0 Therefore you need to inhibit the listing of the dot-files. This is done with the "-I" switch. Dan Pelleg writed Teemu Toivola,the developer of vnstat, a mail .Teemu ratify the bug "I did some testing with both FreeBSD and Linux. You are correct that the cron line in its current form doesn't seem behave in all situations as the user might expect. In the normal "after install" situation when that directory doesn't contain any files, that cron entry will work correctly since "ls dbdir" will return 0. It also works correctly when there's at least one database to work with. However, now (after I added the database backup feature) the problem seems to be that since database backups are named according to the interface name starting with a dot, it might not be clear enough for the user that both the database file AND the backup file needs to be removed if the aim is to disable monitoring of the last monitored interface. Leaving those backups will make the cron line fail in its current form if the directory looks something like this: mail2# ls -l /variable/db/vnstat/ total 20 -rw-r--r-- 1 root wheel 2272 Apr 24 17:50 .sk0 -rw-r--r-- 1 root wheel 2272 Jun 15 11:25 .tun0 -rw-r--r-- 1 root wheel 2272 Apr 24 17:50 .xl0 -rw-r--r-- 1 root wheel 2272 Apr 24 17:50 .xl1 So yes, that cron line should now also include that -I and the documentation for disabling the monitoring of interfaces updated. However, it seems that the need of -I is only *BSD specific since I can't reproduce that behaviour on Linux and the -I option has a difference function (in Linux): -I, --ignore=PATTERN do not list implied entries matching shell PATTERN Without a pattern, ls either gives an error or the file listing of the current directory depending of which shell is used." by Teemu Toivola >How-To-Repeat: >Fix: Patch attached with submission follows: --- Makefile.org 2008-02-24 12:03:55.000000000 +0100 +++ Makefile 2008-06-20 17:06:54.000000000 +0200 @@ -10,7 +10,9 @@ PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://humdi.net/vnstat/ \ - http://mcx2.org/files/ + http://mirror.mcx2.org/ \ + http://ftp.uwsg.indiana.edu/FreeBSD/distfiles/ \ + ftp://ftp.jpix.ad.jp/pub/FreeBSD/ports/distfiles/ DISTNAME= ${PORTNAME}-${PORTVERSION}_bsd MAINTAINER= adox@mcx2.org @@ -25,7 +27,7 @@ post-extract: @cd ${WRKSRC} && ${CP} cron/vnstat vnstat-cron @${REINPLACE_CMD} -e 's|/usr/bin|/usr/local/bin|g' \ - -e 's|/var/lib|/var/db|g' ${WRKSRC}/vnstat-cron + -e 's|ls /var/lib|ls -l /var/db|g' ${WRKSRC}/vnstat-cron post-install: .if !defined(NOPORTDOCS) >Release-Note: >Audit-Trail: Class-Changed-From-To: sw-bug->maintainer-update Class-Changed-By: linimon Class-Changed-When: Fri Jun 20 22:25:43 UTC 2008 Class-Changed-Why: Change class. http://www.freebsd.org/cgi/query-pr.cgi?pr=124789 State-Changed-From-To: open->closed State-Changed-By: miwi State-Changed-When: Sat Jun 21 00:57:11 UTC 2008 State-Changed-Why: Committed. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=124789 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/124789: commit references a PR Date: Sat, 21 Jun 2008 00:57:06 +0000 (UTC) miwi 2008-06-21 00:57:01 UTC FreeBSD ports repository Modified files: net/vnstat Makefile Log: - Fix cron handling - Add backup mirrors - Bump PORTREVISION PR: 124789 Submitted by: Dennis Herrmann (maintainer) Revision Changes Path 1.4 +5 -3 ports/net/vnstat/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" >Unformatted: From nobody@FreeBSD.org Tue Aug 26 19:21:32 2008 Return-Path: Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DF6E106564A for ; Tue, 26 Aug 2008 19:21:32 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 397618FC1B for ; Tue, 26 Aug 2008 19:21:32 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QJLVh7024042 for ; Tue, 26 Aug 2008 19:21:31 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m7QJLVQh024041; Tue, 26 Aug 2008 19:21:31 GMT (envelope-from nobody) Message-Id: <200808261921.m7QJLVQh024041@www.freebsd.org> Date: Tue, 26 Aug 2008 19:21:31 GMT From: Dennis Herrmann To: freebsd-gnats-submit@FreeBSD.org Subject: New Port