rpms/ulogd/devel ulogd-1.01-logdir.patch, NONE, 1.1 ulogd-1.02-init.patch, NONE, 1.1 ulogd-1.02-pgsql.patch, NONE, 1.1 ulogd.8, NONE, 1.1 ulogd.logrotate, NONE, 1.1 ulogd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Fri Nov 26 13:46:04 UTC 2004
Changeset from: mschwendt
Update of /cvs/extras/rpms/ulogd/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv18491
Modified Files:
.cvsignore sources
Added Files:
ulogd-1.01-logdir.patch ulogd-1.02-init.patch
ulogd-1.02-pgsql.patch ulogd.8 ulogd.logrotate ulogd.spec
Log Message:
Import files from ulogd-1.02-0.fdr.6.2.src.rpm
ulogd-1.01-logdir.patch:
--- NEW FILE ulogd-1.01-logdir.patch ---
--- ulogd-1.01/ulogd.conf.in.logdir 2003-05-04 12:00:10.000000000 +0200
+++ ulogd-1.01/ulogd.conf.in 2003-09-02 16:06:49.000000000 +0200
@@ -10,7 +10,7 @@
nlgroup 1
# 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 5
@@ -43,7 +43,7 @@
# ulogd_LOGEMU.so - simple syslog emulation target
#
# where to write to
-syslogfile /var/log/ulogd.syslogemu
+syslogfile /var/log/ulogd/ulogd.syslogemu
# do we want to fflush() the file after each write?
syslogsync 1
# load the plugin
@@ -54,7 +54,7 @@
# ulogd_OPRINT.so: file for packet dumping
#
# where to write the log
-dumpfile /var/log/ulogd.pktlog
+dumpfile /var/log/ulogd/ulogd.pktlog
# load the plugin (remove the '#'if you want to enable it
#plugin @libdir@/ulogd_OPRINT.so
@@ -84,6 +84,6 @@
#load the plugin (remove the '#' if you want to enable it)
#plugin @libdir@/ulogd_PGSQL.so
-pcapfile /var/log/ulogd.pcap
+pcapfile /var/log/ulogd/ulogd.pcap
pcapsync 1
#plugin @libdir@/ulogd_PCAP.so
ulogd-1.02-init.patch:
--- NEW FILE ulogd-1.02-init.patch ---
--- ./ulogd.init.fedora 2004-10-06 17:49:31.045356298 +0200
+++ ./ulogd.init 2004-10-06 17:51:22.009183728 +0200
@@ -1,12 +1,17 @@
#!/bin/sh
#
-# chkconfig: 345 81 19
+# chkconfig: 2345 11 89
# description: ulogd is the userspace logging daemon for netfilter/iptables
#
. /etc/rc.d/init.d/functions
+# Source networking configuration.
+. /etc/sysconfig/network
+
+# Check that networking is up.
+[ "$NETWORKING" = "no" ] && exit 0
function start()
{
@@ -55,7 +60,7 @@
;;
*)
printf "Usage: %s {start|stop|status|restart|reload}\n" "ulogd"
- exit 1
+ exit 2
esac
exit 0
ulogd-1.02-pgsql.patch:
--- NEW FILE ulogd-1.02-pgsql.patch ---
diff -Nur ulogd-1.02-orig/doc/pgsql.table ulogd-1.02/doc/pgsql.table
--- ulogd-1.02-orig/doc/pgsql.table 2002-08-28 11:42:50.000000000 +0200
+++ ulogd-1.02/doc/pgsql.table 2004-10-31 02:27:49.652607440 +0100
@@ -33,16 +33,16 @@
"ip_csum" integer,
/* log IPs as unsigned int32 (default) */
--- "ip_saddr" bigint,
--- "ip_daddr" bigint,
+ "ip_saddr" bigint,
+ "ip_daddr" bigint,
/* log IPs as string (--with-pgsql-log-ip-as-string) */
-- "ip_saddr" character varying(40),
-- "ip_daddr" character varying(40),
/* log IPs as inet (--with-pgsql-log-ip-as-string) */
- "ip_saddr" inet,
- "ip_daddr" inet,
+-- "ip_saddr" inet,
+-- "ip_daddr" inet,
"tcp_sport" integer,
--- NEW FILE ulogd.8 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH ULOGD 8 "November 05, 2002" "Linux Netfilter"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
ulogd \- netfilter/iptables ULOG daemon
.SH SYNOPSIS
.B ulogd [options]
.SH DESCRIPTION
.B ulogd
connects to the netlink device of the Linux kernel and reads messages
from the netfilter that get queued with the iptables ULOG target. For
this to work you have to compile the ULOG target into your kernel or
load the respective module.
.PP
The received messages can be logged into files or into a mySQL or
PostgreSQL database.
.SH OPTIONS
.TP
.B -d, --daemon
fork ulogd into background (start as daemon)
.TP
.B -c <filename>, --config-file <filename>
use <filename> as configuration file instead of
.I /etc/ulogd.conf
.TP
.B -h, --help
show usage information
.TP
.B -V, --version
show version information and copyright
.SH FILES
.I /etc/ulogd.conf
.br
.I /var/log/ulogd.log
.SH SEE ALSO
There is more documentation about the daemon and the database plugins
(including examples) in the directory
.nf
.br
.I /usr/share/doc/ulogd- at VERSION@
.SH AUTHOR
This manual page was written by Joerg Wendland <joergland at debian.org>,
for the Debian GNU/Linux system (but may be used by others).
--- NEW FILE ulogd.logrotate ---
/var/log/ulogd/ulogd.log /var/log/ulogd/ulogd.syslogemu {
missingok
notifempty
weekly
sharedscripts
postrotate
/etc/init.d/ulogd reload > /dev/null 2>&1
endscript
}
--- NEW FILE ulogd.spec ---
Name: ulogd
Version: 1.02
Release: 6
Summary: The userspace logging daemon for netfilter
License: GPL
Group: System Environment/Daemons
URL: http://gnumonks.org/projects/ulogd
Source: http://ftp.netfilter.org/pub/ulogd/ulogd-%{version}.tar.bz2
Source1: ulogd.logrotate
Source2: ulogd.8
Patch1: ulogd-1.01-logdir.patch
Patch2: ulogd-1.02-init.patch
Patch3: ulogd-1.02-pgsql.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): initscripts, chkconfig
Requires(postun): initscripts, chkconfig
BuildRequires: mysql-devel
BuildRequires: postgresql-devel
#BuildRequires: libpcap-devel
%description
Ulogd is an universal logging daemon for the ULOG target of netfilter, the
Linux 2.4+ firewalling subsystem. Ulogd is able to log packets in various
formats to different targets (text files, databases, etc..). It has an
easy-to-use plugin interface to add new protocols and new output targets.
%package mysql
Summary: MySQL output plugin for ulogd
Group: System Environment/Daemons
Requires: %{name} = %{epoch}:%{version}
%description mysql
Ulogd-mysql is a MySQL output plugin for ulogd. It enables logging of
firewall information into a MySQL database.
%package pgsql
Summary: PostgreSQL output plugin for ulogd
Group: System Environment/Daemons
Requires: %{name} = %{epoch}:%{version}
%description pgsql
Ulogd-mysql is a PostgreSQL output plugin for ulogd. It enables logging of
firewall information into a PostgreSQL database.
%prep
%setup -q
%patch1 -p1 -b .logdir
%patch2 -p1 -b .fedora
%patch3 -p1 -b .bigint
%build
%configure --with-mysql --with-pgsql
# Does not support parallel builds
make
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/ulogd
mkdir -p $RPM_BUILD_ROOT%{_sbindir}/sbin
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
install -m755 ulogd.init $RPM_BUILD_ROOT%{_initrddir}/ulogd
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ulogd
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ulogd
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
sed -e 's/@VERSION@/%{version}/g' %{SOURCE2} > $RPM_BUILD_ROOT%{_mandir}/man8/ulogd.8
gzip $RPM_BUILD_ROOT%{_mandir}/man8/ulogd.8
%post
/sbin/chkconfig --add ulogd
%preun
if [ "$1" = 0 ]; then
/sbin/service ulogd stop > /dev/null 2>&1 ||:
/sbin/chkconfig --del ulogd
fi
%postun
if [ "$1" -ge "1" ]; then
/sbin/service ulogd reload > /dev/null 2>&1 ||:
fi
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,)
%doc COPYING AUTHORS README
%doc doc/ulogd.txt doc/ulogd.a4.ps doc/ulogd.html
%doc doc/mysql.table* doc/pgsql.table
%{_sbindir}/ulogd
%config(noreplace) %{_sysconfdir}/ulogd.conf
%config(noreplace) %{_sysconfdir}/rc.d/init.d/ulogd
%{_libdir}/ulogd
%dir %{_localstatedir}/log/ulogd
%config(noreplace) %{_sysconfdir}/logrotate.d/ulogd
%{_mandir}/man8/ulogd.8.gz
%exclude %{_libdir}/ulogd/ulogd_MYSQL.so
%exclude %{_libdir}/ulogd/ulogd_PGSQL.so
%files mysql
%defattr(0644,root,root,0755)
%{_libdir}/ulogd/ulogd_MYSQL.so
%files pgsql
%defattr(0644,root,root,0755)
%{_libdir}/ulogd/ulogd_PGSQL.so
%changelog
* Sun Oct 31 2004 Aurelien Bompard <gauret[AT]free.fr> 1.02-6
- apply Michael Schwendt's suggestions in bug 1598
* Wed Oct 20 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.02-0.fdr.5
- enable MySQL and PostgreSQL in subpackages
- add man page from Debian
* Wed Oct 06 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.02-0.fdr.4
- apply QA suggestions (bug 1598)
* Sat Jul 10 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.02-0.fdr.3
- disable parallel builds
- add chkconfig to Requires(pre,post)
- set the right mode for /etc/logrotate.d/ulogd
- rotate weekly
* Sun May 16 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.02-0.fdr.2
- Add Epoch: 0
* Sat May 15 2004 Aurelien Bompard <gauret[AT]free.fr> 1.02-0.fdr.1
- initial package
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 24 Nov 2004 05:01:11 -0000 1.1
+++ .cvsignore 26 Nov 2004 13:46:02 -0000 1.2
@@ -0,0 +1 @@
+ulogd-1.02.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 24 Nov 2004 05:01:11 -0000 1.1
+++ sources 26 Nov 2004 13:46:02 -0000 1.2
@@ -0,0 +1 @@
+8ca63ca3371fd818587208d07098f8de ulogd-1.02.tar.bz2
More information about the fedora-extras-commits
mailing list