- up to 3.0.5

Changed files:
    syslog-ng-bug-48.patch -> 1.2
    syslog-ng-tz.patch -> 1.2
    syslog-ng.spec -> 1.181

diff --git a/syslog-ng-bug-48.patch b/syslog-ng-bug-48.patch
deleted file mode 100644 (file)
index 49ef63c..0000000
--- a/syslog-ng-bug-48.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 51d40371d5e2abf636220470c8257b8426fa648c
-Author: Balazs Scheidler <bazsi@balabit.hu>
-Date:   Sun Aug 30 11:41:24 2009 +0200
-
-    [afinter] don't block on the internal_msg_queue even in the threaded case (fixes: pub#48)
-    
-    A hang was reported in bugzilla ticket #48 which seems to have
-    been caused by MARK messages interfering with local messages:
-    
-      * if the MARK is due in the same poll iteration as a local message
-      * the MARK timeout is checked and the internal source is marked as having
-        input available
-      * then the local message comes in pushing the mark timeout further ahead
-        in time
-      * then the internal() dispatch callback checks the mark timeout again,
-        but at this time it is already in the future ->
-      * the dispatch callback falls back to fetching the internal message from
-        internal_msg_queue, assuming it was that which caused the dispatch
-        callback to be scheduled
-      * this blocks indefinitely.
-    
-    The solution is very simple: use g_async_queue_try_pop() instead of
-    g_async_queue_pop(), the dispatch code already takes care about a
-    NULL message value.
-    
-    Thanks for the helpful reporters to hunt down the issue.
-    
-    Reported-By: Arkadiusz Miśkiewicz, Elan Ruusamäe
-
-diff --git a/src/messages.h b/src/messages.h
-index d3148fd..305d0b3 100644
---- a/src/messages.h
-+++ b/src/messages.h
-@@ -49,7 +49,8 @@ void msg_add_option_group(GOptionContext *ctx);
- 
- #define MsgQueue         GAsyncQueue
- #define msg_queue_push   g_async_queue_push
--#define msg_queue_pop    g_async_queue_pop
-+/* we're using try_pop here as we don't want to block in our dispatch callback */
-+#define msg_queue_pop    g_async_queue_try_pop
- #define msg_queue_new    g_async_queue_new
- #define msg_queue_free   g_async_queue_unref
- #define msg_queue_length g_async_queue_length

diff --git a/syslog-ng-tz.patch b/syslog-ng-tz.patch
deleted file mode 100644 (file)
index f6cc17c..0000000
--- a/syslog-ng-tz.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- syslog-ng-3.0.2/tests/unit/test_zone.c~    2009-05-08 10:52:59.000000000 +0200
-+++ syslog-ng-3.0.2/tests/unit/test_zone.c     2009-05-12 16:30:34.000000000 +0200
-@@ -468,19 +468,6 @@
-   TEST_ASSERT(test_timezone(now, "MST7MDT"));
-   TEST_ASSERT(test_timezone(now, "GB-Eire"));
-   TEST_ASSERT(test_timezone(now, "PRC"));
--  TEST_ASSERT(test_timezone(now, "SystemV/CST6CDT"));
--  TEST_ASSERT(test_timezone(now, "SystemV/CST6"));
--  TEST_ASSERT(test_timezone(now, "SystemV/PST8"));
--  TEST_ASSERT(test_timezone(now, "SystemV/YST9"));
--  TEST_ASSERT(test_timezone(now, "SystemV/EST5"));
--  TEST_ASSERT(test_timezone(now, "SystemV/AST4"));
--  TEST_ASSERT(test_timezone(now, "SystemV/AST4ADT"));
--  TEST_ASSERT(test_timezone(now, "SystemV/YST9YDT"));
--  TEST_ASSERT(test_timezone(now, "SystemV/EST5EDT"));
--  TEST_ASSERT(test_timezone(now, "SystemV/PST8PDT"));
--  TEST_ASSERT(test_timezone(now, "SystemV/MST7MDT"));
--  TEST_ASSERT(test_timezone(now, "SystemV/HST10"));
--  TEST_ASSERT(test_timezone(now, "SystemV/MST7"));
-   TEST_ASSERT(test_timezone(now, "Arctic/Longyearbyen"));
-   TEST_ASSERT(test_timezone(now, "Cuba"));
-   TEST_ASSERT(test_timezone(now, "Israel"));

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 9ad720cf37dde92f77f1c2d79c7a9b31a4294164..b50aa0b4afa8f5bf0313e179cea0cb16fba64be1 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -8,12 +8,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.2
-Release:       5
+Version:       3.0.5
+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: 0dce90ddd4f0f417ce2b9d88ccbca2e9
+# Source0-md5: 28f0d9ff2243b330e8cd6311ef9b2f12
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.logrotate
@@ -22,10 +22,8 @@ Source4:     http://www.balabit.com/dl/guides/%{name}-v3.0-guide-admin-en.pdf
 Source5:       %{name}-simple.conf
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-datadir.patch
-Patch2:                %{name}-tz.patch
-Patch3:                %{name}-pyssl.patch
-Patch4:                bug-15.patch
-Patch5:                %{name}-bug-48.patch
+Patch2:                %{name}-pyssl.patch
+Patch3:                bug-15.patch
 URL:           http://www.balabit.com/products/syslog_ng/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
@@ -34,6 +32,7 @@ BuildRequires:        flex
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.268
 %if %{with tests}
+BuildRequires: libdbi-drivers-sqlite3
 BuildRequires: tzdata
 %endif
 %if %{with dynamic}
@@ -99,8 +98,6 @@ facility/prioridade como o syslog original.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
 cp -a %{SOURCE4} doc
 cp -a %{SOURCE5} contrib