OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 15-Sep-2003 09:54:45
Branch: OPENPKG_1_3_SOLID HEAD Handle: 2003091508544302
Added files: (Branch: OPENPKG_1_3_SOLID)
openpkg-src/fsl fsl.patch
Modified files:
openpkg-web news.txt
Modified files: (Branch: OPENPKG_1_3_SOLID)
openpkg-src/fsl fsl.spec
Log:
MFC: l2 patch to make sure prefix channel does atomar downstream
writes (makes l2 v0.9.2 equiv to v0.9.3)
Summary:
Revision Changes Path
1.1.2.1 +24 -0 openpkg-src/fsl/fsl.patch
1.31.2.6.2.2+3 -1 openpkg-src/fsl/fsl.spec
1.6554 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/fsl/fsl.patch
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 fsl.patch
--- /dev/null 2003-09-15 09:54:45.000000000 +0200
+++ fsl.patch 2003-09-15 09:54:45.000000000 +0200
@@ -0,0 +1,24 @@
+This patch makes sure that OSSP l2's "prefix" channel performs a single
+downstream write operation to make sure the leaf "file" channel has a
+chance to atomically write the message to the logfile. This patch is
+from OSSP CVS and will be included in the next OSSP l2 and OSSP fsl
+versions, too.
+
+Index: lib_l2/l2_ch_prefix.c
+===================================================================
+diff -u -d -u -d -r1.23 l2_ch_prefix.c
+--- lib_l2/l2_ch_prefix.c 6 Jan 2003 11:41:51 -0000 1.23
++++ lib_l2/l2_ch_prefix.c 10 Sep 2003 12:37:43 -0000
+@@ -172,10 +172,12 @@
+ return L2_ERR_ARG;
+ if ((n = strftime(buf2, sizeof(buf2), buf1, tm)) == 0)
+ return L2_ERR_SYS;
++ n += l2_util_sprintf(buf2+n, sizeof(buf2)-n, "%s", buf);
+ downstream = NULL;
+ while ((rv = l2_channel_downstream(ch, &downstream)) == L2_OK)
+ if ((rv = l2_channel_write(downstream, level, buf2, n)) != L2_OK)
+ return rv;
++ return L2_OK;
+ }
+
+ return L2_OK_PASS;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/fsl/fsl.spec
============================================================================
$ cvs diff -u -r1.31.2.6.2.1 -r1.31.2.6.2.2 fsl.spec
--- openpkg-src/fsl/fsl.spec 29 Jul 2003 14:58:55 -0000 1.31.2.6.2.1
+++ openpkg-src/fsl/fsl.spec 15 Sep 2003 07:54:45 -0000 1.31.2.6.2.2
@@ -33,7 +33,7 @@
Group: System
License: MIT-style
Version: 1.2.0
-Release: 1.3.0
+Release: 1.3.1
# package options
%option with_fsl_debuglogcode no
@@ -42,6 +42,7 @@
Source0: ftp://ftp.ossp.org/pkg/lib/fsl/fsl-%{version}.tar.gz
Source1: rc.fsl
Source2: fsl.fsl
+Patch0: fsl.patch
# build information
Prefix: %{l_prefix}
@@ -63,6 +64,7 @@
%prep
%setup -q
+ %patch -p0
%{l_shtool} subst \
-e 's;pcre;fsl_pcre;g' \
-e '/#include/s;fsl_pcre;pcre;g' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6553 -r1.6554 news.txt
--- openpkg-web/news.txt 15 Sep 2003 07:52:01 -0000 1.6553
+++ openpkg-web/news.txt 15 Sep 2003 07:54:43 -0000 1.6554
@@ -1,3 +1,4 @@
+15-Sep-2003: Upgraded package: P<fsl-1.2.0-1.3.1>
15-Sep-2003: Upgraded package: P<which-2.16-20030915>
14-Sep-2003: Upgraded package: P<neon-0.24.2-20030914>
14-Sep-2003: Upgraded package: P<postfix-2.0.16-20030914>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
