Remove debian/patches/02-set-correct-default-for-buffered-writing.patch

* debian/patches/02-set-correct-default-for-buffered-writing.patch
  - Removed, merged upstream.

3 files changed, 2 insertions, 43 deletions

diff --git a/debian/changelog b/debian/changelog
index c904e2d..6dbc94c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 rsyslog (4.6.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches/02-set-correct-default-for-buffered-writing.patch
+    - Removed, merged upstream.
 
  -- Michael Biebl <biebl@debian.org>  Wed, 07 Jul 2010 15:40:46 +0200
 
diff --git a/debian/patches/02-set-correct-default-for-buffered-writing.patch b/debian/patches/02-set-correct-default-for-buffered-writing.patch
deleted file mode 100644
index 750bcdf..0000000
--- a/debian/patches/02-set-correct-default-for-buffered-writing.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Wed, 7 Apr 2010 12:25:40 +0000 (+0200)
-Subject: bugfix: default for $OMFileFlushOnTXEnd was wrong ("off").
-X-Git-Url: http://git.adiscon.com/?p=rsyslog.git;a=commitdiff_plain;h=e2ceb7247cbd9dff1bfb0efe22d6bc68e70a3fd8
-
-bugfix: default for $OMFileFlushOnTXEnd was wrong ("off").
-
-This, in default mode, caused buffered writing to be used, what
-means that it looked like no output were written or partial
-lines. Thanks to Michael Biebl for pointing out this bug.
----
-
-diff --git a/tools/omfile.c b/tools/omfile.c
-index 0f47600..24de052 100644
---- a/tools/omfile.c
-+++ b/tools/omfile.c
-@@ -87,6 +87,7 @@ typedef struct s_dynaFileCacheEntry dynaFileCacheEntry;
- #define IOBUF_DFLT_SIZE 1024	/* default size for io buffers */
- #define FLUSH_INTRVL_DFLT 1 	/* default buffer flush interval (in seconds) */
- #define USE_ASYNCWRITER_DFLT 0 	/* default buffer use async writer */
-+#define FLUSHONTX_DFLT 1 	/* default for flush on TX end */
- 
- /* globals for default values */
- static int iDynaFileCacheSize = 10; /* max cache for dynamic files */
-@@ -100,7 +101,7 @@ static uid_t	dirGID;		/* GID to be used for newly created directories */
- static int	bCreateDirs = 1;/* auto-create directories for dynaFiles: 0 - no, 1 - yes */
- static int	bEnableSync = 0;/* enable syncing of files (no dash in front of pathname in conf): 0 - no, 1 - yes */
- static int	iZipLevel = 0;	/* zip compression mode (0..9 as usual) */
--static bool	bFlushOnTXEnd = 0;/* flush write buffers when transaction has ended? */
-+static bool	bFlushOnTXEnd = FLUSHONTX_DFLT;/* flush write buffers when transaction has ended? */
- static int64	iIOBufSize = IOBUF_DFLT_SIZE;	/* size of an io buffer */
- static int	iFlushInterval = FLUSH_INTRVL_DFLT; 	/* how often flush the output buffer on inactivity? */
- static int	bUseAsyncWriter = USE_ASYNCWRITER_DFLT;	/* should we enable asynchronous writing? */
-@@ -764,7 +765,7 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a
- 	bCreateDirs = 1;
- 	bEnableSync = 0;
- 	iZipLevel = 0;
--	bFlushOnTXEnd = 0;
-+	bFlushOnTXEnd = FLUSHONTX_DFLT;
- 	iIOBufSize = IOBUF_DFLT_SIZE;
- 	iFlushInterval = FLUSH_INTRVL_DFLT;
- 	bUseAsyncWriter = USE_ASYNCWRITER_DFLT;
diff --git a/debian/patches/series b/debian/patches/series
index 499ef95..2113a56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 # Debian patches for rsyslog
 01-dont_create_db.patch
-02-set-correct-default-for-buffered-writing.patch