- up to 3.0.9 (bug-15 was fixed in a different way, so this patch is obsolete)

Changed files:
    bug-15.patch -> 1.2
    syslog-ng.spec -> 1.199

diff --git a/bug-15.patch b/bug-15.patch
deleted file mode 100644 (file)
index 3fee6ba..0000000
--- a/bug-15.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/src/afinter.c b/src/afinter.c
-index 0085d85..a67a9a7 100644
---- a/src/afinter.c
-+++ b/src/afinter.c
-@@ -34,6 +34,7 @@ typedef struct _AFInterSourceDriver
- } AFInterSourceDriver;
- 
- static gint next_mark_target = -1;
-+static GSource *global_internal_source;
- 
- void 
- afinter_postpone_mark(gint mark_freq)
-@@ -121,6 +122,7 @@ afinter_source_dispatch(GSource *source,
- static void
- afinter_source_finalize(GSource *source)
- {
-+  global_internal_source = NULL;
- }
- 
- GSourceFuncs afinter_source_watch_funcs =
-@@ -161,11 +163,26 @@ afinter_source_init(LogPipe *s)
-   
-   if (!log_source_init(s))
-     return FALSE;
-+
-+  if (cfg->internal_source_present)
-+    {
-+      msg_error("You have two internal() sources in your configuration, this is not supported and would cause hangs", NULL);
-+      return FALSE;
-+    }
-   
-+  if (global_internal_source)
-+    {
-+      msg_error("Internal error, internal() GSource was duplicated, this is bad", NULL);
-+      g_assert_not_reached();
-+      return FALSE;
-+    }
-+    
-   /* the source added below references this logreader, it will be unref'd
-      when the source is destroyed */ 
-   self->watch = afinter_source_watch_new(&self->super.super, cfg->mark_freq);
-   g_source_attach(self->watch, NULL);
-+  global_internal_source = self->watch;
-+  cfg->internal_source_present = TRUE;
-   return TRUE;
- }
- 
-@@ -204,8 +221,13 @@ afinter_sd_init(LogPipe *s)
- 
-   log_source_options_init(&self->source_options, cfg, self->super.group);
-   self->source = afinter_source_new(self, &self->source_options);
-+  if (!log_pipe_init(&self->source->super, cfg))
-+    {
-+      log_pipe_unref(&self->source->super);
-+      self->source = NULL;
-+      return FALSE;
-+    }
-   log_pipe_append(&self->source->super, s);
--  log_pipe_init(&self->source->super, cfg);
-   return TRUE;
- }
- 
-diff --git a/src/cfg.h b/src/cfg.h
-index 5e3f1bd..cc2005d 100644
---- a/src/cfg.h
-+++ b/src/cfg.h
-@@ -98,6 +98,7 @@ struct _GlobalConfig
-   
-   struct _LogTemplate *file_template;
-   struct _LogTemplate *proto_template;
-+  gboolean internal_source_present;
-   
-   /* */
-   GHashTable *sources;

diff --git a/syslog-ng.spec b/syslog-ng.spec
index a666338c26b9b33a02af524f7443380e763c8819..d026ae6d29643ddcf3faa818f4f34e5134405022 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -17,12 +17,12 @@ Summary:    Syslog-ng - new generation of the system logger
 Summary(pl.UTF-8):     Syslog-ng - zamiennik syskloga
 Summary(pt_BR.UTF-8):  Daemon de log nova geração
 Name:          syslog-ng
-Version:       3.0.8
-Release:       5
+Version:       3.0.9
+Release:       1
 License:       GPL v2
 Group:         Daemons
 Source0:       http://www.balabit.com/downloads/files/syslog-ng/sources/%{version}/source/%{name}_%{version}.tar.gz
-# Source0-md5: 7107f5758dec4b774136f0f827b35258
+# Source0-md5: 481e5dedcf355268bf4c95bddcae9e55
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.logrotate
@@ -33,9 +33,8 @@ Source6:      %{name}.upstart
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-datadir.patch
 Patch2:                %{name}-pyssl.patch
-Patch3:                bug-15.patch
-Patch4:                fix-unix-stream-caps.patch
-Patch5:                fix-dac_override.patch
+Patch3:                fix-unix-stream-caps.patch
+Patch4:                fix-dac_override.patch
 URL:           http://www.balabit.com/products/syslog_ng/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
@@ -125,7 +124,6 @@ Opis zadania Upstart dla syslog-ng.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 cp -a %{SOURCE4} doc
 cp -a %{SOURCE5} contrib/syslog-ng.conf.simple