[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6a9edfb6e6e5b544759aa86cf99df74fe12a578e)

Vlad Glagolev scm at sourcemage.org
Sat Dec 18 10:31:04 EST 2010


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 ChangeLog                               |    7 ++++++-
 database/mongodb/HISTORY                |    3 +++
 database/mongodb/init.d/mongodb         |    4 ++--
 net/flow-tools/BUILD                    |    3 +++
 net/flow-tools/DEPENDS                  |   16 ++++++++++++++++
 net/flow-tools/DETAILS                  |   19 +++++++++++++++++++
 net/flow-tools/HISTORY                  |    3 +++
 net/flow-tools/INSTALL                  |    6 ++++++
 net/flow-tools/init.d/flow-capture      |   11 +++++++++++
 net/flow-tools/init.d/flow-capture.conf |    3 +++
 net/net-snmp/HISTORY                    |    3 +++
 net/net-snmp/init.d/snmpd               |    4 ++--
 12 files changed, 77 insertions(+), 5 deletions(-)

New commits:
commit 6a9edfb6e6e5b544759aa86cf99df74fe12a578e
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    in wordwrap we trust

commit b972c4c7cf19223dabe572c4d43e3f3f53692de8
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    flow-tools: new spell, library and tools to collect and store NetFlow data

commit daa432b4de855f781715850ae60b78f87f287820
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    mongodb: use PIDFILE var in the init script

commit 79eec233eb6d10cc9bb12f9fc2ea3fea044bba9e
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    snmpd: use PIDFILE var in the init script

diff --git a/ChangeLog b/ChangeLog
index 7ce97ef..d77176f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
+2010-12-18 Vlad Glagolev <stealth at sourcemage.org>
+	* net/flow-tools: new spell, library and tools to collect and store
+	  NetFlow data
+
 2010-12-14 Ismael Luceno <ismael at sourcemage.org>
-	* devel/gambit: new spell, complete, portable, efficient and reliable implementation of the Scheme programming language
+	* devel/gambit: new spell, complete, portable, efficient and reliable
+	  implementation of the Scheme programming language
 
 2010-12-11 Thomas Orgis <sobukus at sourcemage.org>
 	* audio-creation/rakarrack: new spell, guitar amp & effects
diff --git a/database/mongodb/HISTORY b/database/mongodb/HISTORY
index c9c78a7..2e92c79 100644
--- a/database/mongodb/HISTORY
+++ b/database/mongodb/HISTORY
@@ -1,3 +1,6 @@
+2010-12-18 Vlad Glagolev <stealth at sourcemage.org>
+	* init.d/mongodb: use PIDFILE
+
 2010-12-07 Vlad Glagolev <stealth at sourcemage.org>
 	* {PRE_}BUILD, DEPENDS, DETAILS, INSTALL, init.d/mongodb{.conf},
 	  scons.patch: spell created
diff --git a/database/mongodb/init.d/mongodb b/database/mongodb/init.d/mongodb
index 635dd6e..a4c4457 100755
--- a/database/mongodb/init.d/mongodb
+++ b/database/mongodb/init.d/mongodb
@@ -3,9 +3,9 @@
 . /etc/sysconfig/mongodb
 
 PROGRAM=/usr/bin/mongod
-ARGS="-f /etc/mongodb.conf --pidfilepath /var/run/mongod/mongod.pid --fork $MONGOD_ARGS"
-RUNLEVEL=3
 PIDFILE=/var/run/mongod/mongod.pid
+ARGS="-f /etc/mongodb.conf --pidfilepath $PIDFILE --fork $MONGOD_ARGS"
+RUNLEVEL=3
 NEEDS="+network"
 
 start() {
diff --git a/net/flow-tools/BUILD b/net/flow-tools/BUILD
new file mode 100755
index 0000000..1446713
--- /dev/null
+++ b/net/flow-tools/BUILD
@@ -0,0 +1,3 @@
+OPTS="--sysconfdir=$INSTALL_ROOT/etc/flow-tools $OPTS" &&
+
+default_build
diff --git a/net/flow-tools/DEPENDS b/net/flow-tools/DEPENDS
new file mode 100755
index 0000000..166c221
--- /dev/null
+++ b/net/flow-tools/DEPENDS
@@ -0,0 +1,16 @@
+depends zlib &&
+
+optional_depends openssl \
+                 "--with-openssl" \
+                 "--without-openssl" \
+                 "for OpenSSL support" &&
+
+optional_depends MYSQL \
+                 "--with-mysql" \
+                 "--without-mysql" \
+                 "for MySQL support" &&
+
+optional_depends postgresql \
+                 "--with-postgresql" \
+                 "--without-postgresql" \
+                 "to use PostgreSQL library"
diff --git a/net/flow-tools/DETAILS b/net/flow-tools/DETAILS
new file mode 100755
index 0000000..46937b2
--- /dev/null
+++ b/net/flow-tools/DETAILS
@@ -0,0 +1,19 @@
+           SPELL=flow-tools
+         VERSION=0.68.5.1
+          SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://flow-tools.googlecode.com/files/$SOURCE
+     SOURCE_HASH=sha512:ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+        WEB_SITE=http://code.google.com/p/flow-tools/
+      LICENSE[0]=BSD
+         ENTERED=20101218
+           SHORT="library and tools to collect and store NetFlow data"
+cat << EOF
+flow-tools is library and a collection of programs used to collect, send,
+process, and generate reports from NetFlow data. The tools can be used together
+on a single server or distributed to multiple servers for large deployments.
+
+The flow-tools library provides an API for development of custom applications
+for NetFlow export versions 1,5,6 and the 14 currently defined version 8
+subversions.
+EOF
diff --git a/net/flow-tools/HISTORY b/net/flow-tools/HISTORY
new file mode 100644
index 0000000..6392894
--- /dev/null
+++ b/net/flow-tools/HISTORY
@@ -0,0 +1,3 @@
+2010-12-18 Vlad Glagolev <stealth at sourcemage.org>
+	* BUILD, DEPENDS, DETAILS, INSTALL, init.d/flow-capture{,.conf}:
+	  spell created
diff --git a/net/flow-tools/INSTALL b/net/flow-tools/INSTALL
new file mode 100755
index 0000000..791f291
--- /dev/null
+++ b/net/flow-tools/INSTALL
@@ -0,0 +1,6 @@
+default_install &&
+
+if [[ $INIT_INSTALLED ]]; then
+  install_config_file "$SPELL_DIRECTORY/init.d/flow-capture.conf" \
+                      "$INSTALL_ROOT/etc/sysconfig/flow-capture"
+fi
diff --git a/net/flow-tools/init.d/flow-capture b/net/flow-tools/init.d/flow-capture
new file mode 100755
index 0000000..47784f5
--- /dev/null
+++ b/net/flow-tools/init.d/flow-capture
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+. /etc/sysconfig/flow-capture
+
+PROGRAM=/usr/bin/flow-capture
+PIDFILE=/var/run/flow-capture.pid
+ARGS="-p $PIDFILE $FLOW_CAPTURE_ARGS"
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
diff --git a/net/flow-tools/init.d/flow-capture.conf b/net/flow-tools/init.d/flow-capture.conf
new file mode 100644
index 0000000..e02c824
--- /dev/null
+++ b/net/flow-tools/init.d/flow-capture.conf
@@ -0,0 +1,3 @@
+# For the arguments and description see flow-capture(1)
+
+FLOW_CAPTURE_ARGS="127.0.0.1"
diff --git a/net/net-snmp/HISTORY b/net/net-snmp/HISTORY
index c77cabb..5d8777f 100644
--- a/net/net-snmp/HISTORY
+++ b/net/net-snmp/HISTORY
@@ -1,3 +1,6 @@
+2010-12-18 Vlad Glagolev <stealth at sourcemage.org>
+	* init.d/snmpd: use PIDFILE
+
 2010-11-22 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: PATCHLEVEL=1
 	* PRE_BUILD: apply the patch
diff --git a/net/net-snmp/init.d/snmpd b/net/net-snmp/init.d/snmpd
index 1782330..c490996 100755
--- a/net/net-snmp/init.d/snmpd
+++ b/net/net-snmp/init.d/snmpd
@@ -3,9 +3,9 @@
 . /etc/sysconfig/snmpd
 
 PROGRAM=/usr/sbin/snmpd
-ARGS="-p /var/run/snmpd.pid $SNMPD_ARGS"
-RUNLEVEL=3
 PIDFILE=/var/run/snmpd.pid
+ARGS="-p $PIDFILE $SNMPD_ARGS"
+RUNLEVEL=3
 NEEDS="+network"
 
 . /etc/init.d/smgl_init



More information about the SM-Commit mailing list