packages (Titanium): ulogd/ulogd.spec - 1.x is outdated and buggy, updated ...

hawk hawk at pld-linux.org
Fri Sep 18 22:54:45 CEST 2009 

Author: hawk                         Date: Fri Sep 18 20:54:45 2009 GMT
Module: packages                      Tag: Titanium
---- Log message:
- 1.x is outdated and buggy, updated for 2.0.0 beta3

---- Files affected:
packages/ulogd:
   ulogd.spec (1.45 -> 1.45.4.1) 

---- Diffs:

================================================================
Index: packages/ulogd/ulogd.spec
diff -u packages/ulogd/ulogd.spec:1.45 packages/ulogd/ulogd.spec:1.45.4.1
--- packages/ulogd/ulogd.spec:1.45	Fri Feb  8 01:02:41 2008
+++ packages/ulogd/ulogd.spec	Fri Sep 18 22:54:40 2009
@@ -1,20 +1,24 @@
 # $Revision$, $Date$
+%define		beta	beta3
 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:	1
+Version:	2.0.0
+Release:	0.%{beta}.1
 License:	GPL
 Group:		Networking/Daemons
-Source0:	ftp://ftp.netfilter.org/pub/ulogd/%{name}-%{version}.tar.bz2
-# Source0-md5:	05b4ed2926b9a22aaeaf642917bbf8ff
+Source0:	ftp://ftp.netfilter.org/pub/ulogd/%{name}-%{version}%{beta}.tar.bz2
+# Source0-md5:	be8137d3b7ae70ebbce7ca8852b9e901
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.logrotate
 Patch0:		%{name}-includes.patch
-Patch1:		%{name}-mysql.patch
+Patch1:		%{name}-ac.patch
 URL:		http://netfilter.org/projects/ulogd/
 BuildRequires:	autoconf
+BuildRequires:	libnfnetlink-devel >= 0.0.39
+BuildRequires:	libnetfilter_conntrack-devel >= 0.0.95
+BuildRequires:	libnetfilter_log-devel >= 0.0.15
 BuildRequires:	libpcap-devel
 BuildRequires:	mysql-devel
 BuildRequires:	postgresql-devel
@@ -44,6 +48,17 @@
   - wysłać pakiet poprzez netlink
   - zwrócić natychmiast NF_ACCEPT.
 
+%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
@@ -56,6 +71,17 @@
 %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
@@ -79,18 +105,22 @@
 Wtyczka SQLite dla ulogd.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{beta}
 %patch0 -p1
 %patch1 -p0
 
 %build
-%if "%{_lib}" != "lib"
-sed -e 's at lib/@%{_lib}/@g' -i configure.in
-%endif
+#%if "%{_lib}" != "lib"
+#sed -e 's at lib/@%{_lib}/@g' -i configure.in
+#%endif
 
 %{__autoconf}
 %configure \
+	--with-dbi \
+	--with-dbi-lib=%{_libdir} \
 	--with-mysql \
+	--with-pcap \
+	--with-pcap-lib=%{_libdir} \
 	--with-pgsql \
 	--with-sqlite3
 %{__make} -j1
@@ -106,6 +136,7 @@
 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}
@@ -130,7 +161,7 @@
 
 %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
@@ -139,28 +170,49 @@
 
 %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_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_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_output_IPFIX.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_raw2packet_BASE.so
 
 %attr(640,root,root) %ghost /var/log/*
-%{_mandir}/man?/%{name}.*
+%{_mandir}/man8/%{name}.*
+
+%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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -168,6 +220,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45.4.1  2009/09/18 20:54:40  hawk
+- 1.x is outdated and buggy, updated for 2.0.0 beta3
+
 Revision 1.45  2008/02/08 00:02:41  undefine
 - fixed
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ulogd/ulogd.spec?r1=1.45&r2=1.45.4.1&f=u

More information about the pld-cvs-commit mailing list