소스 검색

include OSSP l2 workaround patch

Ralf S. Engelschall 22 년 전
부모
커밋
fe4e178559
2개의 변경된 파일27개의 추가작업 그리고 1개의 파일을 삭제
  1. 24 0
      fsl/fsl.patch
  2. 3 1
      fsl/fsl.spec

+ 24 - 0
fsl/fsl.patch

@@ -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;

+ 3 - 1
fsl/fsl.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [CORE]
 Group:        System
 License:      MIT-style
 Version:      1.2.0
-Release:      20030725
+Release:      20030910
 
 #   package options
 %option       with_fsl_debuglogcode   no
@@ -42,6 +42,7 @@ Release:      20030725
 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 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+    %patch -p0
     %{l_shtool} subst \
         -e 's;pcre;fsl_pcre;g' \
         -e '/#include/s;fsl_pcre;pcre;g' \