Hello community, here is the log from the commit of package ulogd2 for openSUSE:Factory checked in at Wed Feb 2 01:58:45 CET 2011. -------- --- ulogd2/ulogd2.changes 2010-02-23 23:33:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/ulogd2/ulogd2.changes 2011-02-01 14:27:51.000000000 +0100 @@ -1,0 +2,19 @@ +Tue Feb 1 13:27:22 UTC 2011 - jengelh@medozas.de + +- Add init script +- Install config file + +------------------------------------------------------------------- +Wed Sep 15 09:17:44 UTC 2010 - jengelh@medozas.de + +- 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 - jengelh@medozas.de + +- New upstream release 2.0.0~beta4 + * new XML output plugin for packet and log-based logging + * several fixes, improvements + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ulogd-2.0.0beta3.tar.bz2 New: ---- etc-init.d-ulogd ulogd-2.0.0~beta4+git32.tar.bz2 ulogd-conf.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ulogd2.spec ++++++ --- /var/tmp/diff_new_pack.CZ6uhQ/_old 2011-02-02 01:57:51.000000000 +0100 +++ /var/tmp/diff_new_pack.CZ6uhQ/_new 2011-02-02 01:57:51.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package ulogd2 (Version 2.0.0.beta3) +# spec file for package ulogd2 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -18,20 +18,24 @@ Name: ulogd2 -Version: 2.0.0.beta3 +Version: 2.0.0.beta4 Release: 1 -%define llver 2.0.0beta3 +%define pkname ulogd +%define llver 2.0.0~beta4+git32 Group: Productivity/Networking/Security Summary: Userspace logging for Netfilter License: GPL Url: http://netfilter.org/projects/ulogd/ Source: ulogd-%llver.tar.bz2 +Source2: etc-init.d-ulogd +Patch1: ulogd-conf.diff BuildRequires: libnetfilter_conntrack-devel libnfnetlink-devel BuildRequires: libnetfilter_log-devel lksctp-tools-devel pkg-config BuildRequires: libmysqlclient-devel libpcap-devel postgresql-devel BuildRequires: sqlite3-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(pre): /usr/sbin/useradd %description ulogd is a userspace logging daemon for netfilter/iptables related @@ -107,51 +111,64 @@ Ben La Monica <ben.lamonica@gmail.com> %prep -%setup -qn ulogd-%llver +%setup -qn ulogd2 +%patch -P 1 -p1 %build -%configure --disable-static --libexecdir=%_libexecdir/%name \ - --with-pcap-lib=%_libdir -make %{?_smp_mflags} pkglibdir='${libexecdir}'; +if [ ! -e configure ]; then + ./autogen.sh; +fi; +%configure --disable-static --with-pcap-lib=%_libdir +make %{?_smp_mflags}; %install b="%buildroot"; rm -Rf "$b"; mkdir -p "$b"; -make install DESTDIR="$b" pkglibdir='${libexecdir}'; +make install DESTDIR="$b"; find "$b" -type f -iname "*.la" -delete; - -%clean -rm -Rf "%buildroot"; +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"; + +%pre +/usr/bin/getent passwd ulogd >/dev/null || \ +/usr/sbin/useradd -c "Userspace logging daemon for Netfilter" -r ulogd || : %files %defattr(-,root,root) +%config(noreplace) %_sysconfdir/ulogd.conf +%_initrddir/%name %_sbindir/* -%dir %_libexecdir/%name -%_libexecdir/%name/ulogd_[fir]*.so* -%_libexecdir/%name/ulogd_output_IPFIX.so* -%_libexecdir/%name/ulogd_output_LOGEMU.so* -%_libexecdir/%name/ulogd_output_NACCT.so* -%_libexecdir/%name/ulogd_output_OPRINT.so* -%_libexecdir/%name/ulogd_output_SYSLOG.so* +%dir %_libexecdir/%pkname +%_libexecdir/%pkname/ulogd_[fir]*.so* +%_libexecdir/%pkname/ulogd_output_LOGEMU.so* +%_libexecdir/%pkname/ulogd_output_NACCT.so* +%_libexecdir/%pkname/ulogd_output_OPRINT.so* +%_libexecdir/%pkname/ulogd_output_SYSLOG.so* +%_libexecdir/%pkname/ulogd_output_XML.so* %_mandir/*/* +%attr(0750,ulogd,root) /var/log/ulogd # These are the dependency-heavy things: %files mysql %defattr(-,root,root) -%_libexecdir/ulogd2/ulogd_output_MYSQL.so* +%_libexecdir/%pkname/ulogd_output_MYSQL.so* %files pcap %defattr(-,root,root) -%_libexecdir/%name/ulogd_output_PCAP.so* +%_libexecdir/%pkname/ulogd_output_PCAP.so* %files pgsql %defattr(-,root,root) -%_libexecdir/%name/ulogd_output_PGSQL.so* +%_libexecdir/%pkname/ulogd_output_PGSQL.so* %files sqlite3 %defattr(-,root,root) -%_libexecdir/%name/ulogd_output_SQLITE3.so* +%_libexecdir/%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-conf.diff ++++++ --- ulogd.conf.in | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 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 <achille@debian.gr> [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 @@ -53,9 +52,6 @@ plugin="@pkglibexecdir@/ulogd_raw2packet # 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 @@ -144,24 +140,19 @@ 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 [xml1] -directory="/var/log/" +directory="/var/log/ulogd/" sync=1 [pcap1] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org