Update of /cvsroot/leaf/src/The_UnNamed_One/apps/ulogd
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15949/apps/ulogd
Added Files:
buildtool.cfg buildtool.mk ulogd-1.24.tar.bz2
ulogd-configure.patch ulogd-configure_2.patch ulogd-make.patch
ulogd.conf ulogd.init ulogd_daily ulogd_weekly
Log Message:
initial import
--- NEW FILE: ulogd-configure.patch ---
diff -urN ulogd-1.24.orig/configure.in ulogd-1.24/configure.in
--- ulogd-1.24.orig/configure.in 2005-11-25 20:58:27.000000000 +0100
+++ ulogd-1.24/configure.in 2006-02-15 21:54:48.000000000 +0100
@@ -83,7 +83,7 @@
AC_MSG_CHECKING(for mysql_real_escape_string support)
- MYSQL_FUNCTION_TEST=`strings ${MYSQLLIBS}/libmysqlclient.so | grep
mysql_real_escape_string`
+ MYSQL_FUNCTION_TEST=`strings ${dir}/lib/libmysqlclient.so | grep
mysql_real_escape_string`
if test "x$MYSQL_FUNCTION_TEST" = x
then
--- NEW FILE: ulogd-configure_2.patch ---
diff -urN ulogd-1.24.orig/configure ulogd-1.24/configure
--- ulogd-1.24.orig/configure 2006-01-25 12:15:22.000000000 +0100
+++ ulogd-1.24/configure 2008-02-17 15:28:41.000000000 +0100
@@ -1696,239 +1696,9 @@
DATABASE_DRIVERS=""
-# Check whether --with-mysql or --without-mysql was given.
-if test "${with_mysql+set}" = set; then
- withval="$with_mysql"
-
-if test $withval != yes
-then
- dir=$withval
-else
- dir="/usr/local"
-fi
-mysqldir=""
-echo $ac_n "checking for MySQL files""... $ac_c" 1>&6
-echo "configure:1712: checking for MySQL files" >&5
-for d in $dir/bin /usr/bin /usr/local/bin /usr/local/mysql/bin /opt/mysql/bin
/opt/packages/mysql/bin
-do
- if test -f $d/mysql_config
- then
- echo "$ac_t""found mysql_config in $d" 1>&6
- mysqldir=$d
- break
- fi
-done
-
-if test x$mysqldir = x
-then
echo "configure: warning: MySQL backend not used" 1>&2
-else
- cat >> confdefs.h <<\EOF
-#define HAVE_MYSQL 1
-EOF
-
- MYSQLINCLUDES=`$d/mysql_config --include`
- MYSQLLIBS=`$d/mysql_config --libs`
-
- DATABASE_DIR="${DATABASE_DIR} mysql"
-
- MYSQL_LIB="${DATABASE_LIB} ${MYSQLLIBS} "
- # no change to DATABASE_LIB_DIR, since --libs already includes -L
-
- DATABASE_DRIVERS="${DATABASE_DRIVERS} ../mysql/mysql_driver.o "
-
- DB_DEF="${DB_DEF} -DHAVE_MYSQL "
-
-
-
-
-
-
- echo $ac_n "checking for mysql_real_escape_string support""... $ac_c"
1>&6
-echo "configure:1749: checking for mysql_real_escape_string support" >&5
-
- MYSQL_FUNCTION_TEST=`strings ${MYSQLLIBS}/libmysqlclient.so | grep
mysql_real_escape_string`
-
- if test "x$MYSQL_FUNCTION_TEST" = x
- then
- EXTRA_MYSQL_DEF="-DOLD_MYSQL=1 "
- echo "$ac_t""found old MySQL" 1>&6
- else
- echo "$ac_t""found new MySQL" 1>&6
- fi
-
-fi
-
-fi
-
-
-
-
-# Check whether --with-mysql-log-ip-as-string or
--without-mysql-log-ip-as-string was given.
-if test "${with_mysql_log_ip_as_string+set}" = set; then
- withval="$with_mysql_log_ip_as_string"
-
- EXTRA_MYSQL_DEF="${EXTRA_MYSQL_DEF} -DIP_AS_STRING=1"
- echo "configure: warning: the use of --with-mysql-log-ip-as-string is
discouraged" 1>&2
-
-fi
-
-
-
-# Check whether --with-pgsql or --without-pgsql was given.
-if test "${with_pgsql+set}" = set; then
- withval="$with_pgsql"
-
-if test $withval != yes
-then
- dir=$withval
-else
- dir="/usr/local"
-fi
-pgsqldir=""
-echo $ac_n "checking for PGSQL files""... $ac_c" 1>&6
-echo "configure:1791: checking for PGSQL files" >&5
-for d in $dir/bin /usr/bin /usr/local/bin /usr/local/pgsql/bin /opt/pgsql/bin
/opt/packages/pgsql/bin
-do
- if test -x $d/pg_config
- then
- echo "$ac_t""found pg_config in $d" 1>&6
- pgsqldir=$d
- break
- fi
-done
-
-if test x$pgsqldir = x
-then
echo "configure: warning: PGSQL backend not used" 1>&2
-else
- cat >> confdefs.h <<\EOF
-#define HAVE_PGSQL 1
-EOF
-
- PGSQLINCLUDES=`$pgsqldir/pg_config --includedir`
- PGSQLLIBS=`$pgsqldir/pg_config --libdir`
-
- DATABASE_DIR="${DATABASE_DIR} pgsql"
- PGSQL_LIB="${DATABASE_LIB} -lpq "
-
- DATABASE_LIB_DIR="${DATABASE_LIB_DIR} -L${PGSQLLIBS} "
- DB_DEF="${DB_DEF} -DHAVE_PGSQL "
-
-
-
-
-fi
-
-fi
-
-
-
-# Check whether --with-pgsql-log-ip-as-string or
--without-pgsql-log-ip-as-string was given.
-if test "${with_pgsql_log_ip_as_string+set}" = set; then
- withval="$with_pgsql_log_ip_as_string"
-
- EXTRA_PGSQL_DEF="-DIP_AS_STRING=1"
-
-fi
-
-
-
-# Check whether --with-sqlite3 or --without-sqlite3 was given.
-if test "${with_sqlite3+set}" = set; then
- withval="$with_sqlite3"
-
-if test $withval != yes
-then
- dir=$withval
-else
- dir="/usr/local"
-fi
-mysqldir=""
-echo $ac_n "checking for sqlite3 files""... $ac_c" 1>&6
-echo "configure:1850: checking for sqlite3 files" >&5
-for d in $dir /usr /usr/local /usr/local/sqlite3
-do
- if test -f $d/lib/sqlite3/libsqlite3.so
- then
- echo "$ac_t""found sqlite3 in $d" 1>&6
- sqlite3dir=$d
- sqlite3dir_suffix=/sqlite3
- break
- elif test -f $d/lib64/sqlite3/libsqlite3.so
- then
- echo "$ac_t""found sqlite3 in $d" 1>&6
- sqlite3dir=$d
- sqlite3dir_suffix=/sqlite3
- break
- elif test -f $d/lib/libsqlite3.so
- then
- echo "$ac_t""found sqlite in $d" 1>&6
- sqlite3dir=$d
- sqlite3dir_suffix=
- break
- elif test -f $d/lib64/libsqlite3.so
- then
- echo "$ac_t""found sqlite in $d" 1>&6
- sqlite3dir=$d
- sqlite3dir_suffix=
- break
- fi
-done
-
-if test x$sqlite3dir = x
-then
echo "configure: warning: sqlite3 backend not used" 1>&2
-else
- cat >> confdefs.h <<\EOF
-#define HAVE_SQLITE3 1
-EOF
-
- SQLITE3INCLUDES=${sqlite3dir}/include${sqlite3dir_suffix}
- SQLITE3LIBS=${sqlite3dir}/lib${sqlite3dir_suffix}
-
- DATABASE_DIR="${DATABASE_DIR} sqlite3"
-
- SQLITE3_LIB="${DATABASE_LIB} -lsqlite3 "
- DATABASE_LIB_DIR="${DATABASE_LIB_DIR} -L${SQLITE3LIBS} "
-
-
- DB_DEF="${DB_DEF} -DHAVE_SQLITE3 "
-
-
-
-
-
-fi
-
-fi
-
-
-
-
-# Check whether --with-sqlite3-log-ip-as-string or
--without-sqlite3-log-ip-as-string was given.
-if test "${with_sqlite3_log_ip_as_string+set}" = set; then
- withval="$with_sqlite3_log_ip_as_string"
-
- EXTRA_SQLITE3_DEF="${EXTRA_SQLITE3_DEF} -DIP_AS_STRING=1"
- echo "configure: warning: the use of --with-sqlite3-log-ip-as-string is
discouraged" 1>&2
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
if test x$mysqldir != x; then
HAVE_MYSQL_TRUE=
--- NEW FILE: ulogd-make.patch ---
diff -urN ulogd-1.24.orig/Rules.make.in ulogd-1.24/Rules.make.in
--- ulogd-1.24.orig/Rules.make.in 2005-11-25 20:58:27.000000000 +0100
+++ ulogd-1.24/Rules.make.in 2006-02-07 22:40:46.000000000 +0100
@@ -22,7 +22,7 @@
CFLAGS+=-DULOGD_CONFIGFILE=\"$(ULOGD_CONFIGFILE)\"
# doesn't work for subdirs
#CFLAGS+=$(INCIPULOG) $(INCCONFFILE)
-CFLAGS+=-I/lib/modules/`uname -r`/build/include
+#CFLAGS+=-I/lib/modules/`uname -r`/build/include
[EMAIL PROTECTED]@
#CFLAGS+=-g -DDEBUG -DDEBUG_MYSQL -DDEBUG_PGSQL
--- NEW FILE: ulogd_weekly ---
#!/bin/sh
# Save weekly LOGDEPTH versions of ulogd status file
LOGDEPTH=4
# status file name
LOGFILE=/var/log/ulogd.log
if [ -f $LOGFILE ]; then
savelog -g wheel -m 640 -u root -c $LOGDEPTH $LOGFILE >/dev/null
/etc/init.d/ulogd reload
fi
--- NEW FILE: ulogd-1.24.tar.bz2 ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ulogd.conf ---
# Example configuration for ulogd
# $Id: ulogd.conf,v 1.1 2008/03/01 16:23:48 hejl Exp $
#
[global]
######################################################################
# GLOBAL OPTIONS
######################################################################
# netlink multicast group (the same as the iptables --ulog-nlgroup param)
nlgroup=1
# logfile for status messages
logfile="/var/log/ulogd.log"
# loglevel: debug(1), info(3), notice(5), error(7) or fatal(8)
loglevel=1
# socket receive buffer size (should be at least the size of the
# in-kernel buffer (ipt_ULOG.o 'nlbufsiz' parameter)
rmem=131071
# libipulog/ulogd receive buffer size, should be > rmem
bufsize=150000
######################################################################
# PLUGIN OPTIONS
######################################################################
# We have to configure and load all the plugins we want to use
# general rules:
# 1. load the plugins _first_ from the global section
# 2. options for each plugin in seperate section below
#
# ulogd_BASE.so - interpreter plugin for basic IPv4 header fields
# you will always need this
plugin="/usr/lib/ulogd/ulogd_BASE.so"
# output plugins.
plugin="/usr/lib/ulogd/ulogd_LOGEMU.so"
#plugin="/usr/lib/ulogd/ulogd_OPRINT.so"
#plugin="/usr/lib/ulogd/ulogd_MYSQL.so"
#plugin="/usr/lib/ulogd/ulogd_PGSQL.so"
#plugin="/usr/lib/ulogd/ulogd_SQLITE3.so"
#plugin="/usr/lib/ulogd/ulogd_PCAP.so"
[LOGEMU]
file="/var/log/shorewall.log"
sync=1
[OPRINT]
file="/var/log/ulogd.pktlog"
[MYSQL]
table="ulog"
pass="changeme"
user="laforge"
db="ulogd"
host="localhost"
[PGSQL]
table="ulog"
schema="public"
pass="changeme"
user="postgres"
db="ulogd"
host="localhost"
[SQLITE3]
table="ulog"
db="/path/to/sqlite/db"
buffer=200
[PCAP]
file="/var/log/ulogd.pcap"
sync=1
--- NEW FILE: ulogd.init ---
#!/bin/sh
#
# ulogd ulogd init.d script. Modified by Daniel Stone & J. Nilo
#
RCDLINKS="0,K22 1,K22 2,S18 3,S18 4,S18 5,S18 6,K22"
PATH=/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/ulogd
NAME=ulogd
DESC=ulogd
test -f $DAEMON || exit 0
set -e
case "$1" in
start)
echo -n "Starting $DESC: "
start-stop-daemon --quiet --start --exec $DAEMON -- -d > /dev/null 2>&1
echo "$NAME."
;;
stop)
echo -n "Stopping $DESC: "
start-stop-daemon --quiet --oknodo --stop --exec $DAEMON
echo "$NAME."
;;
reload)
killall -HUP ulogd &2> /dev/null
;;
restart)
echo -n "Restarting $DESC: "
start-stop-daemon --quiet --stop --exec $DAEMON
sleep 1
start-stop-daemon --quiet --start --exec $DAEMON -- -d > /dev/null 2>&1
echo "$NAME."
;;
*)
N=/etc/init.d/$NAME
echo "Usage: $N {start|stop|reload|restart}" >&2
exit 1
;;
esac
exit 0
--- NEW FILE: buildtool.mk ---
# makefile for ulog
include $(MASTERMAKEFILE)
ULOGD_DIR:=ulogd-1.24
ULOGD_TARGET_DIR:=$(BT_BUILD_DIR)/ulogd
export AUTOCONF=$(BT_STAGING_DIR)/bin/autoconf
$(ULOGD_DIR)/.source:
bzcat $(ULOGD_SOURCE) | tar -xvf -
cat $(ULOGD_PATCH1) | patch -d $(ULOGD_DIR) -p1
cat $(ULOGD_PATCH2) | patch -d $(ULOGD_DIR) -p1
touch $(ULOGD_DIR)/.source
source: $(ULOGD_DIR)/.source
$(ULOGD_DIR)/.configured: $(ULOGD_DIR)/.source
# (cd $(ULOGD_DIR) ; CC=$(TARGET_CC) LD=$(TARGET_LD)
CFLAGS="$(BT_COPT_FLAGS) -I$(BT_LINUX_DIR)/include" \
# ./configure --prefix=/usr --sysconfdir=/etc )
# (cd $(ULOGD_DIR) ; $(AUTOCONF) ; CC=$(TARGET_CC) LD=$(TARGET_LD)
CFLAGS="$(BT_COPT_FLAGS) -I$(BT_LINUX_DIR)/include" \
# ./configure --prefix=/usr --sysconfdir=/etc
--with-mysql=$(BT_STAGING_DIR)/usr )
(cd $(ULOGD_DIR) ; $(AUTOCONF) ; CC=$(TARGET_CC) LD=$(TARGET_LD)
CFLAGS="$(BT_COPT_FLAGS) -I$(BT_LINUX_DIR)/include" \
./configure --prefix=/usr --sysconfdir=/etc )
touch $(ULOGD_DIR)/.configured
$(ULOGD_DIR)/.build: $(ULOGD_DIR)/.configured
mkdir -p $(ULOGD_TARGET_DIR)
mkdir -p $(ULOGD_TARGET_DIR)/etc/init.d
mkdir -p $(ULOGD_TARGET_DIR)/etc/cron.daily
mkdir -p $(ULOGD_TARGET_DIR)/etc/cron.weekly
mkdir -p $(ULOGD_TARGET_DIR)/usr/lib/ulogd
make -C $(ULOGD_DIR) DESTDIR=$(ULOGD_TARGET_DIR) all
DESTDIR=$(ULOGD_TARGET_DIR) make -C $(ULOGD_DIR) install
-$(BT_STRIP) $(BT_STRIP_BINOPTS) $(ULOGD_TARGET_DIR)/usr/sbin/ulogd
-$(BT_STRIP) $(BT_STRIP_LIBOPTS) $(ULOGD_TARGET_DIR)/usr/lib/ulogd/*.so
cp -a ulogd.init $(ULOGD_TARGET_DIR)/etc/init.d/ulogd
cp -a ulogd.conf $(ULOGD_TARGET_DIR)/etc/
cp -a ulogd_daily $(ULOGD_TARGET_DIR)/etc/cron.daily/ulogd
cp -a ulogd_weekly $(ULOGD_TARGET_DIR)/etc/cron.weekly/ulogd
cp -a $(ULOGD_TARGET_DIR)/* $(BT_STAGING_DIR)
touch $(ULOGD_DIR)/.build
build: $(ULOGD_DIR)/.build
clean:
make -C $(ULOGD_DIR) clean
rm -rf $(ULOGD_TARGET_DIR)
rm $(ULOGD_DIR)/.build
rm $(ULOGD_DIR)/.configured
srcclean: clean
rm -rf $(ULOGD_DIR)
rm $(ULOGD_DIR)/.source
--- NEW FILE: buildtool.cfg ---
<File buildtool.mk>
Server = cvs-sourceforge
Revision = HEAD
Directory = ulogd
</File>
<File ulogd_daily>
Server = cvs-sourceforge
Revision = HEAD
Directory = ulogd
</File>
<File ulogd_weekly>
Server = cvs-sourceforge
Revision = HEAD
Directory = ulogd
</File>
<File ulogd.init>
Server = cvs-sourceforge
Revision = HEAD
Directory = ulogd
</File>
<File ulogd.conf>
Server = cvs-sourceforge
Revision = HEAD
Directory = ulogd
</File>
<File ulogd-1.24.tar.bz2>
Server = cvs-sourceforge
Revision = HEAD
envname = ULOGD_SOURCE
Directory = ulogd
</File>
<File ulogd-make.patch>
Server = cvs-sourceforge
Revision = HEAD
envname = ULOGD_PATCH1
Directory = ulogd
</File>
<File ulogd-configure_2.patch>
Server = cvs-sourceforge
Revision = HEAD
envname = ULOGD_PATCH2
Directory = ulogd
</File>
<Package>
<ulogd>
Version = 1.24
Revision = 6
Help <<EOF
The Netfilter Userspace Logging Daemon
Homepage: http://www.netfilter.org/projects/ulogd
LEAF package by __PACKAGER__, __BUILDDATE__
EOF
<Permissions>
Files = 644
Directories = 755
</Permissions>
<Owner>
Files = root:root
Directories = root:root
</Owner>
<Contents>
<File>
Filename = etc/ulogd.conf
Source = etc/ulogd.conf
Description = ulogd configuration
Type = conf
Type = local
Type = binary
Permissions = 600
</File>
<File>
Filename = etc/init.d/ulogd
Source = etc/init.d/ulogd
Description = ulogd daemon init file
Type = binary
Permissions = 755
</File>
<File>
Source = usr/sbin/ulogd
Filename = usr/sbin/ulogd
Type = binary
Permissions = 755
</File>
<File>
Source = usr/lib/ulogd/ulogd_OPRINT.so
Filename = usr/lib/ulogd/ulogd_OPRINT.so
Type = binary
Permissions = 755
</File>
<File>
Source = usr/lib/ulogd/ulogd_LOGEMU.so
Filename = usr/lib/ulogd/ulogd_LOGEMU.so
Type = binary
Permissions = 755
</File>
<File>
Source = usr/lib/ulogd/ulogd_BASE.so
Filename = usr/lib/ulogd/ulogd_BASE.so
Type = binary
Permissions = 755
</File>
<File>
Source = etc/cron.daily/ulogd
Filename = etc/cron.daily/ulogd
Description = ulogd daily logrotating
Type = local
Type = conf
Type = binary
Permissions = 755
</File>
<File>
Source = etc/cron.weekly/ulogd
Filename = etc/cron.weekly/ulogd
Description = ulogd weekly logrotating
Type = local
Type = conf
Type = binary
Permissions = 755
</File>
</Contents>
</ulogd>
# <ulogdsql>
# Version = 1.24
# Revision = 1
#
# Help <<EOF
# MySQL plugin for the Netfilter Userspace Logging Daemon
# Homepage: http://www.netfilter.org/projects/ulogd
# Requires: ulogd.lrp, libmysql.lrp
# LEAF package by __PACKAGER__, __BUILDDATE__
# EOF
#
# <Permissions>
# Files = 644
# Directories = 755
# </Permissions>
#
# <Owner>
# Files = root:root
# Directories = root:root
# </Owner>
#
# <Contents>
# <File>
# Source = usr/lib/ulogd/ulogd_MYSQL.so
# Filename = usr/lib/ulogd/ulogd_MYSQL.so
# Type = binary
# Permissions = 755
# </File>
# </Contents>
# </ulogdsql>
</Package>
--- NEW FILE: ulogd_daily ---
#!/bin/sh
# Save daily LOGDEPTH versions of logfile
LOGDEPTH=4
# Space separated list of logfiles
LOGFILE="/var/log/shorewall.log"
for log in $LOGFILE ; do
if [ -f $log ]; then
savelog -g wheel -m 640 -u root -c $LOGDEPTH $log >/dev/null
fi
done
/etc/init.d/ulogd reload
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
