- merged from Titanium branch, final 2.0.0 version

Changed files:
    ulogd.spec -> 1.52

diff --git a/ulogd.spec b/ulogd.spec
index b6f0c173702d24b66319dd1f6dd7247df34ef5d7..bedba3ad0ab2771ba21545de6e11121aaa5398ef 100644 (file)
--- a/ulogd.spec
+++ b/ulogd.spec
@@ -1,27 +1,31 @@
+%define                beta    beta4
 Summary:       ULOGD - the Userspace Logging Daemon for iptables
 Summary(pl.UTF-8):     Demon logujący w trybie użytkownika dla iptables
 Name:          ulogd
-Version:       1.24
-Release:       6
+Version:       2.0.0
+Release:       0.1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       ftp://ftp.netfilter.org/pub/ulogd/%{name}-%{version}.tar.bz2
-# Source0-md5: 05b4ed2926b9a22aaeaf642917bbf8ff
+# Source0-md5: 211e68781e3860959606fc94b97cf22e
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.logrotate
 Patch0:                %{name}-includes.patch
-Patch1:                %{name}-mysql.patch
-Patch2:                %{name}-BASE.patch
-Patch3:                %{name}-largefile.patch
+Patch1:                %{name}-ac.patch
 URL:           http://netfilter.org/projects/ulogd/
 BuildRequires: autoconf
+BuildRequires: libdbi-devel
+BuildRequires: libnetfilter_acct-devel >= 1.0.0
+BuildRequires: libnetfilter_conntrack-devel >= 0.0.95
+BuildRequires: libnetfilter_log-devel >= 0.0.15
+BuildRequires: libnfnetlink-devel >= 0.0.39
 BuildRequires: libpcap-devel
 BuildRequires: mysql-devel
 BuildRequires: postgresql-devel
-BuildRequires: sqlite3-devel
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
+BuildRequires: sqlite3-devel
 Requires(post):        fileutils
 Requires(post,preun):  /sbin/chkconfig
 Requires:      iptables
@@ -45,6 +49,29 @@ użytkownika w celu logowania. Powinien działać tak:
   - wysłać pakiet poprzez netlink
   - zwrócić natychmiast NF_CONTINUE.
 
+%package devel
+Summary:       Header files for %{name}
+Summary(pl.UTF-8):     Pliki nagłówkowe %{name}
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description devel
+Header files for %{name}.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe %{name}.
+
+%package dbi
+Summary:       DBI plugin for ulogd
+Summary(pl.UTF-8):     Wtyczka DBI dla ulogd
+Group:         Networking/Daemons
+
+%description dbi
+DBI plugin for ulogd.
+
+%description dbi -l pl.UTF-8
+Wtyczka DBI dla ulogd.
+
 %package mysql
 Summary:       MySQL plugin for ulogd
 Summary(pl.UTF-8):     Wtyczka MySQL dla ulogd
@@ -57,6 +84,17 @@ MySQL plugin for ulogd.
 %description mysql -l pl.UTF-8
 Wtyczka MySQL dla ulogd.
 
+%package pcap
+Summary:       PCAP plugin for ulogd
+Summary(pl.UTF-8):     Wtyczka PCAP dla ulogd
+Group:         Networking/Daemons
+
+%description pcap
+PCAP plugin for ulogd.
+
+%description pcap -l pl.UTF-8
+Wtyczka PCAP dla ulogd.
+
 %package pgsql
 Summary:       PostgreSQL plugin for ulogd
 Summary(pl.UTF-8):     Wtyczka PostgreSQL dla ulogd
@@ -83,20 +121,18 @@ Wtyczka SQLite dla ulogd.
 %setup -q
 %patch0 -p1
 %patch1 -p0
-%patch2 -p0
-%patch3 -p1
 
 %build
-%if "%{_lib}" != "lib"
-sed -e 's@lib/@%{_lib}/@g' -i configure.in
-%endif
+#%if "%{_lib}" != "lib"
+#sed -e 's@lib/@%{_lib}/@g' -i configure.in
+#%endif
 
-%{__aclocal}
 %{__autoconf}
 %configure \
+       --with-dbi \
+       --with-dbi-lib=%{_libdir} \
        --with-mysql \
-       --with-pgsql \
-       --with-sqlite3
+       --with-pgsql
 %{__make} -j1
 
 %install
@@ -110,6 +146,7 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},/etc/{sysconfig,logrotate.d,rc.d/init.d,u
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ulogd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ulogd
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/ulogd
+install %{name}.conf $RPM_BUILD_ROOT/etc/%{name}.conf
 install -D %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 
 touch $RPM_BUILD_ROOT/var/log/ulogd{,.pktlog}
@@ -134,7 +171,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc Changes doc/*.{ps,txt,html}
+#%doc Changes doc/*.{ps,txt,html}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ulogd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ulogd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/ulogd
@@ -143,25 +180,54 @@ fi
 
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_libdir}/ulogd
-%attr(755,root,root) %{_libdir}/ulogd/ulogd_[BLO]*.so
-%attr(755,root,root) %{_libdir}/ulogd/ulogd_PCAP*.so
-%attr(755,root,root) %{_libdir}/ulogd/ulogd_PWSNIFF*.so
-%attr(755,root,root) %{_libdir}/ulogd/ulogd_SYSLOG*.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_filter_HWHDR.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_filter_IFINDEX.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_filter_IP2BIN.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_filter_IP2HBIN.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_filter_IP2STR.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_filter_MARK.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_filter_PRINTFLOW.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_filter_PRINTPKT.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_filter_PWSNIFF.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_inpflow_NFACCT.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_inpflow_NFCT.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_inppkt_NFLOG.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_inppkt_ULOG.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_inppkt_UNIXSOCK.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_output_GPRINT.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_output_LOGEMU.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_output_NACCT.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_output_OPRINT.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_output_SYSLOG.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_output_XML.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_raw2packet_BASE.so
 
 %attr(640,root,root) %ghost /var/log/*
-%{_mandir}/man?/%{name}.*
+%{_mandir}/man8/%{name}.*
+
+%files devel
+%defattr(644,root,root,755)
+%{_libdir}/ulogd/*.la
+
+%files dbi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_output_DBI.so
 
 %files mysql
 %defattr(644,root,root,755)
 %doc doc/mysql*
-%attr(755,root,root) %{_libdir}/ulogd/ulogd_MYSQL.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_output_MYSQL.so
+
+%files pcap
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_output_PCAP.so
 
 %files pgsql
 %defattr(644,root,root,755)
 %doc doc/pgsql*
-%attr(755,root,root) %{_libdir}/ulogd/ulogd_PGSQL.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_output_PGSQL.so
 
 %files sqlite
 %defattr(644,root,root,755)
 %doc doc/sqlite*
-%attr(755,root,root) %{_libdir}/ulogd/ulogd_SQLITE3.so
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_output_SQLITE3.so