--- ulogd-1.24.orig/debian/ulogd.config +++ ulogd-1.24/debian/ulogd.config @@ -0,0 +1,23 @@ +#!/bin/sh +# Copyright 2005 Achilleas Kotsis +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . +# +set -e +test $DEBIAN_SCRIPT_DEBUG && set -v -x + +# Use debconf +. /usr/share/debconf/confmodule + +# if we're upgrading +if [ -n "$2" ] ; then + # Do we have a new configuration file syntax? + if `dpkg --compare-versions "$2" lt 1.23-1`; then + db_input high ulogd/config_syntax_changed || true + db_go + fi +fi +db_stop + +exit 0 +# vim: set ai et sts=2 sw=2 tw=0: --- ulogd-1.24.orig/debian/ulogd-mysql.install +++ ulogd-1.24/debian/ulogd-mysql.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/ulogd/ulogd_MYSQL.so usr/lib/ulogd --- ulogd-1.24.orig/debian/ulogd.dirs +++ ulogd-1.24/debian/ulogd.dirs @@ -0,0 +1,4 @@ +usr/lib/ulogd +usr/sbin +etc +var/log/ulog --- ulogd-1.24.orig/debian/ulogd-pgsql.docs +++ ulogd-1.24/debian/ulogd-pgsql.docs @@ -0,0 +1 @@ +doc/pgsql.table --- ulogd-1.24.orig/debian/ulogd.examples +++ ulogd-1.24/debian/ulogd.examples @@ -0,0 +1 @@ +ulogd.conf --- ulogd-1.24.orig/debian/watch +++ ulogd-1.24/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=pasv ftp://ftp.netfilter.org/pub/ulogd/ulogd-(.*)\.tar\.bz2 \ + debian uupdate --- ulogd-1.24.orig/debian/ulogd.NEWS +++ ulogd-1.24/debian/ulogd.NEWS @@ -0,0 +1,29 @@ +ulogd (1.23-1) unstable; urgency=low + + /etc/ulogd.conf configuration file syntax has changed. You probably need to + upgrade your configuration to the new syntax. ulogd will disregard an old + style configuration, or fail to start completely! + + There is a new package called "ulogd-sqlite3" which adds support for + SQLite 3 database. + + Package is now maintained by Achilleas Kotsis . + + -- Achilleas Kotsis Tue, 3 May 2005 15:55:38 +0300 + +ulogd (1.01-1) unstable; urgency=low + + The names of the logfiles have changed. For consistent nameing the + default names now all end in .log. Please check your /etc/ulogd.conf + and your /etc/logrotate.d/ulogd that they fit together. + + -- Joerg Wendland Tue, 2 Sep 2003 11:38:43 +0200 + +ulogd (1.00+cvs20030513-2) unstable; urgency=low + + There is now a new package called "ulogd-pcap". This is a plugin + to ulogd that allows you to log your suspicious packets into a + pcap format file and analyze that later with tools like tcpdump + or ethereal. + + -- Joerg Wendland Sat, 9 Aug 2003 18:54:29 +0200 --- ulogd-1.24.orig/debian/compat +++ ulogd-1.24/debian/compat @@ -0,0 +1 @@ +5 --- ulogd-1.24.orig/debian/control +++ ulogd-1.24/debian/control @@ -0,0 +1,52 @@ +Source: ulogd +Section: net +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Achilleas Kotsis +Uploaders: Faidon Liambotis +Build-Depends: debhelper (>= 5), libmysqlclient16-dev | libmysqlclient-dev, libpq-dev, libpcap-dev, libsqlite3-dev, cdbs, autotools-dev +Standards-Version: 3.7.3 +Homepage: http://www.netfilter.org/projects/ulogd/ + +Package: ulogd +Architecture: any +Depends: ${shlibs:Depends}, debconf | debconf-2.0 +Suggests: ulogd-mysql, ulogd-pgsql, ulogd-pcap, ulogd-sqlite3 +Description: The Netfilter Userspace Logging Daemon + ulogd is a daemon that listens for Netlink packets generated by iptables's + ULOG target. Basically, it's a replacement for syslog for logging packets, + and does a much better job - it logs to files, pcap files, MySQL, PostgreSQL, + SQLite 3 and soon will be able to log remotely. + . + MySQL, PostgreSQL and SQLite 3 support is in separate packages, called + ulogd-mysql, ulogd-pgsql and ulogd-sqlite3 respectively. pcap file support + is in package called ulogd-pcap. + +Package: ulogd-mysql +Architecture: any +Depends: ulogd (= ${binary:Version}), ${shlibs:Depends} +Description: MySQL extension to ulogd + This module adds MySQL support to ulogd. You can log into a MySQL database + if you have it installed. + +Package: ulogd-pgsql +Architecture: any +Depends: ulogd (= ${binary:Version}), ${shlibs:Depends} +Description: PostgreSQL extension to ulogd + This module adds PostgreSQL support to ulogd. You can log into a PostgreSQL + database if you have it installed. + +Package: ulogd-pcap +Architecture: any +Depends: ulogd (= ${binary:Version}), ${shlibs:Depends} +Description: pcap extension to ulogd + This module adds a plugin to ulogd, that allows to log to a pcap format + file. You can then use this file with other tools that use pcap like + tcpdump or ethereal. + +Package: ulogd-sqlite3 +Architecture: any +Depends: ulogd (= ${binary:Version}), ${shlibs:Depends} +Description: SQLite 3 extension to ulogd + This module adds SQLite 3 support to ulogd. You can log into a SQLite 3 + database if you have it installed. --- ulogd-1.24.orig/debian/ulogd-pcap.install +++ ulogd-1.24/debian/ulogd-pcap.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/ulogd/ulogd_PCAP.so usr/lib/ulogd --- ulogd-1.24.orig/debian/copyright +++ ulogd-1.24/debian/copyright @@ -0,0 +1,14 @@ +This package was debianized by Daniel Stone on +Fri, 13 Apr 2001 03:02:02 +1000. It was maintained by Joerg Wendland + until Wed, 15 Oct 2003 12:38:33 +0200. + +Current maintainer: Achilleas Kotsis + +It was downloaded from ftp://ftp.netfilter.org/pub/ulogd/ + +Upstream Author: Harald Welte + +Copyright: Copyright (C) 2000-2005 Harald Welte + +Licensed under the GNU General Public License. Have a look at +/usr/share/common-licenses/GPL --- ulogd-1.24.orig/debian/ulogd.templates +++ ulogd-1.24/debian/ulogd.templates @@ -0,0 +1,8 @@ +Template: ulogd/config_syntax_changed +Type: note +_Description: Configuration syntax has changed + /etc/ulogd.conf configuration file syntax has changed. You probably need + to upgrade your configuration to the new syntax. ulogd will disregard an + old style configuration, or fail to start completely! + . + See /usr/share/doc/ulogd/examples/ulogd.conf for details. --- ulogd-1.24.orig/debian/ulogd-sqlite3.dirs +++ ulogd-1.24/debian/ulogd-sqlite3.dirs @@ -0,0 +1 @@ +usr/lib/ulogd --- ulogd-1.24.orig/debian/ulogd.init.d +++ ulogd-1.24/debian/ulogd.init.d @@ -0,0 +1,54 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ulogd +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Starts ulogd +# Description: Starts the netfilter userspace log daemon +### END INIT INFO + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/ulogd +NAME=ulogd +DESC="netfilter userspace log daemon" + +test -f $DAEMON || exit 0 + +set -e + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --quiet --start --exec $DAEMON -- -d + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --quiet --oknodo --stop --exec $DAEMON + echo "$NAME." + ;; + reload) + start-stop-daemon --quiet --stop --oknodo --signal HUP --exec $DAEMON + ;; + restart|force-reload) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart". + # + echo -n "Restarting $DESC: " + start-stop-daemon --quiet --oknodo --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|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 --- ulogd-1.24.orig/debian/ulogd.postrm +++ ulogd-1.24/debian/ulogd.postrm @@ -0,0 +1,10 @@ +#! /bin/sh +set -e + +#DEBHELPER# + +if [ "$1" = "purge" ]; then + if [ -d /var/log/ulog ]; then + rm -rf /var/log/ulog + fi +fi --- ulogd-1.24.orig/debian/changelog +++ ulogd-1.24/debian/changelog @@ -0,0 +1,469 @@ +ulogd (1.24-2.1ubuntu2) jaunty; urgency=low + + * No change rebuild for libmysqlclient5 transition + - debian/control: Update Build-Depends + + -- David Futcher Wed, 18 Mar 2009 19:16:31 +0000 + +ulogd (1.24-2.1ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/patches/z_fix_no_format_argument.patch: + + Fix for "format not a string literal and no format arguments" warning. + - debian/patches/fix_mysql_ldflags_ubuntu.patch: + + Strip -Wl, and -rpath from MYSQL_LDFLAGS as ld is used directly. + + -- Luca Falavigna Mon, 06 Oct 2008 23:40:10 +0200 + +ulogd (1.24-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Add copyright holder to debian/copyright. + * Remove log files on purge. (Closes: #499600). + + -- Barry deFreese Mon, 22 Sep 2008 14:06:50 -0400 + +ulogd (1.24-2ubuntu1) intrepid; urgency=low + + * debian/patches/z_fix_no_format_argument.patch: + + Fix for "format not a string literal and no format arguments" warning. + * debian/patches/fix_mysql_ldflags_ubuntu.patch: + + Strip -Wl, from MYSQL_LDFLAGS as ld is used directly + + -- Michael Bienia Sun, 27 Jul 2008 16:39:55 +0200 + +ulogd (1.24-2) unstable; urgency=low + + [ Achilleas Kotsis ] + * New maintainer email address. (Closes: #460029) + * New upstream website. (Closes: #428243) + * Removed .ps documentation. + + [ Faidon Liambotis ] + * Fix the init script to write errors to stderr when ulogd fails to start. + (Closes: #459298) + * Use new Homepage field. + * Use binary:Version instead of Source-Version (binNMU friendly). + * Bump debhelper compatibility level to 5. + * Bump Standards-Version to 3.7.3. + * Build-Depend on autotools-dev to update ancient autotools shipped by + upstream (fixes lintian warning outdated-autotools-helper-file). + * Ship upstream changelog as changelog.gz instead of Changes.gz, according + to Policy 12.7. + * Fix formatting of NEWS.Debian. + * Add LSB section in the init script. + + -- Faidon Liambotis Sat, 12 Jan 2008 13:02:42 +0200 + +ulogd (1.24-1) unstable; urgency=low + + * New upstream release. + - Removed merged patches configure.patch, configure_in.patch, + pgsql_table.patch, ulogd_SQLITE3_c.patch, ulogd_PCAP-timeval.patch, + ulogd_SYSLOG_c.patch. + - Adapt strfix to the new version. + * postgre-doc.patch: Fix already generated HTML and TXT instead of just + changing the SGML. + + -- Faidon Liambotis Mon, 09 Apr 2007 19:10:27 +0300 + +ulogd (1.23-9) unstable; urgency=high + + * Urgency high, targetting etch release. + * debian/po/nl.po: Dutch debconf templates translation. (Closes: #415499). + * Fix ulogd_PGSQL documentation. Patch from upstreams' #332 + (Closes: #254512). + + -- Faidon Liambotis Thu, 29 Mar 2007 17:36:04 +0300 + +ulogd (1.23-8) unstable; urgency=low + + * Add myself as an uploader. + * Remove ulogd_BASE.c patching from strfix.patch, the fix is pointless and + corrupts MAC addresses (Closes: #412499). + * ulogd_conf.patch: Correct /var/log/ulogd.conf path in the manpage + (Closes: #407629) + * debconf templates translations: + - el.po: Greek + - ja.po: Japanese (Closes: #414394) + - pt.po: Portuguese (Closes: #412286) + - ca.po: Catalan (Closes: #412298) + - eu.po: Basque (Closes: #412417) + - ta.po: Tamil (Closes: #412440) + - ru.po: Russian (Closes: #412545) + - ro.po: Romanian (Closes: #412928) + + -- Faidon Liambotis Tue, 13 Mar 2007 07:45:39 +0200 + +ulogd (1.23-7) unstable; urgency=low + + * debian/po/de.po: German debconf templates translation. (Closes: #402363). + * debian/po/es.po: Spanish debconf templates translation. (Closes: #408035). + * debian/po/gl.po: Galician debconf templates translation. (Closes: #412240). + + -- Achilleas Kotsis Sun, 25 Feb 2007 10:13:17 +0200 + +ulogd (1.23-6) unstable; urgency=high + + * debian/patches/strfix.patch: Patch to fix a potential buffer + overflow due to improper string length calculations (CVE-2007-0460). + * debian/patches/printpkt_c.patch: Removed, included in + debian/patches/strfix.patch. + + -- Achilleas Kotsis Tue, 30 Jan 2007 01:33:57 +0200 + +ulogd (1.23-5) unstable; urgency=low + + * debian/patches/ulogd_PCAP-timeval.patch: Patch to fix bogus savefile + header on amd64, reported by Peter Colberg. Patch by Chris Humbert + (Closes: #332947). + * debian/patches/printpkt_c.patch: Patch to fix ulogd reporting the wrong + protocol number on unknown protocols. Patch by diegows@lanux.org.ar. + (Closes: #261858). + * Acknowledge NMU. (Closes: #343811). + + -- Achilleas Kotsis Thu, 16 Mar 2006 19:10:13 +0200 + +ulogd (1.23-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Rebuilt against libmysqlclient15-dev. Closes: #343811 + + -- Christian Hammers Tue, 21 Feb 2006 23:31:32 +0100 + +ulogd (1.23-4) unstable; urgency=low + + * debian/control: Now depends on debconf | debconf-2.0 as suggested by Joey + Hess in http://lists.debian.org/debian-devel/2005/08/msg00136.html + (Closes: #332131). + * debian/po/vi.po: Vietnamese debconf templates translation, posted by + Clytie Siddall (Closes: #323961). + * debian/po/sv.po: Swedish debconf templates translation, posted by Daniel + Nylander (Closes: #331369). + + -- Achilleas Kotsis Mon, 10 Oct 2005 02:51:59 +0300 + +ulogd (1.23-3) unstable; urgency=low + + * debian/po/cs.po: + Czech debconf templates translation, posted by Miroslav Kure + (Closes: #314930). + * debian/patches/ulogd_SYSLOG_c.patch: + Fixed bug: FTBFS (amd64/gcc-4.0): static declaration of 'logfile' follows + non-static declaration (Thanks to Andreas Jochens) (Closes: #315028) + * debian/control: + Standards-Version: 3.6.2, no changes required. + * debian/po/it.po: + Italian debconf templates translation, posted by Luca Bruno + (Closes: #316259). + + -- Achilleas Kotsis Sat, 2 Jul 2005 02:16:57 +0300 + +ulogd (1.23-2) unstable; urgency=low + + * debian/include/netfilter_ipv4/ipt_ULOG.h: + New version taken from kernel 2.6.8, two new #defines. + * debian/patches/pgsql_table.patch: + Fixed bug in documentation: example pgsql.table defaults to wrong type + for ip address fields (Closes: #254511). + * debian/po/fr.po: + French debconf templates translation, posted by Jean-Luc Coulon + (Closes: #309221). + * debian/control: + Build-Depends: Added: libpq-dev Removed: postgresql-dev + * debian/patches/ulogd_SQLITE3_c.patch: + Fixed off-by-one error in table columns, wrong size for u16 integers. + (Thanks to Philip Thiem for the patch) + Fixed handling of NULL fields. + (Closes: #312507) + * debian/rules: + Removed call to dh_installlogrotate for CDBS does it now correctly. + * debian/patches/configure.patch, debian/patches/configure.in.patch: + Patched configure to use pg_config to find postgres lib and include paths. + Package now builds OK with postgresql-8.0. + + -- Achilleas Kotsis Sun, 19 Jun 2005 17:09:39 +0300 + +ulogd (1.23-1) unstable; urgency=low + + * New maintainer (Closes: #303197). + * New upstream release (Closes: #306143). + - pcap/ulogd_PCAP.c (append_create_outfile), zero length + and non-existent output file are now handled the same way (by writing + the necessary header) (Closes: #248272). + - New configuration file syntax. + + Removed patches fixed upstream + - debian/patches/ulogd-version.patch: + New version number obsoletes patch. + - debian/ulogd.8: + Man page included upstream. + + * New binary package, ulogd-sqlite3: SQLite 3 extension to ulogd + + * debian/patches/ulogd_conf.patch: + Adapted to new version of configuration file. + * debian/patches/ulogd_h.patch: + Patch to build on AMD64 with gcc4.0. Thanks to Andreas Jochens for + the patch (Closes: #297739). + * debian/ulogd.config, debian/ulogd.templates, debian/po + Use po-debconf. Inform user about the configuration syntax change if + upgrading. + * debian/ulogd.postinst: + Needed by debconf. + * debian/control: + "Suggests:" added ulogd-* packages (Closes: #299637). + "Depends:" added debconf. Added libmysqlclient12-dev as prefered + real package for libmysqlclient-dev. + New description, including ulogd-pcap and ulogd-sqlite3 + Standards-Version: 3.6.1.1, no changes required. + * debian/ulogd.logrotate: + Create log files with correct permissions (Closes: #261785). + * debian/ulogd.examples: + Install sample configuration. + * debian/ulogd.README.Debian: + Fixed typo in ulogd-mysql (Closes: #290865). + Added references to ulogd-pcap and ulogd-sqlite3. + * debian/copyright: + New upstream release site, new maintainer (Closes: #306142). + + -- Achilleas Kotsis Tue, 3 May 2005 17:17:20 +0300 + +ulogd (1.02-2) unstable; urgency=low + + * Orphan. Set maintainer to QA. + + -- Debian QA Group Mon, 18 Apr 2005 09:18:50 +0200 + +ulogd (1.02-1) unstable; urgency=low + + * New upstream release. + - fixed timestamp printing in LOGEMU (closes: Bug#208506) + * debian/patches/ulogd-version.patch: + - this is really ulogd 1.02 + + -- Joerg Wendland Wed, 15 Oct 2003 12:38:33 +0200 + +ulogd (1.01-1) unstable; urgency=low + + * New upstream release. + Removed patches now included upstream: + - debian/patches/plugin_linkage.patch + - debian/patches/mysql_connect.patch + - debian/patches/kernel_headers.patch + - debian/patches/ulogd_BASE.patch + * debian/ulogd.logrotate: + Rotate everything in /var/log/ulog. + * debian/patches/ulogd_conf.patch: + Upstream now includes a ulogd.conf.in that gets modified by the + configure script. We still have to change the logfile paths. + All logfiles are now called *.log. Add a notice for that to NEWS.Debian. + * debian/control: + Standards-Version: 3.6.1, no changes required. + * debian/ulogd-mysql.postinst: + Removed for it just contained #DEBHELPER#. + + -- Joerg Wendland Tue, 2 Sep 2003 11:38:43 +0200 + +ulogd (1.00+cvs20030513-7) unstable; urgency=low + + * debian/ulogd.install: + install forgotten ulogd.conf to /etc (closes: Bug#207593) + * debian/rules: + add call to dh_installlogratote for CDBS does not do it + (closes: Bug#207261) + + -- Joerg Wendland Thu, 28 Aug 2003 12:27:33 +0200 + +ulogd (1.00+cvs20030513-6) unstable; urgency=low + + * debian/patches/ulogd_BASE.patch: + Patch from upstream to fix timestamps. (closes: Bug#187053) + * debian/patches/mysql_connect.patch: + This needed a bit more work than just replacing the function + call. (closes: Bug#205115) + * Thanks to Jochen Friedrich for his help with these issues. + + -- Joerg Wendland Wed, 13 Aug 2003 19:42:51 +0200 + +ulogd (1.00+cvs20030513-5) unstable; urgency=low + + * debian/patches/kernel_headers.patch: + Try to replace all linux/*.h headers by netinet/*.h headers so that + we are independant of kernel headers. + + -- Joerg Wendland Tue, 12 Aug 2003 12:51:04 +0200 + +ulogd (1.00+cvs20030513-4) unstable; urgency=low + + * debian/patches/ipt_ULOG.patch: + Patch include directive into Rules.make.in, not only Makefile.in + of libipulog/. This should now get the package to build on m68k + and arm finally. Also remove include directive for kernel headers. + + -- Joerg Wendland Mon, 11 Aug 2003 15:03:57 +0200 + +ulogd (1.00+cvs20030513-3) unstable; urgency=low + + * Really add libpcap-dev to Build-Depends. + + -- Joerg Wendland Mon, 11 Aug 2003 12:08:12 +0200 + +ulogd (1.00+cvs20030513-2) unstable; urgency=low + + * Move package build to CDBS. + * debian/control: + - Add Build-Dep on cdbs. + - Add Build-Dep on libpcap-dev, so that pcap extension will + be built. + - Change Standards-Version to 3.6.0, need linkage changes for + ulogd-plugins do to section 10.2 of policy (see below). + - New package ulogd-pcap containing the pcap extension. + * debian/ulogd.NEWS: + Tell people about the new ulogd-pcap package. + * debian/patches/ipt_ULOG.patch: + Again include ipt_ULOG.h since arm and m68k still do not have + this header file in their libc packages. (closes: Bug#199733) + * debian/patches/mysql_connect.patch: + Fix the ulogd_MYSQL module to use mysql_real_connect() instead + of the obsolete mysql_connect(). (closes: Bug#193339) + * debian/patches/plugin_linkage.patch: + Link all plugins against all needed libraries. This is not necessary + the correct working of those plugins but for the reasons given in + Policy 10.2. This change is required since Standards-Version 3.6.0. + * debian/patches/ulogd_conf.patch: + Moved patch from debian.diff.gz to here. + * debian/ulogd.logrotate: + Add /var/log/ulogd/ulogd.syslogemu to log rotation. + (closes: Bug#202434) + * debian/ulogd-mysql.README.Debian: + Removed obsolete file. + + -- Joerg Wendland Sat, 9 Aug 2003 18:46:11 +0200 + +ulogd (1.00+cvs20030513-1) unstable; urgency=low + + * New upstream release. + * Compiling against new libpq3 fixes installability. + (closes: Bug#189841) + * Apply fixes from CVS to extensions/ulogd_BASE.c. + (closes: Bug#187053) + * Fix description and service name in init-script. + (closes: Bug#178666) + * debian/control: + - compile with libmysqlclient-dev now that the OpenSSL linkage issue + has been resolved + - Standards-Version 3.5.9 + * Use newer Rules.make.in and configure.in from CVS, it includes + some fixes from my previous packages. + + -- Joerg Wendland Tue, 13 May 2003 22:07:45 +0200 + +ulogd (0.98-2) unstable; urgency=low + + * Add ipt_ULOG.h to source and check to configure.in to allow + build on ARM which has no libc6 2.3 yet. + + -- Joerg Wendland Wed, 6 Nov 2002 20:27:27 +0100 + +ulogd (0.98-1) unstable; urgency=low + + * New upstream release (closes: Bug#167017) + * remove kernel-headers from Build-Depends since libc6 2.3 + now includes the needed headers (closes: Bug#154070) + * add commandline option to specify an alternative config file + (closes: Bug#167018) + * install documentation into /usr/share/doc + (closes: Bug#167020) + * rewrite manpage (closes: Bug#167019) + * add reload action to init script (closes: Bug#160513) + + -- Joerg Wendland Wed, 6 Nov 2002 00:57:58 +0100 + +ulogd (0.97+cvs.20020612-2) unstable; urgency=medium + + * Add Build-dep on 2.4.18 kernel-headers and use + /usr/src/kernel-headers-2.4.18/include instead of /usr/include/linux + (closes: Bug#152913). + * Fix build of mysql-module to not link against libpq. (closes: Bug#152629) + + -- Joerg Wendland Sun, 21 Jul 2002 14:28:46 +0200 + +ulogd (0.97+cvs.20020612-1) unstable; urgency=low + + * New upstream version from CVS. (closes: Bug#132675) + * Remove Recommends for kernel-patch-ulog (closes: Bug#136090) + * #define NETLINK_NFLOG 5 in libipulog.c so we do not need to rely on + specific kernel headers (closes: Bug#136688) + * Add new binary package ulogd-pgsql to support the newly available + PostgreSQL support in ulogd. + * Change Maintainer address to correct one. + * Fixup debian/rules. + * Fix package descriptions. + + -- Joerg Wendland Wed, 12 Jun 2002 21:46:06 +0200 + +ulogd (0.97-1) unstable; urgency=medium + + * New upstream version + * changed init.d script to use start-stop-daemon and be quiet + + -- Joerg Wendland Wed, 3 Oct 2001 04:00:15 +0200 + +ulogd (0.96-3) unstable; urgency=low + + * Adopted package. (closes: #110247) + + -- Joerg Wendland Thu, 13 Sep 2001 22:36:05 +0200 + +ulogd (0.96-2) unstable; urgency=low + + * Orphaning - QA->Maintainer. + + -- Daniel Stone Mon, 27 Aug 2001 19:10:03 +1000 + +ulogd (0.96-1) unstable; urgency=low + + * New upstream release. + * Use upstream's patch for the LOGEMU sync option. + * Update my email address (it's shorter now, aaronl). + * Fix ulogd.conf - new one from CVS stomped my diff. (closes: #101289) + * Make ulogd-mysql depend on the same version of ulogd. + + -- Daniel Stone Mon, 18 Jun 2001 10:35:39 +1000 + +ulogd (0.95.cvs.20010531-2) unstable; urgency=low + + * Calls and Build-Depends: on autoconf. + * Initial Debian release. (closes: #93401). + + -- Daniel Stone Mon, 11 Jun 2001 20:28:20 +1000 + +ulogd (0.95.cvs.20010531-1) unstable; urgency=low + + * mhp-compliant versioning scheme. + + -- Daniel Stone Sun, 10 Jun 2001 12:19:03 +1000 + +ulogd (0.95-2+cvs20010531) unstable; urgency=low + + * Sadly, I've had to return to the pre-kernel-patch-ulog ugly hack; to + satisfy the autobuilders. No, I don't like this, either. + * Bring it up to date with latest CVS, but I don't like arguing with + cvs-buildpackage. + + -- Daniel Stone Thu, 31 May 2001 18:22:11 +1000 + +ulogd (0.95-1) unstable; urgency=low + + * New upstream release. + * Added option ("synclogfile", 0/1) to sync syslogemu file after every line + (Michael Stolovitzsky). Included in upstream CVS, will be there in 0.96. + + -- Daniel Stone Sun, 20 May 2001 13:27:57 +1000 + +ulogd (0.94-1) unstable; urgency=low + + * Initial Release. + + -- Daniel Stone Fri, 13 Apr 2001 03:02:02 +1000 --- ulogd-1.24.orig/debian/ulogd.README.Debian +++ ulogd-1.24/debian/ulogd.README.Debian @@ -0,0 +1,10 @@ +Support for logging into MySQL, PostgreSQL and SQLite 3 databases is available +from separate packages called ulogd-mysql, ulogd-pgsql and ulogd-sqlite3 +respectively. + +You can also log packets in pcap file format, using package ulogd-pcap. + +Don't forget to adapt your /etc/ulogd.conf to those modules. Example +configuration is included. + +Achille --- ulogd-1.24.orig/debian/ulogd-pgsql.dirs +++ ulogd-1.24/debian/ulogd-pgsql.dirs @@ -0,0 +1 @@ +usr/lib/ulogd --- ulogd-1.24.orig/debian/ulogd.postinst +++ ulogd-1.24/debian/ulogd.postinst @@ -0,0 +1,17 @@ +#!/bin/sh +# Copyright 2005 Achilleas Kotsis +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . +# + +set -e +test $DEBIAN_SCRIPT_DEBUG && set -v -x + +# use debconf +. /usr/share/debconf/confmodule + +db_stop + +#DEBHELPER# + +exit 0 --- ulogd-1.24.orig/debian/ulogd-pgsql.install +++ ulogd-1.24/debian/ulogd-pgsql.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/ulogd/ulogd_PGSQL.so usr/lib/ulogd --- ulogd-1.24.orig/debian/ulogd-mysql.docs +++ ulogd-1.24/debian/ulogd-mysql.docs @@ -0,0 +1,2 @@ +doc/mysql.table +doc/mysql.table.ipaddr-as-string --- ulogd-1.24.orig/debian/ulogd.install +++ ulogd-1.24/debian/ulogd.install @@ -0,0 +1,4 @@ +ulogd.conf etc/ +debian/tmp/usr/sbin/ulogd usr/sbin +ulogd.8 usr/share/man/man8 +debian/tmp/usr/lib/ulogd/ulogd_{BASE,LOCAL,LOGEMU,OPRINT,PWSNIFF}.so usr/lib/ulogd --- ulogd-1.24.orig/debian/rules +++ ulogd-1.24/debian/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_CONFIGURE_SCRIPT_ENV = +DEB_MAKE_INVOKE = make +DEB_CONFIGURE_USER_FLAGS = --with-pgsql --with-mysql --with-pcap --with-sqlite3 + +DEB_INSTALL_CHANGELOGS_ALL = Changes --- ulogd-1.24.orig/debian/ulogd.docs +++ ulogd-1.24/debian/ulogd.docs @@ -0,0 +1,2 @@ +doc/ulogd.txt +doc/ulogd.html --- ulogd-1.24.orig/debian/ulogd-sqlite3.install +++ ulogd-1.24/debian/ulogd-sqlite3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/ulogd/ulogd_SQLITE3.so usr/lib/ulogd --- ulogd-1.24.orig/debian/ulogd.logrotate +++ ulogd-1.24/debian/ulogd.logrotate @@ -0,0 +1,8 @@ +/var/log/ulog/*.log { + missingok + sharedscripts + create 640 root adm + postrotate + /etc/init.d/ulogd reload + endscript +} --- ulogd-1.24.orig/debian/ulogd-sqlite3.docs +++ ulogd-1.24/debian/ulogd-sqlite3.docs @@ -0,0 +1 @@ +doc/sqlite3.table --- ulogd-1.24.orig/debian/ulogd-mysql.dirs +++ ulogd-1.24/debian/ulogd-mysql.dirs @@ -0,0 +1 @@ +usr/lib/ulogd --- ulogd-1.24.orig/debian/patches/postgre-doc.patch +++ ulogd-1.24/debian/patches/postgre-doc.patch @@ -0,0 +1,90 @@ +diff -Nur ulogd-1.24/doc/ulogd.html ulogd-1.24.new/doc/ulogd.html +--- ulogd-1.24/doc/ulogd.html 2007-04-09 19:09:12.000000000 +0300 ++++ ulogd-1.24.new/doc/ulogd.html 2007-04-09 19:09:31.000000000 +0300 +@@ -326,7 +326,7 @@ +

ulogd_PGSQL.so

+ +

An output plugin for logging into a postgresql database. This is only compiled +-if you have the mysql libraries installed, and the configure script was able to ++if you have the postgresql libraries installed, and the configure script was able to + detect them. (that is: --with-pgsql was specified for ./configure)

+ +

The plugin automagically inserts the data into the configured table; It +@@ -339,7 +339,7 @@ + resolve this against the key 'ip.saddr' and put the ip address as 32bit + unsigned integer into the table.

+ +-

You may want to have a look at the file 'doc/mysql.table' as an ++

You may want to have a look at the file 'doc/pgsql.table' as an + example table including fields to log all keys from ulogd_BASE.so. Just delete + the fields you are not interested in, and create the table.

+ +@@ -347,7 +347,7 @@ +
+
table

Name of the table to which ulogd should log.

+
db

Name of the database.

+-
host

Name of the mysql database host.

++
host

Name of the sql database host.

+
port

TCP port number of database server.

+
user

Name of the sql user.

+
pass

Password for sql user.

+diff -Nur ulogd-1.24/doc/ulogd.sgml ulogd-1.24.new/doc/ulogd.sgml +--- ulogd-1.24/doc/ulogd.sgml 2007-04-09 19:09:12.000000000 +0300 ++++ ulogd-1.24.new/doc/ulogd.sgml 2007-04-09 19:09:31.000000000 +0300 +@@ -330,7 +330,7 @@ + ulogd_PGSQL.so +

+ An output plugin for logging into a postgresql database. This is only compiled +-if you have the mysql libraries installed, and the configure script was able to ++if you have the postgresql libraries installed, and the configure script was able to + detect them. (that is: --with-pgsql was specified for ./configure) + +

+@@ -346,7 +346,7 @@ + unsigned integer into the table. + +

+-You may want to have a look at the file 'doc/mysql.table' as an ++You may want to have a look at the file 'doc/pgsql.table' as an + example table including fields to log all keys from ulogd_BASE.so. Just delete + the fields you are not interested in, and create the table. + +@@ -358,7 +358,7 @@ + db + Name of the database. + host +-Name of the mysql database host. ++Name of the sql database host. + port + TCP port number of database server. + user +diff -Nur ulogd-1.24/doc/ulogd.txt ulogd-1.24.new/doc/ulogd.txt +--- ulogd-1.24/doc/ulogd.txt 2007-04-09 19:09:12.000000000 +0300 ++++ ulogd-1.24.new/doc/ulogd.txt 2007-04-09 19:09:31.000000000 +0300 +@@ -446,7 +446,7 @@ + 4.2.4. ulogd_PGSQL.so + + An output plugin for logging into a postgresql database. This is only +- compiled if you have the mysql libraries installed, and the configure ++ compiled if you have the postgresql libraries installed, and the configure + script was able to detect them. (that is: --with-pgsql was specified + for ./configure) + +@@ -464,7 +464,7 @@ + 32bit unsigned integer into the table. + + +- You may want to have a look at the file 'doc/mysql.table' as an ++ You may want to have a look at the file 'doc/pgsql.table' as an + example table including fields to log all keys from ulogd_BASE.so. + Just delete the fields you are not interested in, and create the + table. +@@ -478,7 +478,7 @@ + db Name of the database. + + host +- Name of the mysql database host. ++ Name of the sql database host. + + port + TCP port number of database server. --- ulogd-1.24.orig/debian/patches/fix_mysql_ldflags_ubuntu.patch +++ ulogd-1.24/debian/patches/fix_mysql_ldflags_ubuntu.patch @@ -0,0 +1,26 @@ +diff -Nur -x '*.orig' -x '*~' ulogd-1.24/mysql/Makefile ulogd-1.24.new/mysql/Makefile +--- ulogd-1.24/mysql/Makefile 2006-01-25 12:27:17.000000000 +0100 ++++ ulogd-1.24.new/mysql/Makefile 2008-07-27 16:32:58.000000000 +0200 +@@ -10,6 +10,9 @@ + + SHARED_LIBS=ulogd_MYSQL.so + ++# fix the LDFLAGS included in MYSQL_LDFLAGS ++MYSQL_LDFLAGS:=$(shell echo $(MYSQL_LDFLAGS) | sed s/-Wl,//) ++ + all: $(SHARED_LIBS) + + distrib: +diff -Nur -x '*.orig' -x '*~' ulogd-1.24/mysql/Makefile.in ulogd-1.24.new/mysql/Makefile.in +--- ulogd-1.24/mysql/Makefile.in 2005-11-25 20:58:27.000000000 +0100 ++++ ulogd-1.24.new/mysql/Makefile.in 2008-07-27 16:32:39.000000000 +0200 +@@ -9,6 +9,9 @@ + + SHARED_LIBS=ulogd_MYSQL.so + ++# fix the LDFLAGS included in MYSQL_LDFLAGS ++MYSQL_LDFLAGS:=$(shell echo $(MYSQL_LDFLAGS) | sed s/-Wl,//;s/-rpath//) ++ + all: $(SHARED_LIBS) + + distrib: --- ulogd-1.24.orig/debian/patches/ipt_ULOG.patch +++ ulogd-1.24/debian/patches/ipt_ULOG.patch @@ -0,0 +1,11 @@ +--- Rules.make.in.orig 2003-08-11 15:02:59.000000000 +0200 ++++ Rules.make.in 2003-08-11 15:02:34.000000000 +0200 +@@ -19,7 +19,7 @@ + CFLAGS+=-DULOGD_CONFIGFILE=\"$(ULOGD_CONFIGFILE)\" + # doesn't work for subdirs + #CFLAGS+=$(INCIPULOG) $(INCCONFFILE) +-CFLAGS+=-I/lib/modules/`uname -r`/build/include ++CFLAGS+=-I@abs_srcdir@/debian/include + #CFLAGS+=@DEFS@ + #CFLAGS+=-g -DDEBUG -DDEBUG_MYSQL -DDEBUG_PGSQL + --- ulogd-1.24.orig/debian/patches/strfix.patch +++ ulogd-1.24/debian/patches/strfix.patch @@ -0,0 +1,857 @@ +--- extensions/printpkt.c ++++ extensions/printpkt.c 2007/01/10 13:13:23 +@@ -95,13 +95,17 @@ + #define GET_VALUE(x) ulogd_keyh[intr_ids[x].id].interp->result[ulogd_keyh[intr_ids[x].id].offset].value + #define GET_FLAGS(x) ulogd_keyh[intr_ids[x].id].interp->result[ulogd_keyh[intr_ids[x].id].offset].flags + +-int printpkt_print(ulog_iret_t *res, char *buf, int prefix) ++int printpkt_print(ulog_iret_t *res, char *buf, size_t buf_siz, int prefix) + { + char *timestr; + char *tmp; + time_t now; + +- char *buf_cur = buf; ++ if( buf_siz) *buf = '\0'; ++ size_t buf_len = 0; ++ ++#define BUF_ADD(ptr, siz, off, fmt...) \ ++ snprintf(((ptr)+(off)), ((siz) > (off) ? (siz)-(off) : 0), ##fmt) + + if (prefix) { + now = (time_t) GET_VALUE(0).ui32; +@@ -116,127 +120,191 @@ + *tmp = '\0'; + + /* print time and hostname */ +- buf_cur += sprintf(buf_cur, "%.15s %s", timestr, hostname); ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "%.15s %s", timestr, hostname); + } + + if (*(char *) GET_VALUE(1).ptr) +- buf_cur += sprintf(buf_cur, " %s", (char *) GET_VALUE(1).ptr); ++ { ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, " %s", (char *) GET_VALUE(1).ptr); ++ } + +- buf_cur += sprintf(buf_cur," IN=%s OUT=%s ", +- (char *) GET_VALUE(2).ptr, +- (char *) GET_VALUE(3).ptr); ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len," IN=%s OUT=%s ", ++ (char *) GET_VALUE(2).ptr, ++ (char *) GET_VALUE(3).ptr); + + /* FIXME: configurable */ +- buf_cur += sprintf(buf_cur, "MAC=%s ", +- (GET_FLAGS(4) & ULOGD_RETF_VALID) ? (char *) GET_VALUE(4).ptr : ""); +- +- buf_cur += sprintf(buf_cur, "SRC=%s ", +- inet_ntoa((struct in_addr) {htonl(GET_VALUE(5).ui32)})); +- buf_cur += sprintf(buf_cur, "DST=%s ", +- inet_ntoa((struct in_addr) {htonl(GET_VALUE(6).ui32)})); +- +- buf_cur += sprintf(buf_cur,"LEN=%u TOS=%02X PREC=0x%02X TTL=%u ID=%u ", +- GET_VALUE(7).ui16, GET_VALUE(8).ui8 & IPTOS_TOS_MASK, +- GET_VALUE(8).ui8 & IPTOS_PREC_MASK, GET_VALUE(9).ui8, +- GET_VALUE(10).ui16); ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "MAC=%s ", ++ (GET_FLAGS(4) & ULOGD_RETF_VALID) ? (char *) GET_VALUE(4).ptr : ""); ++ ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "SRC=%s ", ++ inet_ntoa((struct in_addr) {htonl(GET_VALUE(5).ui32)})); ++ ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "DST=%s ", ++ inet_ntoa((struct in_addr) {htonl(GET_VALUE(6).ui32)})); ++ ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, ++ "LEN=%u TOS=%02X PREC=0x%02X TTL=%u ID=%u ", ++ GET_VALUE(7).ui16, GET_VALUE(8).ui8 & IPTOS_TOS_MASK, ++ GET_VALUE(8).ui8 & IPTOS_PREC_MASK, GET_VALUE(9).ui8, ++ GET_VALUE(10).ui16); + + if (GET_VALUE(10).ui16 & IP_RF) +- buf_cur += sprintf(buf_cur, "CE "); ++ { ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "CE "); ++ } + + if (GET_VALUE(11).ui16 & IP_DF) +- buf_cur += sprintf(buf_cur, "DF "); ++ { ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "DF "); ++ } + + if (GET_VALUE(11).ui16 & IP_MF) +- buf_cur += sprintf(buf_cur, "MF "); ++ { ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "MF "); ++ } + + if (GET_VALUE(11).ui16 & IP_OFFMASK) +- buf_cur += sprintf(buf_cur, "FRAG:%u ", ++ { ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "FRAG:%u ", + GET_VALUE(11).ui16 & IP_OFFMASK); ++ } + + switch (GET_VALUE(12).ui8) { + + case IPPROTO_TCP: +- buf_cur += sprintf(buf_cur, "PROTO=TCP "); +- buf_cur += sprintf(buf_cur, "SPT=%u DPT=%u ", +- GET_VALUE(13).ui16, GET_VALUE(14).ui16); ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "PROTO=TCP "); ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "SPT=%u DPT=%u ", ++ GET_VALUE(13).ui16, GET_VALUE(14).ui16); + /* FIXME: config */ +- buf_cur += sprintf(buf_cur, "SEQ=%u ACK=%u ", +- GET_VALUE(15).ui32, GET_VALUE(16).ui32); +- +- buf_cur += sprintf(buf_cur, "WINDOW=%u ", GET_VALUE(17).ui16); ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "SEQ=%u ACK=%u ", ++ GET_VALUE(15).ui32, GET_VALUE(16).ui32); ++ ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, ++ "WINDOW=%u ", GET_VALUE(17).ui16); + +-// buf_cur += sprintf(buf_cur, "RES=0x%02x ", ++// buf_len = strlen(buf); ++// BUF_ADD(buf,buf_siz,buf_len, "RES=0x%02x ", + + if (GET_VALUE(18).b) +- buf_cur += sprintf(buf_cur, "URG "); ++ { ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "URG "); ++ } + + if (GET_VALUE(19).b) +- buf_cur += sprintf(buf_cur, "ACK "); ++ { ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "ACK "); ++ } + + if (GET_VALUE(20).b) +- buf_cur += sprintf(buf_cur, "PSH "); ++ { ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "PSH "); ++ } + + if (GET_VALUE(21).b) +- buf_cur += sprintf(buf_cur, "RST "); ++ { ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "RST "); ++ } + + if (GET_VALUE(22).b) +- buf_cur += sprintf(buf_cur, "SYN "); ++ { ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "SYN "); ++ } + + if (GET_VALUE(23).b) +- buf_cur += sprintf(buf_cur, "FIN "); ++ { ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "FIN "); ++ } + +- buf_cur += sprintf(buf_cur, "URGP=%u ", GET_VALUE(24).ui16); ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "URGP=%u ", GET_VALUE(24).ui16); + + break; + case IPPROTO_UDP: + +- buf_cur += sprintf(buf_cur, "PROTO=UDP "); ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "PROTO=UDP "); + +- buf_cur += sprintf(buf_cur, "SPT=%u DPT=%u LEN=%u ", ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "SPT=%u DPT=%u LEN=%u ", + GET_VALUE(25).ui16, GET_VALUE(26).ui16, + GET_VALUE(27).ui16); + break; + case IPPROTO_ICMP: + +- buf_cur += sprintf(buf_cur, "PROTO=ICMP "); ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "PROTO=ICMP "); + +- buf_cur += sprintf(buf_cur, "TYPE=%u CODE=%u ", ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "TYPE=%u CODE=%u ", + GET_VALUE(28).ui8, GET_VALUE(29).ui8); + + switch (GET_VALUE(28).ui8) { + case ICMP_ECHO: + case ICMP_ECHOREPLY: +- buf_cur += sprintf(buf_cur, "ID=%u SEQ=%u ", ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "ID=%u SEQ=%u ", + GET_VALUE(30).ui16, + GET_VALUE(31).ui16); + break; + case ICMP_PARAMETERPROB: +- buf_cur += sprintf(buf_cur, "PARAMETER=%u ", ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "PARAMETER=%u ", + GET_VALUE(32).ui32 >> 24); + break; + case ICMP_REDIRECT: +- buf_cur += sprintf(buf_cur, "GATEWAY=%s ", inet_ntoa((struct in_addr) {htonl(GET_VALUE(32).ui32)})); ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "GATEWAY=%s ", inet_ntoa((struct in_addr) {htonl(GET_VALUE(32).ui32)})); + break; + case ICMP_DEST_UNREACH: + if (GET_VALUE(29).ui8 == ICMP_FRAG_NEEDED) +- buf_cur += sprintf(buf_cur, "MTU=%u ", ++ { ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "MTU=%u ", + GET_VALUE(33).ui16); ++ } + break; + } + break; + case IPPROTO_ESP: + case IPPROTO_AH: +- buf_cur += sprintf(buf_cur, "PROTO=%s ", GET_VALUE(12).ui8 == IPPROTO_ESP ? "ESP" : "AH"); ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "PROTO=%s ", GET_VALUE(12).ui8 == IPPROTO_ESP ? "ESP" : "AH"); + /* FIXME: "INCOMPLETE [%u bytes]" in case of short pkt */ + if (intr_ids[34].id > 0) { +- buf_cur += sprintf(buf_cur, "SPI=0x%x ", GET_VALUE(34).ui32); ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "SPI=0x%x ", GET_VALUE(34).ui32); + } + break; + default: + +- buf_cur += sprintf(buf_cur, "PROTO=%u ", GET_VALUE(12).ui8); ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "PROTO=%u ", GET_VALUE(12).ui8); + } +- strcat(buf_cur, "\n"); ++ buf_len = strlen(buf); ++ BUF_ADD(buf,buf_siz,buf_len, "\n"); ++ ++#undef BUF_ADD + + return 0; + } +--- extensions/printpkt.h ++++ extensions/printpkt.h 2007/01/10 13:13:23 +@@ -1,7 +1,7 @@ + #ifndef _PRINTPKT_H + #define _PRINTPKT_H + +-int printpkt_print(ulog_iret_t *res, char *buf, int prefix); ++int printpkt_print(ulog_iret_t *res, char *buf, size_t buf_siz, int prefix); + int printpkt_init(void); + + #endif +--- extensions/ulogd_LOGEMU.c ++++ extensions/ulogd_LOGEMU.c 2007/01/10 13:13:23 +@@ -67,7 +67,7 @@ + { + static char buf[4096]; + +- printpkt_print(res, buf, 1); ++ printpkt_print(res, buf, sizeof(buf), 1); + + fprintf(of, "%s", buf); + +--- extensions/ulogd_SYSLOG.c ++++ extensions/ulogd_SYSLOG.c 2007/01/10 13:13:23 +@@ -61,7 +61,7 @@ + { + static char buf[4096]; + +- printpkt_print(res, buf, 0); ++ printpkt_print(res, buf, sizeof(buf), 0); + syslog(syslog_level|syslog_facility, buf); + + return 0; +--- mysql/ulogd_MYSQL.c ++++ mysql/ulogd_MYSQL.c 2007/01/10 13:13:23 +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + + #ifdef DEBUG_MYSQL + #define DEBUGP(x, args...) fprintf(stderr, x, ## args) +@@ -61,6 +62,9 @@ + /* buffer for our insert statement */ + static char *stmt; + ++/* size of our insert statement buffer */ ++static size_t stmt_siz; ++ + /* pointer to the beginning of the "VALUES" part */ + static char *stmt_val; + +@@ -130,71 +134,85 @@ + + if (!res || !IS_VALID((*res))) { + /* no result, we have to fake something */ +- sprintf(stmt_ins, "NULL,"); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "NULL,"); + stmt_ins = stmt + strlen(stmt); + continue; + } + + switch (res->type) { + case ULOGD_RET_INT8: +- sprintf(stmt_ins, "%d,", res->value.i8); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%d,", res->value.i8); + break; + case ULOGD_RET_INT16: +- sprintf(stmt_ins, "%d,", res->value.i16); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%d,", res->value.i16); + break; + case ULOGD_RET_INT32: +- sprintf(stmt_ins, "%d,", res->value.i32); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%d,", res->value.i32); + break; + case ULOGD_RET_INT64: +- sprintf(stmt_ins, "%lld,", res->value.i64); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%"PRId64",", res->value.i64); + break; + case ULOGD_RET_UINT8: +- sprintf(stmt_ins, "%u,", res->value.ui8); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%u,", res->value.ui8); + break; + case ULOGD_RET_UINT16: +- sprintf(stmt_ins, "%u,", res->value.ui16); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%u,", res->value.ui16); + break; + case ULOGD_RET_IPADDR: + #ifdef IP_AS_STRING + memset(&addr, 0, sizeof(addr)); + addr.s_addr = ntohl(res->value.ui32); +- *stmt_ins++ = '\''; + tmpstr = inet_ntoa(addr); ++ if(stmt_siz > (stmt_ins-stmt)+(strlen(tmpstr)*2)+4) ++ { ++ *stmt_ins++ = '\''; + #ifdef OLD_MYSQL +- mysql_escape_string(stmt_ins, tmpstr, +- strlen(tmpstr)); ++ mysql_escape_string(stmt_ins, tmpstr, ++ strlen(tmpstr)); + #else +- mysql_real_escape_string(dbh, stmt_ins, +- tmpstr, +- strlen(tmpstr)); ++ mysql_real_escape_string(dbh, stmt_ins, ++ tmpstr, ++ strlen(tmpstr)); + #endif /* OLD_MYSQL */ +- stmt_ins = stmt + strlen(stmt); +- sprintf(stmt_ins, "',"); ++ stmt_ins = stmt + strlen(stmt); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "',"); ++ } ++ else ++ { ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "'',"); ++ } + break; + #endif /* IP_AS_STRING */ + /* EVIL: fallthrough when logging IP as + * u_int32_t */ + case ULOGD_RET_UINT32: +- sprintf(stmt_ins, "%u,", res->value.ui32); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%u,", res->value.ui32); + break; + case ULOGD_RET_UINT64: +- sprintf(stmt_ins, "%llu,", res->value.ui64); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%"PRIu64",", res->value.ui64); + break; + case ULOGD_RET_BOOL: +- sprintf(stmt_ins, "'%d',", res->value.b); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "'%d',", res->value.b); + break; + case ULOGD_RET_STRING: +- *stmt_ins++ = '\''; ++ if(stmt_siz > (stmt_ins-stmt)+(strlen(res->value.ptr)*2)+4) ++ { ++ *stmt_ins++ = '\''; + #ifdef OLD_MYSQL +- mysql_escape_string(stmt_ins, res->value.ptr, +- strlen(res->value.ptr)); ++ mysql_escape_string(stmt_ins, res->value.ptr, ++ strlen(res->value.ptr)); + #else +- mysql_real_escape_string(dbh, stmt_ins, +- res->value.ptr, strlen(res->value.ptr)); ++ mysql_real_escape_string(dbh, stmt_ins, ++ res->value.ptr, strlen(res->value.ptr)); + #endif +- stmt_ins = stmt + strlen(stmt); +- sprintf(stmt_ins, "',"); +- /* sprintf(stmt_ins, "'%s',", res->value.ptr); */ ++ stmt_ins = stmt + strlen(stmt); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "',"); ++ } ++ else ++ { ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "'',"); ++ } ++ /* snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "'%s',", res->value.ptr); */ + break; + case ULOGD_RET_RAW: + ulogd_log(ULOGD_NOTICE, +@@ -230,7 +248,7 @@ + static int mysql_createstmt(void) + { + struct _field *f; +- unsigned int size; ++ size_t size; + char buf[ULOGD_MAX_KEYLEN]; + char *underscore; + +@@ -241,7 +259,7 @@ + } + + /* caclulate the size for the insert statement */ +- size = strlen(MYSQL_INSERTTEMPL) + strlen(table_ce.u.string); ++ size = strlen(MYSQL_INSERTTEMPL) + strlen(table_ce.u.string) + 1; + + for (f = fields; f; f = f->next) { + /* we need space for the key and a comma, as well as +@@ -252,25 +270,26 @@ + ulogd_log(ULOGD_DEBUG, "allocating %u bytes for statement\n", size); + + stmt = (char *) malloc(size); +- + if (!stmt) { + ulogd_log(ULOGD_ERROR, "OOM!\n"); + return -1; + } ++ stmt_siz = size; + +- sprintf(stmt, "insert into %s (", table_ce.u.string); ++ snprintf(stmt, stmt_siz, "insert into %s (", table_ce.u.string); + stmt_val = stmt + strlen(stmt); + + for (f = fields; f; f = f->next) { +- strncpy(buf, f->name, ULOGD_MAX_KEYLEN); ++ strncpy(buf, f->name, ULOGD_MAX_KEYLEN-1); ++ buf[ULOGD_MAX_KEYLEN-1] = '\0'; + while ((underscore = strchr(buf, '.'))) + *underscore = '_'; +- sprintf(stmt_val, "%s,", buf); ++ snprintf(stmt_val, stmt_siz-(stmt_val-stmt), "%s,", buf); + stmt_val = stmt + strlen(stmt); + } + *(stmt_val - 1) = ')'; + +- sprintf(stmt_val, " values ("); ++ snprintf(stmt_val, stmt_siz-(stmt_val-stmt), " values ("); + stmt_val = stmt + strlen(stmt); + + ulogd_log(ULOGD_DEBUG, "stmt='%s'\n", stmt); +@@ -298,7 +317,8 @@ + while ((field = mysql_fetch_field(result))) { + + /* replace all underscores with dots */ +- strncpy(buf, field->name, ULOGD_MAX_KEYLEN); ++ strncpy(buf, field->name, ULOGD_MAX_KEYLEN-1); ++ buf[ULOGD_MAX_KEYLEN-1] = '\0'; + while ((underscore = strchr(buf, '_'))) + *underscore = '.'; + +@@ -317,7 +337,8 @@ + ulogd_log(ULOGD_ERROR, "OOM!\n"); + return 1; + } +- strncpy(f->name, buf, ULOGD_MAX_KEYLEN); ++ strncpy(f->name, buf, ULOGD_MAX_KEYLEN-1); ++ f->name[ULOGD_MAX_KEYLEN-1] = '\0'; + f->id = id; + f->next = fields; + fields = f; +--- pgsql/ulogd_PGSQL.c ++++ pgsql/ulogd_PGSQL.c 2007/01/10 13:13:23 +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + + #ifdef DEBUG_PGSQL +@@ -39,6 +40,9 @@ + /* buffer for our insert statement */ + static char *stmt; + ++/* size of our insert statement buffer */ ++static size_t stmt_siz; ++ + /* pointer to the beginning of the "VALUES" part */ + static char *stmt_val; + +@@ -120,62 +124,78 @@ + + if (!res || !IS_VALID((*res))) { + /* no result, we have to fake something */ +- sprintf(stmt_ins, "NULL,"); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "NULL,"); + stmt_ins = stmt + strlen(stmt); + continue; + } + + switch (res->type) { + case ULOGD_RET_INT8: +- sprintf(stmt_ins, "%d,", res->value.i8); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%d,", res->value.i8); + break; + case ULOGD_RET_INT16: +- sprintf(stmt_ins, "%d,", res->value.i16); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%d,", res->value.i16); + break; + case ULOGD_RET_INT32: +- sprintf(stmt_ins, "%d,", res->value.i32); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%d,", res->value.i32); + break; + case ULOGD_RET_INT64: +- sprintf(stmt_ins, "%lld,", res->value.i64); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%"PRId64",", res->value.i64); + break; + case ULOGD_RET_UINT8: +- sprintf(stmt_ins, "%u,", res->value.ui8); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%u,", res->value.ui8); + break; + case ULOGD_RET_UINT16: +- sprintf(stmt_ins, "%u,", res->value.ui16); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%u,", res->value.ui16); + break; + case ULOGD_RET_IPADDR: + #ifdef IP_AS_STRING +- *stmt_ins++ = '\''; + memset(&addr, 0, sizeof(addr)); + addr.s_addr = ntohl(res->value.ui32); + tmpstr = (char *)inet_ntoa(addr); +- PQescapeString(stmt_ins,tmpstr,strlen(tmpstr)); +- stmt_ins = stmt + strlen(stmt); +- sprintf(stmt_ins, "',"); ++ if(stmt_siz > (stmt_ins-stmt)+(strlen(tmpstr)*2)+4) ++ { ++ *stmt_ins++ = '\''; ++ PQescapeString(stmt_ins,tmpstr,strlen(tmpstr)); ++ stmt_ins = stmt + strlen(stmt); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "',"); ++ } ++ else ++ { ++ ulogd_log(ULOGD_NOTICE,"%s: pgsql - no space to add escaped ip string to insert statement\n"); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "'',"); ++ } + break; + #endif /* IP_AS_STRING */ + /* EVIL: fallthrough when logging IP as + * u_int32_t */ + + case ULOGD_RET_UINT32: +- sprintf(stmt_ins, "%u,", res->value.ui32); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%u,", res->value.ui32); + break; + case ULOGD_RET_UINT64: +- sprintf(stmt_ins, "%llu,", res->value.ui64); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "%"PRIu64",", res->value.ui64); + break; + case ULOGD_RET_BOOL: +- sprintf(stmt_ins, "'%d',", res->value.b); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "'%d',", res->value.b); + break; + case ULOGD_RET_STRING: +- *stmt_ins++ = '\''; +- PQescapeString(stmt_ins,res->value.ptr,strlen(res->value.ptr)); +- stmt_ins = stmt + strlen(stmt); +- sprintf(stmt_ins, "',"); ++ if(stmt_siz > (stmt_ins-stmt)+(strlen(res->value.ptr)*2)+4) ++ { ++ *stmt_ins++ = '\''; ++ PQescapeString(stmt_ins,res->value.ptr,strlen(res->value.ptr)); ++ stmt_ins = stmt + strlen(stmt); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "',"); ++ } ++ else ++ { ++ ulogd_log(ULOGD_NOTICE,"%s: pgsql - no space to add escaped string to insert statement\n"); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "'',"); ++ } + break; + case ULOGD_RET_RAW: + ulogd_log(ULOGD_NOTICE,"%s: pgsql doesn't support type RAW\n",res->key); +- sprintf(stmt_ins, "NULL,"); ++ snprintf(stmt_ins, stmt_siz-(stmt_ins-stmt), "NULL,"); + break; + default: + ulogd_log(ULOGD_NOTICE, +@@ -205,12 +225,13 @@ + /* Determine if server support schemas */ + static int pgsql_namespace(void) { + PGresult *result; +- char pgbuf[strlen(PGSQL_HAVE_NAMESPACE_TEMPLATE)+strlen(schema_ce.u.string)+1]; ++ size_t pgbuf_siz = strlen(PGSQL_HAVE_NAMESPACE_TEMPLATE)+strlen(schema_ce.u.string)+1; ++ char pgbuf[pgbuf_siz]; + + if (!dbh) + return 1; + +- sprintf(pgbuf, PGSQL_HAVE_NAMESPACE_TEMPLATE, schema_ce.u.string); ++ snprintf(pgbuf, pgbuf_siz, PGSQL_HAVE_NAMESPACE_TEMPLATE, schema_ce.u.string); + ulogd_log(ULOGD_DEBUG, "%s\n", pgbuf); + + result = PQexec(dbh, pgbuf); +@@ -265,25 +286,27 @@ + ulogd_log(ULOGD_ERROR, "OOM!\n"); + return 1; + } ++ stmt_siz = size; + + if (pgsql_have_schemas) { +- sprintf(stmt, "insert into %s.%s (", schema_ce.u.string, table_ce.u.string); ++ snprintf(stmt, stmt_siz, "insert into %s.%s (", schema_ce.u.string, table_ce.u.string); + } else { +- sprintf(stmt, "insert into %s (", table_ce.u.string); ++ snprintf(stmt, stmt_siz, "insert into %s (", table_ce.u.string); + } + + stmt_val = stmt + strlen(stmt); + + for (f = fields; f; f = f->next) { +- strncpy(buf, f->name, ULOGD_MAX_KEYLEN); ++ strncpy(buf, f->name, ULOGD_MAX_KEYLEN-1); ++ buf[ULOGD_MAX_KEYLEN-1] = '\0'; + while ((underscore = strchr(buf, '.'))) + *underscore = '_'; +- sprintf(stmt_val, "%s,", buf); ++ snprintf(stmt_val, stmt_siz-(stmt_val-stmt), "%s,", buf); + stmt_val = stmt + strlen(stmt); + } + *(stmt_val - 1) = ')'; + +- sprintf(stmt_val, " values ("); ++ snprintf(stmt_val, stmt_siz-(stmt_val-stmt), " values ("); + stmt_val = stmt + strlen(stmt); + + ulogd_log(ULOGD_DEBUG, "stmt='%s'\n", stmt); +@@ -331,7 +354,8 @@ + for (intaux=0; intauxname, buf, ULOGD_MAX_KEYLEN); ++ strncpy(f->name, buf, ULOGD_MAX_KEYLEN-1); ++ f->name[ULOGD_MAX_KEYLEN-1] = '\0'; + f->id = id; + f->next = fields; + fields = f; +@@ -384,32 +409,34 @@ + if (port) + len += 20; + +- connstr = (char *) malloc(len); ++ connstr = (char *) malloc(len+1); + if (!connstr) + return 1; + + if (server) { +- strcpy(connstr, " host="); +- strcat(connstr, server); ++ strncpy(connstr, " host=", len); ++ connstr[len] = '\0'; ++ strncat(connstr, server, len-strlen(connstr)); + } + + if (port) { + char portbuf[20]; + snprintf(portbuf, sizeof(portbuf), " port=%u", port); +- strcat(connstr, portbuf); ++ strncat(connstr, portbuf, len-strlen(connstr)); + } + +- strcat(connstr, " dbname="); +- strcat(connstr, db); +- strcat(connstr, " user="); +- strcat(connstr, user); ++ strncat(connstr, " dbname=", len-strlen(connstr)); ++ strncat(connstr, db, len-strlen(connstr)); ++ strncat(connstr, " user=", len-strlen(connstr)); ++ strncat(connstr, user, len-strlen(connstr)); + + if (pass) { +- strcat(connstr, " password="); +- strcat(connstr, pass); ++ strncat(connstr, " password=", len-strlen(connstr)); ++ strncat(connstr, pass, len-strlen(connstr)); + } + + dbh = PQconnectdb(connstr); ++ free(connstr); + if (PQstatus(dbh)!=CONNECTION_OK) { + exit_nicely(dbh); + return 1; +--- sqlite3/ulogd_SQLITE3.c ++++ sqlite3/ulogd_SQLITE3.c 2007/01/10 13:13:23 +@@ -55,6 +55,9 @@ + /* buffer for our insert statement */ + static char *stmt; + ++/* size of our insert statement buffer */ ++static size_t stmt_siz; ++ + /* pointer to the final prepared statement */ + static sqlite3_stmt *p_stmt; + +@@ -193,7 +196,7 @@ + static int _sqlite3_createstmt(void) + { + struct _field *f; +- unsigned int size; ++ size_t size; + char buf[ULOGD_MAX_KEYLEN]; + char *underscore; + char *stmt_pos; +@@ -207,7 +210,7 @@ + } + + /* caclulate the size for the insert statement */ +- size = strlen(_SQLITE3_INSERTTEMPL) + strlen(table_ce.u.string); ++ size = strlen(_SQLITE3_INSERTTEMPL) + strlen(table_ce.u.string) + 1; + + DEBUGP("initial size: %u\n", size); + +@@ -230,29 +233,31 @@ + ulogd_log(ULOGD_ERROR, "OOM!\n"); + return 1; + } ++ stmt_siz = size; + +- sprintf(stmt, "insert into %s (", table_ce.u.string); ++ snprintf(stmt, stmt_siz, "insert into %s (", table_ce.u.string); + stmt_pos = stmt + strlen(stmt); + + for (f = fields; f; f = f->next) { +- strncpy(buf, f->name, ULOGD_MAX_KEYLEN); ++ strncpy(buf, f->name, ULOGD_MAX_KEYLEN-1); ++ buf[ULOGD_MAX_KEYLEN-1] = '\0'; + while ((underscore = strchr(buf, '.'))) + *underscore = '_'; +- sprintf(stmt_pos, "%s,", buf); ++ snprintf(stmt_pos, stmt_siz-(stmt_pos-stmt), "%s,", buf); + stmt_pos = stmt + strlen(stmt); + } + + *(stmt_pos - 1) = ')'; + +- sprintf(stmt_pos, " values ("); ++ snprintf(stmt_pos, stmt_siz-(stmt_pos-stmt), " values ("); + stmt_pos = stmt + strlen(stmt); + + for (i = 0; i < col_count - 1; i++) { +- sprintf(stmt_pos,"?,"); ++ snprintf(stmt_pos, stmt_siz-(stmt_pos-stmt), "?,"); + stmt_pos += 2; + } + +- sprintf(stmt_pos, "?)"); ++ snprintf(stmt_pos, stmt_siz-(stmt_pos-stmt), "?)"); + ulogd_log(ULOGD_DEBUG, "stmt='%s'\n", stmt); + + DEBUGP("about to prepare statement.\n"); +@@ -277,7 +282,7 @@ + static int _sqlite3_get_columns(const char *table) + { + char buf[ULOGD_MAX_KEYLEN]; +- char query[SQLITE_SELECT_LEN + CONFIG_VAL_STRING_LEN] = "select * from \0"; ++ char query[SQLITE_SELECT_LEN + CONFIG_VAL_STRING_LEN + 1] = "select * from \0"; + char *underscore; + struct _field *f; + sqlite3_stmt *schema_stmt; +@@ -288,8 +293,8 @@ + if (!dbh) + return 1; + +- strncat(query,table,LINE_LEN); +- ++ strncat(query,table,sizeof(query)-strlen(query)-1); ++ + result = sqlite3_prepare(dbh,query,-1,&schema_stmt,0); + + if (result != SQLITE_OK) +@@ -297,7 +302,8 @@ + + for (column = 0; column < sqlite3_column_count(schema_stmt); column++) { + /* replace all underscores with dots */ +- strncpy(buf, sqlite3_column_name(schema_stmt,column), ULOGD_MAX_KEYLEN); ++ strncpy(buf, sqlite3_column_name(schema_stmt,column), ULOGD_MAX_KEYLEN-1); ++ buf[ULOGD_MAX_KEYLEN-1] = '\0'; + while ((underscore = strchr(buf, '_'))) + *underscore = '.'; + +@@ -316,7 +322,8 @@ + ulogd_log(ULOGD_ERROR, "OOM!\n"); + return 1; + } +- strncpy(f->name, buf, ULOGD_MAX_KEYLEN); ++ strncpy(f->name, buf, ULOGD_MAX_KEYLEN-1); ++ f->name[ULOGD_MAX_KEYLEN-1] = '\0'; + f->id = id; + f->next = fields; + fields = f; +--- extensions/ulogd_PWSNIFF.c.orig 2007-01-30 01:06:52.000000000 +0200 ++++ extensions/ulogd_PWSNIFF.c 2007-01-30 01:07:12.000000000 +0200 +@@ -116,7 +116,7 @@ + return NULL; + } + strncpy(ret[0].value.ptr, (char *)begp, len); +- *((char *)ret[0].value.ptr + len + 1) = '\0'; ++ *((char *)ret[0].value.ptr + len) = '\0'; + } + if (pw_len) { + ret[1].value.ptr = (char *) malloc(pw_len+1); +@@ -126,7 +126,7 @@ + return NULL; + } + strncpy(ret[1].value.ptr, (char *)pw_begp, pw_len); +- *((char *)ret[1].value.ptr + pw_len + 1) = '\0'; ++ *((char *)ret[1].value.ptr + pw_len) = '\0'; + + } + return ret; --- ulogd-1.24.orig/debian/patches/z_fix_no_format_argument.patch +++ ulogd-1.24/debian/patches/z_fix_no_format_argument.patch @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' ulogd-1.24/extensions/ulogd_SYSLOG.c ulogd-1.24.new/extensions/ulogd_SYSLOG.c +--- ulogd-1.24/extensions/ulogd_SYSLOG.c 2008-07-27 16:39:19.000000000 +0200 ++++ ulogd-1.24.new/extensions/ulogd_SYSLOG.c 2008-07-27 16:39:41.000000000 +0200 +@@ -62,7 +62,7 @@ + static char buf[4096]; + + printpkt_print(res, buf, sizeof(buf), 0); +- syslog(syslog_level|syslog_facility, buf); ++ syslog(syslog_level|syslog_facility, "%s", buf); + + return 0; + } --- ulogd-1.24.orig/debian/patches/ulogd_conf.patch +++ ulogd-1.24/debian/patches/ulogd_conf.patch @@ -0,0 +1,46 @@ +diff -Nur ulogd-1.23/ulogd.8 ulogd-1.23.new/ulogd.8 +--- ulogd-1.23/ulogd.8 2004-03-24 00:36:03.000000000 +0200 ++++ ulogd-1.23.new/ulogd.8 2007-03-18 13:06:31.000000000 +0200 +@@ -45,7 +45,7 @@ + .SH FILES + .I /etc/ulogd.conf + .br +-.I /var/log/ulogd.log ++.I /var/log/ulog/ulogd.log + .SH SEE ALSO + There is more documentation about the daemon and the database plugins + (including examples) in the directories +diff -Nur ulogd-1.23/ulogd.conf.in ulogd-1.23.new/ulogd.conf.in +--- ulogd-1.23/ulogd.conf.in 2005-04-18 17:18:45.000000000 +0300 ++++ ulogd-1.23.new/ulogd.conf.in 2007-03-18 13:06:21.000000000 +0200 +@@ -11,7 +11,7 @@ + nlgroup=1 + + # logfile for status messages +-logfile="/var/log/ulogd.log" ++logfile="/var/log/ulog/ulogd.log" + + # loglevel: debug(1), info(3), notice(5), error(7) or fatal(8) + loglevel=5 +@@ -50,11 +50,11 @@ + + + [LOGEMU] +-file="/var/log/ulogd.syslogemu" ++file="/var/log/ulog/syslogemu.log" + sync=1 + + [OPRINT] +-file="/var/log/ulogd.pktlog" ++file="/var/log/ulog/pktlog.log" + + [MYSQL] + table="ulog" +@@ -77,6 +77,6 @@ + buffer=200 + + [PCAP] +-file="/var/log/ulogd.pcap" ++file="/var/log/ulog/pcap.log" + sync=1 + --- ulogd-1.24.orig/debian/po/ro.po +++ ulogd-1.24/debian/po/ro.po @@ -0,0 +1,50 @@ +# translation of ro.po to Romanian +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Eddy Petrișor , 2007. +msgid "" +msgstr "" +"Project-Id-Version: ro\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-04-21 04:29+0300\n" +"PO-Revision-Date: 2007-03-01 01:54+0200\n" +"Last-Translator: Eddy Petrișor \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "Configuration syntax has changed" +msgstr "S-a schimbat sintaxa pentru configurare" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "Sintaxa fişierului de configurare /etc/ulogd.conf s-a schimbat. Probabil că trebuie să vă actualizaţi fişierul de configurare să folosească noua sintaxă. ulogd va ignora un fişier de configurare de tip vechi sau nu va reuşi deloc să pornească!" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "A se vedea /usr/share/doc/ulogd/examples/ulogd.conf pentru mai multe detalii." + --- ulogd-1.24.orig/debian/po/it.po +++ ulogd-1.24/debian/po/it.po @@ -0,0 +1,37 @@ +# translation of ulogd_1.23-2_templates.po to italian +# Copyright Luca Bruno , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: ulogd_1.23-2_templates\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-04-21 04:29+0300\n" +"PO-Revision-Date: 2005-06-26 20:48+0200\n" +"Last-Translator: Luca Bruno \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "Configuration syntax has changed" +msgstr "La sintassi per la configurazione e cambiata" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "La sintassi del file di configurazione /etc/ulogd.conf e cambiata. Probabilmente e necessario aggiornare la propria configurazione alla nuova sintassi. ulogd ignorera una configurazione vecchio stile, o non partira del tutto!" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "Consultare /usr/share/doc/ulogd/examples/ulogd.conf per i dettagli." + --- ulogd-1.24.orig/debian/po/vi.po +++ ulogd-1.24/debian/po/vi.po @@ -0,0 +1,38 @@ +# Vietnamese translation for ULogD. +# Copyright © 2005 Free Software Foundation, Inc. +# Clytie Siddall , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: ulogd 1.23-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-04-21 04:29+0300\n" +"PO-Revision-Date: 2005-08-19 22:44+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: LocFactoryEditor 1.2.2\n" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "Configuration syntax has changed" +msgstr "Cú pháp cấu hình đã thay đổi rồi." + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "Cú pháp của tập tin cấu hình « /etc/ulogd.conf » đã thay đổi rồi. Rất có thể là bạn cần phải nâng cấp cấu hình mình lên cú pháp mới. • Trình nền ulogd sẽ không dùng cấu hình cũ, hoặc sẽ không khởi chạy cả. •" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "Hãy xem tập tin « /usr/share/doc/ulogd/examples/ulogd.conf » để tìm chi tiết." --- ulogd-1.24.orig/debian/po/gl.po +++ ulogd-1.24/debian/po/gl.po @@ -0,0 +1,39 @@ +# Galician translation of ulogd's debconf templates +# This file is distributed under the same license as the ulogd package. +# Jacobo Tarrio , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: ulogd\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-31 04:33+0100\n" +"PO-Revision-Date: 2007-02-24 20:22+0100\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "Configuration syntax has changed" +msgstr "A sintaxe do ficheiro de configuración cambiou" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "" +"A sintaxe do ficheiro de configuración /etc/ulogd.conf cambiou. Seguramente " +"teña que actualizar a súa configuración á nova sintaxe. ulogd ha ignorar a " +"configuración antiga, ou incluso pode non poderse iniciar en absoluto." + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "Consulte /usr/share/doc/ulogd/examples/ulogd.conf para máis detalles." --- ulogd-1.24.orig/debian/po/ja.po +++ ulogd-1.24/debian/po/ja.po @@ -0,0 +1,40 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: ulogd 1.23-7\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-02-26 04:33+0100\n" +"PO-Revision-Date: 2007-03-04 13:00+0900\n" +"Last-Translator: TANAKA, Atushi \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "Configuration syntax has changed" +msgstr "設定の構文が変わりました" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "" +"設定ファイル /etc/ulogd.conf の構文が変わりました。恐らくあなたの設定を" +"新しい構文へアップグレードする必要があるでしょう。 ulogd は古い構文の" +"設定を無視するか、起動に失敗するでしょう!" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "詳細は /usr/share/doc/ulogd/examples/ulogd.conf を参照してください。" --- ulogd-1.24.orig/debian/po/cs.po +++ ulogd-1.24/debian/po/cs.po @@ -0,0 +1,48 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: ulogd\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-04-21 04:29+0300\n" +"PO-Revision-Date: 2005-06-19 14:17+0200\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "Configuration syntax has changed" +msgstr "Syntaxe konfiguračního souboru se změnila" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "" +"Syntaxe konfiguračního souboru /etc/ulogd.conf se změnila. Budete muset " +"přepsat svou konfiguraci podle nových pravidel. ulogd bude starou " +"konfiguraci ignorovat, nebo se dokonce odmítne spustit." + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "Podrobnosti naleznete v /usr/share/doc/ulogd/examples/ulogd.conf." --- ulogd-1.24.orig/debian/po/ca.po +++ ulogd-1.24/debian/po/ca.po @@ -0,0 +1,42 @@ +# +# Catalan translations for ulogd package. +# Copyright (C) 2007 Achilleas Kotsis. +# This file is distributed under the same license as the ulogd package. +# +# Jordà Polo , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: 1.23-6\n" +"Report-Msgid-Bugs-To: achille@debian.gr\n" +"POT-Creation-Date: 2007-01-31 04:33+0100\n" +"PO-Revision-Date: 2007-02-24 22:52+0100\n" +"Last-Translator: Jordà Polo \n" +"Language-Team: Català \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "Configuration syntax has changed" +msgstr "Ha canviat la sintaxi de la configuració" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "" +"La sintaxi del fitxer /etc/ulogd.conf ha canviat. És possible que necessiteu " +"actualitzar la vostra configuració a la nova sintaxi. ulogd no reconeixerà " +"l'antic estil de configuració, i fins i tot pot fallar del tot en iniciar-se!" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "Per a més detalls, vegeu /usr/share/doc/ulogd/examples/ulogd.conf." --- ulogd-1.24.orig/debian/po/sv.po +++ ulogd-1.24/debian/po/sv.po @@ -0,0 +1,48 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: ulogd 1.23-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-04-21 04:29+0300\n" +"PO-Revision-Date: 2005-10-04 06:51+0200\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "Configuration syntax has changed" +msgstr "Syntaxen fr konfigurationen har ndrats" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "" +"Syntaxen i konfigurationsfilen /etc/ulogd.conf har ndrats. Du behver " +"antagligen uppgradera din konfiguration till den nya syntaxen. ulogd kommer " +"inte att anvnda den gamla konfigurationen eller inte klara att starta upp alls." + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "Se /usr/share/doc/ulogd/examples/ulogd.conf fr mer detaljer." + --- ulogd-1.24.orig/debian/po/es.po +++ ulogd-1.24/debian/po/es.po @@ -0,0 +1,65 @@ +# ulogd translation to spanish +# Copyright (C) 2007 Free Software Foundation, Inc. +# This file is distributed under the same license as the package. +# +# Changes: +# - Initial translation +# Javier Ruano Ruano , 2007 +# +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas y normas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Si tiene dudas o consultas sobre esta traducción consulte con el último +# traductor (campo Last-Translator) y ponga en copia a la lista de +# traducción de Debian al español () +# +msgid "" +msgstr "" +"Project-Id-Version: ulogd\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-13 20:25+0100\n" +"PO-Revision-Date: 2007-01-23 02:48+0100\n" +"Last-Translator: Javier Ruano Ruano \n" +"Language-Team: Debian L10n Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "Configuration syntax has changed" +msgstr "Ha cambiado la sintaxis de configuración" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "" +"Ha cambiado la sintaxis del fichero de configuración «/etc/ulogd.conf». Probablemente" +" necesitará adaptar su configuración a la nueva sintaxis. Ulogd desdeñará " +"el antiguo formato de configuración o al iniciarse fallará completamente." + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "Véase para más detalles «/usr/share/doc/ulogd/examples/ulogd.conf»" --- ulogd-1.24.orig/debian/po/templates.pot +++ ulogd-1.24/debian/po/templates.pot @@ -0,0 +1,46 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-04-21 04:29+0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "Configuration syntax has changed" +msgstr "" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "" --- ulogd-1.24.orig/debian/po/nl.po +++ ulogd-1.24/debian/po/nl.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: ulogd\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-02-26 04:33+0100\n" +"PO-Revision-Date: 2007-03-07 20:56+0100\n" +"Last-Translator: Bart Cornelis \n" +"Language-Team: debian-l10n-dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "Configuration syntax has changed" +msgstr "De configuratiesyntaxis is veranderd." + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "/etc/ulogd.conf configuration file syntax has changed. You probably need to upgrade your configuration to the new syntax. ulogd will disregard an old style configuration, or fail to start completely!" +msgstr "De syntaxis van het configuratiebestand /etc/ulogd.conf is veranderd. Waarschijnlijk moet u uw configuratie bijwerken. ulogd negeert configuratie in de oude stijl, en start dan helemaal niet op!" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "Meer informatie vindt u in /usr/share/doc/ulogd/examples/ulogd.conf ." + --- ulogd-1.24.orig/debian/po/POTFILES.in +++ ulogd-1.24/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] ulogd.templates --- ulogd-1.24.orig/debian/po/de.po +++ ulogd-1.24/debian/po/de.po @@ -0,0 +1,44 @@ +# translation of ulogd to german +# Copyright (C) 2006 Alwin Meschede +# This file is distributed under the same license as the ulogd package. +# +msgid "" +msgstr "" +"Project-Id-Version: ulogd 1.23-5\n" +"Report-Msgid-Bugs-To: ulogd@bugs.debian.org\n" +"POT-Creation-Date: 2006-10-19 01:36+0200\n" +"PO-Revision-Date: 2006-12-09 21:24+0100\n" +"Last-Translator: Alwin Meschede \n" +"Language-Team: german \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "Configuration syntax has changed" +msgstr "Geänderte Konfigurations-Syntax" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "" +"Die Syntax der Konfigurationsdatei /etc/ulogd.conf hat sich geändert. " +"Wahrscheinlich müssen Sie Ihre Konfiguration auf die neue Syntax umstellen. " +"ulogd wird eine Konfiguration im alten Stil nicht beachten und kann " +"möglicherweise nicht starten!" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "Schauen Sie sich die Hinweise in " +"/usr/share/doc/ulogd/examples/ulogd.conf an." + --- ulogd-1.24.orig/debian/po/el.po +++ ulogd-1.24/debian/po/el.po @@ -0,0 +1,48 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: ulogd 1.23-7\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-04-21 04:29+0300\n" +"PO-Revision-Date: 2007-03-13 07:30+0200\n" +"Last-Translator: Faidon Liambotis \n" +"Language-Team: Greek \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "Configuration syntax has changed" +msgstr "Η σύνταξη του αρχείου ρυθμίσεων άλλαξε" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "" +"Η σύνταξη του αρχείου ρυθμίσεων /etc/ulogd.conf άλλαξε. Θα χρειαστεί να " +"αλλάξετε το αρχείο ρυθμίσεων στη νέα σύνταξη ειδάλλως ο ulogd είτε θα " +"αγνοήσει το παλαιό αρχείο ρυθμίσεων ή θα αποτύχει να εκκινηθεί!" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "Για περισσότερες πληροφορίες ανατρέξτε στο /usr/share/doc/ulogd/examples/ulogd.conf" --- ulogd-1.24.orig/debian/po/ta.po +++ ulogd-1.24/debian/po/ta.po @@ -0,0 +1,47 @@ +# translation of ulogd.po to TAMIL +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Dr.T.Vasudevan , 2007. +msgid "" +msgstr "" +"Project-Id-Version: ulogd\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-04-21 04:29+0300\n" +"PO-Revision-Date: 2007-02-25 21:36+0530\n" +"Last-Translator: Dr.T.Vasudevan \n" +"Language-Team: TAMIL \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "Configuration syntax has changed" +msgstr "வடிவமைப்பு யாப்பு மாறிவிட்டது" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "வடிவமைப்பு கோப்பான /etc/ulogd.conf இன் யாப்பு மாறி விட்டது. நீங்கள் புதிய முறைக்கு மாற வேண்டும். யூலாக்டி பழைய பாணி வடிவமைப்பை உதாசீனப் படுத்தும். அல்லது முழுமையாக துவங்க மறுக்கும்." + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "விவரங்களுக்கு /usr/share/doc/ulogd/examples/ulogd.conf ஐ பார்க்கவும்." + --- ulogd-1.24.orig/debian/po/eu.po +++ ulogd-1.24/debian/po/eu.po @@ -0,0 +1,52 @@ +# translation of ulogd-templates.po to Baque +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Piarres Beobide , 2007. +msgid "" +msgstr "" +"Project-Id-Version: ulogd-templates\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-04-21 04:29+0300\n" +"PO-Revision-Date: 2007-02-25 23:55+0100\n" +"Last-Translator: Piarres Beobide \n" +"Language-Team: librezale \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "Configuration syntax has changed" +msgstr "Konfigurazio sintaxia aldatu egin da" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "" +"/etc/ulogd.conf konfigurazio fitxategia aldatu egin da. Ziurrenik zure " +"konfigurazioa sintaxi berrira eguneratu beharko duzu. ulogd-ek ziurrenik " +"ez dio jaramonik egingo estilo zaharreko konfigurazio bati edo huts egingo du " +"abiaraztean!" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "/usr/share/doc/ulogd/examples/ulogd.conf begiratu xehetasunetarako." + --- ulogd-1.24.orig/debian/po/fr.po +++ ulogd-1.24/debian/po/fr.po @@ -0,0 +1,52 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: ulogd 1.29\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-04-21 04:29+0300\n" +"PO-Revision-Date: 2005-05-10 08:45+0200\n" +"Last-Translator: Jean-Luc Coulon (f5ibh) \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "Configuration syntax has changed" +msgstr "Changement de la syntaxe du fichier de configuration" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "" +"La syntaxe du fichier de configuration /etc/ulogd.conf a chang. Il " +"vous faudra sans doute mettre jour ce fichier en utilisant la nouvelle " +"syntaxe. Si vous conservez un fichier utilisant l'ancienne syntaxe, il sera " +"ignor ou empchera le dmarrage d'ulogd." + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "" +"Veuillez consulter /usr/share/doc/ulogd/examples/ulogd.conf pour davantage " +"d'informations." + + --- ulogd-1.24.orig/debian/po/pt.po +++ ulogd-1.24/debian/po/pt.po @@ -0,0 +1,41 @@ +# Portuguese translation ulogs's debconf messages +# Copyright (C) 2007 Miguel Figueiredo +# This file is distributed under the same license as the ulogd package. +# Miguel Figueiredo , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: ulogd 1.23-6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-31 04:33+0100\n" +"PO-Revision-Date: 2007-02-24 22:48+0000\n" +"Last-Translator: Miguel Figueiredo \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "Configuration syntax has changed" +msgstr "A sintaxe da configuração mudou" + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "" +"A sintaxe do ficheiro de configuração /etc/ulogd.conf mudou. Você " +"provavelmente tem de actualizar a sua configuração para a nova sintaxe. " +"O ulogd irá ignorar a configuração no estilo antigo, ou mesmo falhar a " +"iniciação." + +#. Type: note +#. Description +#: ../ulogd.templates:1001 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "Para detalhes veja /usr/share/doc/ulogd/examples/ulogd.conf" --- ulogd-1.24.orig/debian/po/ru.po +++ ulogd-1.24/debian/po/ru.po @@ -0,0 +1,53 @@ +# translation of ulogd_1.23-7_debconf_ru.po to Russian +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Yuri Kozlov , 2007. +msgid "" +msgstr "" +"Project-Id-Version: 1.23-7\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-04-21 04:29+0300\n" +"PO-Revision-Date: 2007-02-26 21:13+0300\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "Configuration syntax has changed" +msgstr "Изменился конфигурационный синтаксис" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "" +"/etc/ulogd.conf configuration file syntax has changed. You probably need to " +"upgrade your configuration to the new syntax. ulogd will disregard an old " +"style configuration, or fail to start completely!" +msgstr "" +"Изменился синтаксис конфигурационного файла /etc/ulogd.conf. " +"Вероятно, вам придётся изменить ваш конфигурационный " +"файл в соответствии с новым синтаксисом. ulogd может " +"обработать старую конфигурацию неправильно или вообще не " +"запуститься!" + +#. Type: note +#. Description +#: ../ulogd.templates:3 +msgid "See /usr/share/doc/ulogd/examples/ulogd.conf for details." +msgstr "Подробней смотрите в файле /usr/share/doc/ulogd/examples/ulogd.conf." + --- ulogd-1.24.orig/debian/include/linux/netfilter_ipv4/ipt_ULOG.h +++ ulogd-1.24/debian/include/linux/netfilter_ipv4/ipt_ULOG.h @@ -0,0 +1,49 @@ +/* Header file for IP tables userspace logging, Version 1.8 + * + * (C) 2000-2002 by Harald Welte + * + * Distributed under the terms of GNU GPL */ + +#ifndef _IPT_ULOG_H +#define _IPT_ULOG_H + +#ifndef NETLINK_NFLOG +#define NETLINK_NFLOG 5 +#endif + +#define ULOG_DEFAULT_NLGROUP 1 +#define ULOG_DEFAULT_QTHRESHOLD 1 + +#define ULOG_MAC_LEN 80 +#define ULOG_PREFIX_LEN 32 + +#define ULOG_MAX_QLEN 50 +/* Why 50? Well... there is a limit imposed by the slab cache 131000 + * bytes. So the multipart netlink-message has to be < 131000 bytes. + * Assuming a standard ethernet-mtu of 1500, we could define this up + * to 80... but even 50 seems to be big enough. */ + +/* private data structure for each rule with a ULOG target */ +struct ipt_ulog_info { + unsigned int nl_group; + size_t copy_range; + size_t qthreshold; + char prefix[ULOG_PREFIX_LEN]; +}; + +/* Format of the ULOG packets passed through netlink */ +typedef struct ulog_packet_msg { + unsigned long mark; + long timestamp_sec; + long timestamp_usec; + unsigned int hook; + char indev_name[IFNAMSIZ]; + char outdev_name[IFNAMSIZ]; + size_t data_len; + char prefix[ULOG_PREFIX_LEN]; + unsigned char mac_len; + unsigned char mac[ULOG_MAC_LEN]; + unsigned char payload[0]; +} ulog_packet_msg_t; + +#endif /*_IPT_ULOG_H*/ --- ulogd-1.24.orig/debian/examples/ulogd.conf +++ ulogd-1.24/debian/examples/ulogd.conf @@ -0,0 +1,82 @@ +# Example configuration for ulogd +# $Id: ulogd.conf.in 714 2005-02-19 21:33:43Z laforge $ +# Adapted to Debian by Achilleas Kotsis + +[global] +###################################################################### +# GLOBAL OPTIONS +###################################################################### + +# netlink multicast group (the same as the iptables --ulog-nlgroup param) +nlgroup=1 + +# logfile for status messages +logfile="/var/log/ulog/ulogd.log" + +# loglevel: debug(1), info(3), notice(5), error(7) or fatal(8) +loglevel=5 + +# 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/ulog/syslogemu.log" +sync=1 + +[OPRINT] +file="/var/log/ulog/pktlog.log" + +[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/ulog/pcap.log" +sync=1 +