Hello community, here is the log from the commit of package ulogd2 for openSUSE:12.2 checked in at 2012-07-10 13:27:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/ulogd2 (Old) and /work/SRC/openSUSE:12.2/.ulogd2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ulogd2", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-07-06 19:40:38.919402255 +0200 +++ /work/SRC/openSUSE:12.2/.ulogd2.new/ulogd2.changes 2012-07-10 13:27:14.000000000 +0200 @@ -0,0 +1,40 @@ +------------------------------------------------------------------- +Wed Jan 4 22:15:59 UTC 2012 - [email protected] + +- build description update +- git snapshot 2.0.0~beta4+git51 +* pcap: add file option to configuration file +* ulogd: fix segfault if syslog and SIGTERM is received +* sqlite3 backend: remove automatic creation of table "daily" +* add nfacct and GPRINT plugins +- add systemd service file + +------------------------------------------------------------------- +Thu Dec 1 16:49:39 UTC 2011 - [email protected] + +- add libtool as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Tue Feb 1 13:27:22 UTC 2011 - [email protected] + +- Add init script +- Install config file + +------------------------------------------------------------------- +Wed Sep 15 09:17:44 UTC 2010 - [email protected] + +- Added /var/log/ulogd, and gave it to the newly-created user + "ulogd". (http://bugzilla.netfilter.org/show_bug.cgi?id=665) + +------------------------------------------------------------------- +Fri Jul 16 19:12:56 UTC 2010 - [email protected] + +- New upstream release 2.0.0~beta4 + * new XML output plugin for packet and log-based logging + * several fixes, improvements + +------------------------------------------------------------------- +Tue Feb 23 22:32:41 UTC 2010 - [email protected] + +- Initial upload, version 2.0.0~beta3 + Old: ---- _link New: ---- etc-init.d-ulogd ulogd-2.0.0~beta4+git51.tar.xz ulogd-automake.diff ulogd-buffer.diff ulogd-conf.diff ulogd-libmnl.diff ulogd-pcap.diff ulogd.service ulogd2.changes ulogd2.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ulogd2.spec ++++++ # # spec file for package ulogd2 # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: ulogd2 Version: 2.0.0.beta4 Release: 0 %define pkname ulogd %define llver 2.0.0~beta4+git51 Summary: Userspace logging for Netfilter License: GPL-2.0 Group: Productivity/Networking/Security Url: http://netfilter.org/projects/ulogd/ #Git-Clone: git://git.netfilter.org/ulogd2 %define git_snapshot 1 Source: ulogd-%llver.tar.xz Source2: etc-init.d-ulogd Source3: ulogd.service Patch1: ulogd-automake.diff Patch2: ulogd-libmnl.diff Patch3: ulogd-buffer.diff Patch4: ulogd-conf.diff Patch5: ulogd-pcap.diff BuildRequires: autoconf BuildRequires: automake >= 1.6 BuildRequires: libpcap-devel BuildRequires: libtool BuildRequires: lksctp-tools-devel BuildRequires: pkgconfig >= 0.21 BuildRequires: postgresql-devel BuildRequires: pkgconfig(libmnl) >= 1.0.0 BuildRequires: pkgconfig(libnetfilter_acct) >= 1.0.0 BuildRequires: pkgconfig(libnetfilter_conntrack) >= 0.0.95 BuildRequires: pkgconfig(libnetfilter_log) >= 1.0.0 BuildRequires: pkgconfig(libnfnetlink) >= 0.0.39 %if 0%{?suse_version} BuildRequires: libmysqlclient-devel BuildRequires: sqlite3-devel %endif BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1210 BuildRequires: systemd %systemd_requires %endif %if 0%{?suse_version} Requires(postun): %insserv_prereq %endif Requires(pre): /usr/sbin/useradd %description ulogd is a userspace logging daemon for netfilter/iptables related logging. This includes per-packet logging of security violations, per-packet logging for accounting purpose as well as per-flow logging. %package mysql Summary: MySQL output target for ulogd2 Group: Productivity/Networking/Security Requires: %name = %version-%release %description mysql MySQL output target for ulogd2. %package pcap Summary: pcap output target for ulogd2 Group: Productivity/Networking/Security Requires: %name = %version-%release %description pcap pcap output target for ulogd2. %package pgsql Summary: PostgreSQL output target for ulogd2 Group: Productivity/Networking/Security Requires: %name = %version-%release %description pgsql PostgreSQL output target for ulogd2. %package sqlite3 Summary: SQLite3 output target for ulogd2 Group: Productivity/Networking/Security Requires: %name = %version-%release %description sqlite3 SQLite3 output target for ulogd2. %prep %setup -qn ulogd2 %patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1 %build autoreconf -fi; %configure --disable-static make %{?_smp_mflags}; %install b="%buildroot"; make install DESTDIR="$b"; find "$b" -type f -iname "*.la" -delete; mkdir -p "$b/var/log/ulogd"; mkdir -p "$b/%_sysconfdir"; install -pm0644 ulogd.conf "$b/%_sysconfdir/"; mkdir -p "$b/%_initrddir" "$b/%_sbindir"; install -pm0755 "%{S:2}" "$b/%_initrddir/%name"; ln -s "%_initrddir/%name" "$b/%_sbindir/rc%name"; %if 0%{?_unitdir:1} mkdir -p "$b/%_unitdir"; install -pm0644 "%{S:3}" "$b/%_unitdir"; %endif %pre /usr/bin/getent passwd ulogd >/dev/null || \ /usr/sbin/useradd -c "Userspace logging daemon for Netfilter" -r ulogd || : %if 0%{?_unitdir:1} %service_add_pre ulogd.service %endif %if 0%{?_unitdir:1} %post %service_add_post ulogd.service %endif %preun %if 0%{?suse_version} %stop_on_removal ulogd %endif %if 0%{?_unitdir:1} %service_del_preun ulogd.service %endif %postun %if 0%{?suse_version} %insserv_cleanup %endif %if 0%{?_unitdir:1} %service_del_postun ulogd.service %endif %files %defattr(-,root,root) %config(noreplace) %_sysconfdir/ulogd.conf %_initddir/ulogd2 %_sbindir/ulogd %_sbindir/rculogd2 %dir %_libdir/%pkname %_libdir/%pkname/ulogd_[fir]*.so* %_libdir/%pkname/ulogd_output_GPRINT.so* %_libdir/%pkname/ulogd_output_LOGEMU.so* %_libdir/%pkname/ulogd_output_NACCT.so* %_libdir/%pkname/ulogd_output_OPRINT.so* %_libdir/%pkname/ulogd_output_SYSLOG.so* %_libdir/%pkname/ulogd_output_XML.so* %_mandir/*/* %attr(0750,ulogd,root) /var/log/ulogd %if 0%{?_unitdir:1} %_unitdir/ulogd.service %endif # These are the dependency-heavy things: %files mysql %defattr(-,root,root) %_libdir/%pkname/ulogd_output_MYSQL.so* %files pcap %defattr(-,root,root) %_libdir/%pkname/ulogd_output_PCAP.so* %files pgsql %defattr(-,root,root) %_libdir/%pkname/ulogd_output_PGSQL.so* %files sqlite3 %defattr(-,root,root) %_libdir/%pkname/ulogd_output_SQLITE3.so* %changelog ++++++ etc-init.d-ulogd ++++++ #!/bin/bash ### BEGIN INIT INFO # Provides: ulogd2 # Required-Start: $remote_fs # Required-Stop: $remote_fs # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Description: Userspace logging daemon for Netfilter # Short-Description: Userspace logging daemon for Netfilter ### END INIT INFO . /etc/rc.status; rc_reset; daemon_bin="/usr/sbin/ulogd"; rc_reset; case "$1" in (start) echo -n "Starting ulogd"; checkproc "$daemon_bin" && echo " (already running)"; startproc -s "$daemon_bin" -u ulogd; rc_status -v; ;; (stop) echo -n "Shutting down ulogd"; checkproc "$daemon_bin" || echo -n " (not running)"; killproc "$daemon_bin"; rc_status -v; ;; (status) echo -n "Checking for ulogd"; checkproc "$daemon_bin"; rc_status -v; ;; (reload) echo -n "Reloading ulogd"; # not supported rc_failed 3; rc_status -v; ;; (restart) "$0" stop; "$0" start; rc_status; ;; (try-restart) "$0" status >/dev/null && "$0" restart; rc_status; ;; (*) echo "Usage: $0 {start|stop|status|try-restart|restart}"; exit 1; ;; esac; rc_exit; ++++++ ulogd-automake.diff ++++++ --- configure.ac | 1 + 1 file changed, 1 insertion(+) Index: ulogd2/configure.ac =================================================================== --- ulogd2.orig/configure.ac +++ ulogd2/configure.ac @@ -14,6 +14,7 @@ AC_PROG_MAKE_SET AC_PROG_CC AC_PROG_INSTALL AC_DISABLE_STATIC +AM_PROG_AR AC_PROG_LIBTOOL dnl Checks for libraries. ++++++ ulogd-buffer.diff ++++++ In file included from /usr/include/string.h:642:0, from ulogd_output_SQLITE3.c:34: In function 'strncat', inlined from 'db_count_cols' at ulogd_output_SQLITE3.c:306:9, inlined from 'sqlite3_init_db' at ulogd_output_SQLITE3.c:328:11: /usr/include/bits/string3.h:152:3: warning: call to __builtin___strncat_chk might overflow destination buffer [enabled by default] I: Statement might be overflowing a buffer in strncat. Common mistake: BAD: strncat(buffer,charptr,sizeof(buffer)) is wrong, it takes the left over size as 3rd argument GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1) E: ulogd2 bufferoverflowstrncat ulogd_output_SQLITE3.c:328:11 --- output/sqlite3/ulogd_output_SQLITE3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: ulogd2/output/sqlite3/ulogd_output_SQLITE3.c =================================================================== --- ulogd2.orig/output/sqlite3/ulogd_output_SQLITE3.c +++ ulogd2/output/sqlite3/ulogd_output_SQLITE3.c @@ -303,7 +303,7 @@ db_count_cols(struct ulogd_pluginstance struct sqlite3_priv *priv = (void *)pi->private; char query[SELECT_ALL_LEN + CONFIG_VAL_STRING_LEN] = SELECT_ALL_STR; - strncat(query, table_ce(pi), LINE_LEN); + strncat(query, table_ce(pi), sizeof(query) - strlen(query) - 1); if (sqlite3_prepare(priv->dbh, query, -1, stmt, 0) != SQLITE_OK) return -1; ++++++ ulogd-conf.diff ++++++ --- ulogd.conf.in | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) Index: ulogd2/ulogd.conf.in =================================================================== --- ulogd2.orig/ulogd.conf.in +++ ulogd2/ulogd.conf.in @@ -1,15 +1,14 @@ # Example configuration for ulogd -# $Id$ -# Adapted to Debian by Achilleas Kotsis <[email protected]> [global] ###################################################################### # GLOBAL OPTIONS ###################################################################### +user="ulogd" # logfile for status messages -logfile="/var/log/ulogd.log" +logfile="/var/log/ulogd/ulogd.log" # loglevel: debug(1), info(3), notice(5), error(7) or fatal(8) loglevel=1 @@ -56,9 +55,6 @@ plugin="@pkglibdir@/ulogd_inpflow_NFACCT # this is a stack for packet-based logging via LOGEMU #stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU -# this is a stack for ULOG packet-based logging via LOGEMU -#stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU - # this is a stack for packet-based logging via LOGEMU with filtering on MARK #stack=log2:NFLOG,mark1:MARK,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU @@ -159,34 +155,29 @@ numeric_label=1 # you can label the log #netlink_socket_buffer_maxsize=1085440 #bind=1 -[ulog1] -# netlink multicast group (the same as the iptables --ulog-nlgroup param) -nlgroup=1 -#numeric_label=0 # optional argument - [nuauth1] socket_path="/tmp/nuauth_ulogd2.sock" [emu1] -file="/var/log/ulogd_syslogemu.log" +file="/var/log/ulogd/syslogemu.log" sync=1 [op1] -file="/var/log/ulogd_oprint.log" +file="/var/log/ulogd/oprint.log" sync=1 [gp1] -file="/var/log/ulogd_gprint.log" +file="/var/log/ulogd/gprint.log" sync=1 timestamp=1 [xml1] -directory="/var/log/" +directory="/var/log/ulogd/" sync=1 [pcap1] #default file is /var/log/ulogd.pcap -#file=/var/log/ulogd.pcap +file=/var/log/ulogd/ulogd.pcap sync=1 [mysql1] @@ -240,12 +231,12 @@ procedure="INSERT_PACKET_FULL" [sqlite3_ct] table="ulog_ct" -db="/var/log/ulogd.sqlite3db" +db="/var/log/ulogd/ulogd.sqlite3db" buffer=200 [sqlite3_pkt] table="ulog_pkt" -db="/var/log/ulogd.sqlite3db" +db="/var/log/ulogd/ulogd.sqlite3db" buffer=200 [sys2] @@ -253,7 +244,7 @@ facility=LOG_LOCAL2 [nacct1] sync = 1 -#file = /var/log/ulogd_nacct.log +#file = /var/log/ulogd/nacct.log [mark1] mark = 1 ++++++ ulogd-libmnl.diff ++++++ From: Jan Engelhardt <[email protected]> build: resolve nfacct plugin compile failure CC ulogd_inpflow_NFACCT_la-ulogd_inpflow_NFACCT.lo ulogd_inpflow_NFACCT.c:24:27: fatal error: libmnl/libmnl.h: No such file or directory compilation terminated. --- input/sum/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: ulogd2/input/sum/Makefile.am =================================================================== --- ulogd2.orig/input/sum/Makefile.am +++ ulogd2/input/sum/Makefile.am @@ -1,8 +1,8 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include $(LIBNETFILTER_ACCT_CFLAGS) $(LIBMNL_CFLAGS) AM_CFLAGS = ${regular_CFLAGS} pkglib_LTLIBRARIES = ulogd_inpflow_NFACCT.la ulogd_inpflow_NFACCT_la_SOURCES = ulogd_inpflow_NFACCT.c -ulogd_inpflow_NFACCT_la_LDFLAGS = -avoid-version -module $(LIBMNL_LIBS) $(LIBNETFILTER_ACCT_LIBS) -ulogd_inpflow_NFACCT_la_CFLAGS = $(AM_CFLAGS) $(LIBMNL_LIBS) $(LIBNETFILTER_ACCT_CFLAGS) +ulogd_inpflow_NFACCT_la_LDFLAGS = -avoid-version -module +ulogd_inpflow_NFACCT_la_LIBADD = $(LIBMNL_LIBS) $(LIBNETFILTER_ACCT_LIBS) ++++++ ulogd-pcap.diff ++++++ pcap is not found reliably by either --with-pcap=%_prefix or --with-pcap-lib=%_libdir --with-pcap-inc=%_includedir. If you have any special paths, just use ./configure CPPFLAGS="-I/my/pcap" LDFLAGS="-L/my/pcap" --- configure.ac | 7 +++---- output/pcap/Makefile.am | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) Index: ulogd2/configure.ac =================================================================== --- ulogd2.orig/configure.ac +++ ulogd2/configure.ac @@ -20,7 +20,9 @@ AC_PROG_LIBTOOL dnl Checks for libraries. AC_SEARCH_LIBS([dlopen], [dl], [libdl_LIBS="$LIBS"; LIBS=""]) AC_SUBST([libdl_LIBS]) -AC_CHECK_HEADER(pcap.h,HAVE_PCAP_H=true) +AC_SEARCH_LIBS([pcap_close], [pcap], [libpcap_LIBS="-lpcap"; LIBS=""]) +AC_SUBST([libpcap_LIBS]) +AM_CONDITIONAL([HAVE_PCAP], test -n "$libpcap_LIBS"]) dnl Checks for header files. AC_HEADER_DIRENT @@ -59,8 +61,6 @@ AM_CONDITIONAL([HAVE_SQLITE3], [test -n CT_CHECK_DBI() AM_CONDITIONAL(HAVE_DBI, test "x$DBI_LIB" != "x") -CT_CHECK_PCAP() -AM_CONDITIONAL(HAVE_PCAP, test "x$HAVE_PCAP_LIB" != "x") dnl AC_SUBST(DATABASE_DIR) @@ -71,7 +71,6 @@ dnl AC_SUBST(EXTRA_MYSQL_DEF) dnl AC_SUBST(EXTRA_PGSQL_DEF) dnl AC_SUBST(DATABASE_DRIVERS) -dnl AC_SUBST(HAVE_PCAP_H) dnl AM_CONDITIONAL(HAVE_MYSQL, test x$mysqldir != x) dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x) Index: ulogd2/output/pcap/Makefile.am =================================================================== --- ulogd2.orig/output/pcap/Makefile.am +++ ulogd2/output/pcap/Makefile.am @@ -1,5 +1,5 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include $(PCAP_INC) +AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = ${regular_CFLAGS} if HAVE_PCAP @@ -7,7 +7,7 @@ if HAVE_PCAP pkglib_LTLIBRARIES = ulogd_output_PCAP.la ulogd_output_PCAP_la_SOURCES = ulogd_output_PCAP.c -ulogd_output_PCAP_la_LIBADD = ${PCAP_LIB} +ulogd_output_PCAP_la_LIBADD = ${libpcap_LIBS} ulogd_output_PCAP_la_LDFLAGS = -avoid-version -module endif ++++++ ulogd.service ++++++ [Unit] Description=Userspace logging daemon for NFLOG [Service] ExecStart=/usr/sbin/ulogd -u ulogd [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
