Hello community,
here is the log from the commit of package libol
checked in at Fri Sep 1 15:20:20 CEST 2006.
--------
--- libol/libol.changes 2006-01-25 21:37:36.000000000 +0100
+++ libol/libol.changes 2006-09-01 12:39:48.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Sep 1 12:39:42 CEST 2006 - mt@suse.de
+
+- updated to version 0.3.18 as required by syslog-ng-1.6.11
+
+-------------------------------------------------------------------
Old:
----
libol-0.3.16.dif
libol-0.3.16.tar.gz
libol-0.3.16.tar.gz.asc
New:
----
libol-0.3.18.dif
libol-0.3.18.tar.gz
libol-0.3.18.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libol.spec ++++++
--- /var/tmp/diff_new_pack.W5bU8L/_old 2006-09-01 15:20:07.000000000 +0200
+++ /var/tmp/diff_new_pack.W5bU8L/_new 2006-09-01 15:20:07.000000000 +0200
@@ -1,22 +1,22 @@
#
-# spec file for package libol (Version 0.3.16)
+# spec file for package libol (Version 0.3.18)
#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: libol
-Version: 0.3.16
-Release: 3
+Version: 0.3.18
+Release: 1
License: GPL
Group: System/Libraries
Autoreqprov: on
-Summary: Support library for syslog-ng
+Summary: Support Library for syslog-ng
URL: http://www.balabit.com/products/syslog_ng/
Source0: http://www.balabit.com/downloads/libol/0.3/%{name}-%{version}.tar.gz
Source1: http://www.balabit.com/downloads/libol/0.3/%{name}-%{version}.tar.gz.asc
@@ -24,7 +24,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-Support library for syslog-ng
+Support library for syslog-ng.
@@ -37,6 +37,7 @@
Summary: Support library for syslog-ng - developer package
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
+Requires: glibc-devel
Provides: libol-config
%description devel
@@ -52,11 +53,16 @@
%prep
%setup
%patch0 -p0
-%{?suse_update_config:%{suse_update_config}}
+%{?suse_update_config:%{suse_update_config -f}}
%build
export CFLAGS="$RPM_OPT_FLAGS -fPIC"
-./autogen.sh \
+aclocal --force
+libtoolize -f
+automake --foreign --add-missing --copy --force-missing
+autoheader
+autoconf
+./configure \
--prefix=/usr --sbindir=/sbin --mandir=%{_mandir} \
--sysconfdir=/etc --localstatedir=/var/run --libdir=%_libdir \
--disable-debug
@@ -87,6 +93,8 @@
%_libdir/libol.so
%changelog -n libol
+* Fri Sep 01 2006 - mt@suse.de
+- updated to version 0.3.18 as required by syslog-ng-1.6.11
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Nov 10 2005 - schwab@suse.de
++++++ libol-0.3.16.dif -> libol-0.3.18.dif ++++++
--- libol/libol-0.3.16.dif 2005-11-10 17:14:19.000000000 +0100
+++ libol/libol-0.3.18.dif 2006-08-30 12:13:36.000000000 +0200
@@ -1,5 +1,5 @@
--- src/Makefile.am
-+++ src/Makefile.am 2005/07/25 14:50:38
++++ src/Makefile.am 2006/08/30 10:13:03
@@ -37,6 +37,7 @@
# combinators.c io_commands.c command.c
@@ -8,14 +8,3 @@
EXTRA_DIST = olconfig.h.in jpoll.c
---- src/olconfig.h
-+++ src/olconfig.h 2005/07/25 14:52:36
-@@ -10,7 +10,7 @@
- /* #undef C_ALLOCA */
-
- /* Whether to enable allocation debugging */
--#define DEBUG_ALLOC 1
-+/* #undef DEBUG_ALLOC */
-
- /* Define to 1 if you have `alloca', as a function or macro. */
- #define HAVE_ALLOCA 1
++++++ libol-0.3.16.tar.gz -> libol-0.3.18.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libol-0.3.16/ChangeLog new/libol-0.3.18/ChangeLog
--- old/libol-0.3.16/ChangeLog 2005-05-03 17:49:31.000000000 +0200
+++ new/libol-0.3.18/ChangeLog 2006-03-27 16:45:06.000000000 +0200
@@ -1,3 +1,27 @@
+2006-03-27 Balazs Scheidler
+
+ * configure.in: bumped to 0.3.18
+
+2006-03-13 Balazs Scheidler
+
+ * src/io.c: removed fd counting loop, cache maximum number of fds
+ and allocate the fds array dynamically
+
+2006-01-23 Balazs Scheidler
+
+ * src/io.c (do_write): added support for platforms without an
+ MSG_DONTWAIT flag
+
+2005-11-23 Balazs Scheidler
+
+ * configure.in: bumped version number to 0.3.17
+
+ * src/io.c (do_write): added workaround for broken destination
+ sockets
+
+ * src/pkt_buffer.c (do_flush_stream): make sure data is not lost
+ if A_WRITE returns failure by pushing it back to the buffer
+
2005-05-03 Balazs Scheidler
* configure.in: bumped version number to 0.3.16
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libol-0.3.16/config.guess new/libol-0.3.18/config.guess
--- old/libol-0.3.16/config.guess 2005-04-02 13:15:18.000000000 +0200
+++ new/libol-0.3.18/config.guess 2005-04-26 10:44:02.000000000 +0200
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-03-24'
+timestamp='2005-04-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -1140,6 +1140,10 @@
# From seanf@swdc.stratus.com.
echo i860-stratus-sysv4
exit 0 ;;
+ i*86:VOS:*:*)
+ # From Paul.Green@stratus.com.
+ echo ${UNAME_MACHINE}-stratus-vos
+ exit 0 ;;
*:VOS:*:*)
# From Paul.Green@stratus.com.
echo hppa1.1-stratus-vos
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libol-0.3.16/config.sub new/libol-0.3.18/config.sub
--- old/libol-0.3.16/config.sub 2005-04-02 13:15:18.000000000 +0200
+++ new/libol-0.3.18/config.sub 2005-04-26 10:44:02.000000000 +0200
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-02-10'
+timestamp='2005-04-22'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -231,6 +231,7 @@
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
@@ -262,7 +263,8 @@
| pyramid \
| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b \
| strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
@@ -298,7 +300,7 @@
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
- | bs2000-* \
+ | bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
@@ -336,7 +338,8 @@
| romp-* | rs6000-* \
| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libol-0.3.16/configure new/libol-0.3.18/configure
--- old/libol-0.3.16/configure 2005-05-03 17:50:04.000000000 +0200
+++ new/libol-0.3.18/configure 2006-03-27 16:45:17.000000000 +0200
@@ -1771,7 +1771,7 @@
# Define the identity of the package.
PACKAGE=libol
- VERSION="0.3.16"
+ VERSION="0.3.18"
# Some tools Automake needs.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libol-0.3.16/configure.in new/libol-0.3.18/configure.in
--- old/libol-0.3.16/configure.in 2005-05-03 17:49:17.000000000 +0200
+++ new/libol-0.3.18/configure.in 2006-03-27 16:44:52.000000000 +0200
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/abstract_io.c)
-AM_INIT_AUTOMAKE(libol, "0.3.16", 1)
+AM_INIT_AUTOMAKE(libol, "0.3.18", 1)
if test -n "$SNAPSHOT_VERSION"; then
VERSION=$VERSION+$SNAPSHOT_VERSION
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libol-0.3.16/libol.spec new/libol-0.3.18/libol.spec
--- old/libol-0.3.16/libol.spec 2005-05-03 17:50:17.000000000 +0200
+++ new/libol-0.3.18/libol.spec 2006-03-27 16:45:29.000000000 +0200
@@ -6,7 +6,7 @@
Summary: Support library for syslog-ng
Name: libol
-Version: 0.3.16
+Version: 0.3.18
Release: 1
Epoch: 0
License: GPL
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libol-0.3.16/ltmain.sh new/libol-0.3.18/ltmain.sh
--- old/libol-0.3.16/ltmain.sh 2005-01-22 16:02:26.000000000 +0100
+++ new/libol-0.3.18/ltmain.sh 2005-04-01 02:47:06.000000000 +0200
@@ -44,7 +44,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
VERSION=1.5.6
-TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 220 $"
+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
# Check that we have a working $echo.
@@ -2945,7 +2945,7 @@
# Check that each of the things are valid numbers.
case $current in
- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
$echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@ -2954,7 +2954,7 @@
esac
case $revision in
- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
$echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@ -2963,7 +2963,7 @@
esac
case $age in
- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
$echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libol-0.3.16/src/io.c new/libol-0.3.18/src/io.c
--- old/libol-0.3.16/src/io.c 2005-05-03 17:49:35.000000000 +0200
+++ new/libol-0.3.18/src/io.c 2006-03-13 18:01:31.000000000 +0100
@@ -1,6 +1,6 @@
/* io.c
*
- * $Id: io.c,v 1.44 2005/05/03 15:49:35 bazsi Exp $ */
+ * $Id: io.c,v 1.47 2006/03/13 17:01:31 bazsi Exp $ */
/* lsh, an implementation of the ssh protocol
*
@@ -168,40 +168,40 @@
if (!b->reloading) {
- struct nonblocking_fd *fd;
-
- for(fd = b->files; fd; fd = fd->next) {
- nfds++;
- }
- }
-
- if (nfds) {
int all_events = 0;
+ static int afds_max = 1;
+ int afds; /* allocated fds */
- fds = alloca(sizeof(struct pollfd) * nfds);
+ afds = afds_max;
+ fds = malloc(sizeof(struct pollfd) * afds);
/* Fill out fds-array */
{
struct nonblocking_fd *fd;
- unsigned long i;
- for (fd = b->files, i = 0; fd; fd = fd->next, i++)
+ for (fd = b->files; fd; fd = fd->next)
{
- assert(i < nfds);
+ if (nfds == afds) {
+ afds *= 2;
+ fds = realloc(fds, sizeof(struct pollfd) * afds);
+ }
- fds[i].fd = fd->fd;
- fds[i].events = 0;
- fds[i].revents = 0;
+ fds[nfds].fd = fd->fd;
+ fds[nfds].events = 0;
+ fds[nfds].revents = 0;
if (fd->want_read)
- fds[i].events |= POLLIN;
+ fds[nfds].events |= POLLIN;
if (fd->want_write)
- fds[i].events |= POLLOUT;
+ fds[nfds].events |= POLLOUT;
- all_events |= fds[i].events;
+ all_events |= fds[nfds].events;
+ nfds++;
}
- assert(i == nfds);
+ assert(nfds <= afds);
}
+ if (afds > afds_max)
+ afds_max = afds;
if (all_events)
res = poll(fds, nfds, IDLE_TIME);
}
@@ -220,16 +220,19 @@
}
}
- if (res < 0)
+ if (res < 0) {
switch(errno)
{
case EAGAIN:
case EINTR:
break;
default:
+ free(fds);
werror("io_iter: poll failed: %z", strerror(errno));
return 0;
}
+ }
+
if (nfds && res > 0) {
/* Do io. Note that the callback functions may add new fds to the
* head of the list, or clear the alive flag on any fd. */
@@ -282,6 +285,7 @@
}
assert(i == nfds);
}
+ free(fds);
nco = 0;
{
@@ -487,8 +491,31 @@
{
CAST(fd_write, self, w);
int saved_errno;
+ int res;
+ UINT8 eofbuf[1];
- int res = write(self->fd, data, length);
+#ifdef MSG_DONTWAIT
+ res = recv(self->fd, eofbuf, 1, MSG_PEEK | MSG_DONTWAIT);
+#else
+ {
+ int old_flags;
+
+ old_flags = fcntl(self->fd, F_GETFL);
+ fcntl(self->fd, F_SETFL, old_flags | O_NONBLOCK);
+ res = recv(self->fd, eofbuf, 1, MSG_PEEK);
+ if ((old_flags & O_NONBLOCK) == 0)
+ fcntl(self->fd, F_SETFL, old_flags);
+ }
+#endif
+
+ if (res == 0) {
+ /* EOF detected */
+ werror("io.c: do_write: write() failed, EOF detected\n");
+ errno = ECONNRESET;
+ return -1;
+ }
+
+ res = write(self->fd, data, length);
saved_errno = errno;
#if 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libol-0.3.16/src/olconfig.h new/libol-0.3.18/src/olconfig.h
--- old/libol-0.3.16/src/olconfig.h 2005-05-02 14:43:55.000000000 +0200
+++ new/libol-0.3.18/src/olconfig.h 2006-03-27 16:45:34.000000000 +0200
@@ -10,7 +10,7 @@
/* #undef C_ALLOCA */
/* Whether to enable allocation debugging */
-#define DEBUG_ALLOC 1
+/* #undef DEBUG_ALLOC */
/* Define to 1 if you have `alloca', as a function or macro. */
#define HAVE_ALLOCA 1
@@ -20,7 +20,7 @@
#define HAVE_ALLOCA_H 1
/* whether the compiler supports the attribute keyword */
-#define HAVE_ATTRIBUTE 1
+/* #undef HAVE_ATTRIBUTE */
/* Define to 1 if you have the header file. */
#define HAVE_DLFCN_H 1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libol-0.3.16/src/pkt_buffer.c new/libol-0.3.18/src/pkt_buffer.c
--- old/libol-0.3.16/src/pkt_buffer.c 2004-08-05 12:34:49.000000000 +0200
+++ new/libol-0.3.18/src/pkt_buffer.c 2005-11-23 09:49:21.000000000 +0100
@@ -18,7 +18,7 @@
*
* Inspired by nsyslog, originally written by Darren Reed.
*
- * $Id: pkt_buffer.c,v 1.19 2004/08/05 10:34:49 bazsi Exp $
+ * $Id: pkt_buffer.c,v 1.20 2005/11/23 08:49:21 bazsi Exp $
*
***************************************************************************/
@@ -152,7 +152,15 @@
}
}
else {
- werror("pkt_buffer::do_flush(): Error flushing data");
+ struct buffer_node *item;
+
+ NEW_SPACE(item);
+ item->packet = c_format("%s", end, buffer);
+ ol_queue_add_head(&self->queue, &item->header);
+ if (++self->queue_size == self->queue_max && self->super.writable)
+ (*self->super.writable) = 0;
+
+ werror("pkt_buffer::do_flush(): Error flushing data\n");
return ST_DIE;
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
