[oe-commits] Steffen Sledz : rsyslog: switch to new upstream version 5.8.4

[git version control]

Module: openembedded.git
Branch: sledz/maintenance
Commit: 2f42ab68883cc77ab2f061d3e82ddcfb2142f5d4
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=2f42ab68883cc77ab2f061d3e82ddcfb2142f5d4

Author: Steffen Sledz <sledz at dresearch-fe.de>
Date:   Thu Sep 15 16:15:16 2011 +0200

rsyslog: switch to new upstream version 5.8.4

* many bug fixes and systemd support, see:
  http://www.rsyslog.com/changelog-for-5-8-1-v5-stable/
  http://www.rsyslog.com/changelog-for-5-8-2-v5-stable/
  http://www.rsyslog.com/changelog-for-5-8-3-v5-stable/
  http://www.rsyslog.com/changelog-for-5-8-4-v5-stable/
* obsolete versions till 5.8.x deleted

Signed-off-by: Steffen Sledz <sledz at dresearch-fe.de>

---

 recipes/rsyslog/files/rsyslog-resume.patch |   29 ----------------------------
 recipes/rsyslog/rsyslog_5.5.4.bb           |    7 ------
 recipes/rsyslog/rsyslog_5.5.6.bb           |    7 ------
 recipes/rsyslog/rsyslog_5.6.3.bb           |    5 ----
 recipes/rsyslog/rsyslog_5.8.4.bb           |    5 ++++
 5 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/recipes/rsyslog/files/rsyslog-resume.patch b/recipes/rsyslog/files/rsyslog-resume.patch
deleted file mode 100644
index 73ed101..0000000
--- a/recipes/rsyslog/files/rsyslog-resume.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 467f10a13950b4b8d5a9fff7f14c20874777a4ba Mon Sep 17 00:00:00 2001
-From: Steffen Sledz <sledz at dresearch.de>
-Date: Fri, 30 Jul 2010 14:39:53 +0200
-Subject: [PATCH] break potential infinite loop in actionDoRetry
-
-If a module always returns RS_RET_OK (like ompipe does) the actionDoRetry
-loop may not have leaved faked ACT_STATE_SUSP state in case iResumeOKinRow
-had ever reached a count of 1000.
-
-Signed-off-by: Steffen Sledz <sledz at dresearch.de>
----
- action.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/action.c b/action.c
-index 32a07dc..90ec1bf 100644
---- a/action.c
-+++ b/action.c
-@@ -508,6 +508,7 @@ static rsRetVal actionDoRetry(action_t *pThis, time_t ttNow)
- 		iRet = pThis->pMod->tryResume(pThis->pModData);
- 		if((pThis->iResumeOKinRow > 999) && (pThis->iResumeOKinRow % 1000 == 0)) {
- 			bTreatOKasSusp = 1;
-+			pThis->iResumeOKinRow = 0;
- 		} else {
- 			bTreatOKasSusp = 0;
- 		}
--- 
-1.6.4.2
-
diff --git a/recipes/rsyslog/rsyslog_5.5.4.bb b/recipes/rsyslog/rsyslog_5.5.4.bb
deleted file mode 100644
index e949ed5..0000000
--- a/recipes/rsyslog/rsyslog_5.5.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require rsyslog.inc
-PR = "${INC_PR}.1"
-
-SRC_URI += " file://rsyslog-resume.patch "
-
-SRC_URI[md5sum] = "824df2504955df1619e5ec2915d783aa"
-SRC_URI[sha256sum] = "31853a551ea7ca960c59c9e33406b1748bdf311059c9d8a4ce98816d51b17cac"
diff --git a/recipes/rsyslog/rsyslog_5.5.6.bb b/recipes/rsyslog/rsyslog_5.5.6.bb
deleted file mode 100644
index f05fcfd..0000000
--- a/recipes/rsyslog/rsyslog_5.5.6.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require rsyslog.inc
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://rsyslog-resume.patch "
-
-SRC_URI[md5sum] = "835a7dd4f404d37c9d01a1056beaf3cb"
-SRC_URI[sha256sum] = "ae866e1f92869b82cf30270cbea192dbc5229c8707a8782fff95641bcb5725a2"
diff --git a/recipes/rsyslog/rsyslog_5.6.3.bb b/recipes/rsyslog/rsyslog_5.6.3.bb
deleted file mode 100644
index d2128e1..0000000
--- a/recipes/rsyslog/rsyslog_5.6.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require rsyslog.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "4fd22c5a4d9442b16f6717c65446b718"
-SRC_URI[sha256sum] = "d78547097add18a7bc680899a87f3305926b3a57b4885fc8fc31e7014c29dc7b"
diff --git a/recipes/rsyslog/rsyslog_5.8.4.bb b/recipes/rsyslog/rsyslog_5.8.4.bb
new file mode 100644
index 0000000..c874631
--- /dev/null
+++ b/recipes/rsyslog/rsyslog_5.8.4.bb
@@ -0,0 +1,5 @@
+require rsyslog.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "a2c2a65ac84d9a895c52a754aff61986"
+SRC_URI[sha256sum] = "fdae6a027942f46eef8abcf2b6b28399986b5e983452e046e729eae70f13febe"