devel/ulogd ulogd-1.21-logdir.patch, NONE, 1.1 ulogd-1.21-x86_64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 ulogd.spec, 1.3, 1.4 ulogd-1.01-logdir.patch, 1.1, NONE ulogd-1.02-x86_64.patch, 1.2, NONE
Aurelien Bompard (abompard)
fedora-extras-commits at redhat.com
Sun Feb 20 15:52:17 UTC 2005
Author: abompard
Update of /cvs/extras/devel/ulogd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22259
Modified Files:
.cvsignore sources ulogd.spec
Added Files:
ulogd-1.21-logdir.patch ulogd-1.21-x86_64.patch
Removed Files:
ulogd-1.01-logdir.patch ulogd-1.02-x86_64.patch
Log Message:
- update to version 1.21
- rediffed two patches
ulogd-1.21-logdir.patch:
--- NEW FILE ulogd-1.21-logdir.patch ---
--- ulogd-1.21/ulogd.conf.in.logdir 2005-02-20 16:32:16.281426904 +0100
+++ ulogd-1.21/ulogd.conf.in 2005-02-20 16:33:42.677292736 +0100
@@ -11,7 +11,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
@@ -50,11 +50,11 @@
[LOGEMU]
-file="/var/log/ulogd.syslogemu"
+file="/var/log/ulogd/ulogd.syslogemu"
sync=1
[OPRINT]
-file="/var/log/ulogd.pktlog"
+file="/var/log/ulogd/ulogd.pktlog"
[MYSQL]
table="ulog"
@@ -76,6 +76,6 @@
buffer=200
[PCAP]
-file="/var/log/ulogd.pcap"
+file="/var/log/ulogd/ulogd.pcap"
sync=1
ulogd-1.21-x86_64.patch:
--- NEW FILE ulogd-1.21-x86_64.patch ---
--- ulogd-1.21/configure.x86_64 2005-02-16 12:26:32.000000000 +0100
+++ ulogd-1.21/configure 2005-02-20 16:44:13.389409920 +0100
@@ -1709,22 +1709,22 @@
mysqldir=""
echo $ac_n "checking for MySQL files""... $ac_c" 1>&6
echo "configure:1712: checking for MySQL files" >&5
-for d in $dir /usr /usr/local /usr/local/mysql /opt/mysql /opt/packages/mysql
-do
- if test -f $d/lib/mysql/libmysqlclient.so
+#for d in $dir /usr /usr/local /usr/local/mysql /opt/mysql /opt/packages/mysql
+#do
+ if test -f ${libdir}/mysql/libmysqlclient.so
then
- echo "$ac_t""found mysql in $d" 1>&6
- mysqldir=$d
+ echo "$ac_t""found mysql in ${exec_prefix}" 1>&6
+ mysqldir=${exec_prefix}
mysqldir_suffix=/mysql
- break
- elif test -f $d/lib/libmysqlclient.so
- then
- echo "$ac_t""found mysql in $d" 1>&6
- mysqldir=$d
- mysqldir_suffix=
- break
+# break
+# elif test -f $d/lib/libmysqlclient.so
+# then
+# echo "$ac_t""found mysql in $d" 1>&6
+# mysqldir=$d
+# mysqldir_suffix=
+# break
fi
-done
+#done
if test x$mysqldir = x
then
@@ -1735,7 +1735,7 @@
EOF
MYSQLINCLUDES=${mysqldir}/include${mysqldir_suffix}
- MYSQLLIBS=${mysqldir}/lib${mysqldir_suffix}
+ MYSQLLIBS=${libdir}${mysqldir_suffix}
DATABASE_DIR="${DATABASE_DIR} mysql"
@@ -1802,20 +1802,20 @@
pgsqldir=""
echo $ac_n "checking for PGSQL files""... $ac_c" 1>&6
echo "configure:1805: checking for PGSQL files" >&5
-for d in $dir /usr /usr/local /usr/local/pgsql /opt/pgsql /opt/packages/pgsql
-do
- if test -f $d/lib/pgsql/libpq.so
- then
- echo "$ac_t""found pgsql in $d" 1>&6
- pgsqldir=$d
- break
- elif test -f $d/lib/libpq.so
+#for d in $dir /usr /usr/local /usr/local/pgsql /opt/pgsql /opt/packages/pgsql
+#do
+ if test -f ${libdir}/libpq.so
then
- echo "$ac_t""found pgsql in $d" 1>&6
- pgsqldir=$d
- break
+ echo "$ac_t""found pgsql in ${exec_prefix}" 1>&6
+ pgsqldir=${exec_prefix}
+# break
+# elif test -f $d/lib/libpq.so
+# then
+# echo "$ac_t""found pgsql in $d" 1>&6
+# pgsqldir=$d
+# break
fi
-done
+#done
if test x$pgsqldir = x
then
@@ -1833,7 +1833,7 @@
break
fi
done
- PGSQLLIBS=${pgsqldir}/lib
+ PGSQLLIBS=${libdir}
DATABASE_DIR="${DATABASE_DIR} pgsql"
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/ulogd/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 26 Nov 2004 13:46:02 -0000 1.2
+++ .cvsignore 20 Feb 2005 15:52:15 -0000 1.3
@@ -1 +1 @@
-ulogd-1.02.tar.bz2
+ulogd-1.21.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/devel/ulogd/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 26 Nov 2004 13:46:02 -0000 1.2
+++ sources 20 Feb 2005 15:52:15 -0000 1.3
@@ -1 +1 @@
-8ca63ca3371fd818587208d07098f8de ulogd-1.02.tar.bz2
+32e94a9336c10a4cb8ab3745bc2abbdb ulogd-1.21.tar.bz2
Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/devel/ulogd/ulogd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ulogd.spec 17 Dec 2004 20:00:47 -0000 1.3
+++ ulogd.spec 20 Feb 2005 15:52:15 -0000 1.4
@@ -1,6 +1,6 @@
Name: ulogd
-Version: 1.02
-Release: 8
+Version: 1.21
+Release: 1
Summary: The userspace logging daemon for netfilter
License: GPL
Group: System Environment/Daemons
@@ -8,10 +8,10 @@
Source: http://ftp.netfilter.org/pub/ulogd/ulogd-%{version}.tar.bz2
Source1: ulogd.logrotate
Source2: ulogd.8
-Patch1: ulogd-1.01-logdir.patch
+Patch1: ulogd-1.21-logdir.patch
Patch2: ulogd-1.02-init.patch
Patch3: ulogd-1.02-pgsql.patch
-Patch4: ulogd-1.02-x86_64.patch
+Patch4: ulogd-1.21-x86_64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): initscripts, chkconfig
Requires(postun): initscripts, chkconfig
@@ -117,6 +117,9 @@
%{_libdir}/ulogd/ulogd_PGSQL.so
%changelog
+* Sun Feb 20 2005 Aurelien Bompard <gauret[AT]free.fr> 1.21-1
+- version 1.21
+
* Fri Dec 17 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.02-8
- revise x86_64 patch to remove more hardcoded /lib badness
--- ulogd-1.01-logdir.patch DELETED ---
--- ulogd-1.02-x86_64.patch DELETED ---
More information about the fedora-extras-commits
mailing list