Accepting request 53050 from home:computersalat:devel:Base

thanks!

OBS-URL: https://build.opensuse.org/request/show/53050
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=24

rsyslog-5.4.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5dff740a69789435579382b3a16e2b101d4c6a326a2f8e86b35f54fd877baf95
-size 1772569

rsyslog-5.6.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8621e10f2f5db116519005a4ca09d83e491d4da4b5a37a0f40e09a5c16c140f5
+size 1844979

rsyslog.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Nov 15 14:59:21 UTC 2010 - chris@computersalat.de
+
+- update to 5.6.0
+  This release brings all changes and enhancements of the 5.5.x series
+  to the v5-stable branch.
+  - bugfix: a couple of problems that imfile had on some platforms, namely
+    Ubuntu (not their fault, but occured there)
+  - bugfix: imfile utilizes 32 bit to track offset. Most importantly,
+    this problem can not experienced on Fedora 64 bit OS (which has
+    64 bit long's!)
+- disable obsolete patch
+  - xconsole-pipe-loop
+- rpmlint
+  - name-repeated-in-summary C Rsyslog
+
 -------------------------------------------------------------------
 Wed Apr 28 17:21:03 UTC 2010 - mt@suse.de
 

rsyslog.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package rsyslog (Version 5.4.0)
+# spec file for package rsyslog (Version 5.6.0)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,10 @@
 
 
 Name:           rsyslog
-%define         upstream_version            5.4.0
+Summary:        The enhanced syslogd for Linux and Unix
+Version:        5.6.0
+%define         upstream_version            5.6.0
+Release:        1
 # add %define build_with_relp 1 to enable relp on < 11.3, e.g.
 # via <topadd>%define build_with_relp 1</topadd> in _link file.
 %define         with_relp                   0%{?suse_version} >= 1130 || 0%{?build_with_relp:1}
@@ -29,11 +32,8 @@ Name:           rsyslog
 %define         _libdir                     /%_lib
 %define         rsyslog_module_dir_nodeps   %{_libdir}/rsyslog/
 %define         rsyslog_module_dir_withdeps %{_prefix}/%{_lib}/rsyslog/
-Version:        5.4.0
-Release:        2
 License:        GPLv3+
 Group:          System/Daemons
-Summary:        Rsyslog, the enhanced syslogd for Linux and Unix
 Url:            http://www.rsyslog.com/
 AutoReqProv:    on
 Provides:       syslog
@@ -55,7 +55,6 @@ Source1:        rsyslog.sysconfig
 Source2:        rsyslog.conf.in
 Source3:        rsyslog.early.conf.in
 Source4:        rsyslog.d.remote.conf.in
-Patch1:         rsyslog.xconsole-pipe-loop.patch
 
 %description
 Rsyslog is an enhanced multi-threaded syslogd supporting, among others,
@@ -245,7 +244,6 @@ Authors:
 %prep
 %setup -q -n %{name}-%{upstream_version}
 dos2unix doc/*.html
-%patch1 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall"

rsyslog.xconsole-pipe-loop.patch

@@ -1,109 +0,0 @@
-
-Fix for:
-https://bugzilla.novell.com/show_bug.cgi?id=597293
-
-Extracted the bare fix (without ChangeLog and testcase) to test if it
-solves the problem from:
-
-http://bugzilla.adiscon.com/show_bug.cgi?id=186
-http://git.adiscon.com/?p=rsyslog.git;a=commitdiff;h=eec894fbc5eb263e6def1f2e35f9882967c95a88
-
-Rainer Gerhards [Mon, 26 Apr 2010 13:19:13 +0000 (15:19 +0200)]
-
-The rsyslog engine did not guard itself against output modules that do
-not properly convey back the tryResume() behaviour. This then leads to
-what looks like an endless loop. I consider this to be a bug of the
-engine not only because it should be hardened against plugin misbehaviour,
-but also because plugins may not be totally able to avoid this situation
-(depending on the type of and processing done by the plugin).
-
-
-* Unmerged path ChangeLog
-diff --git a/action.c b/action.c
-index aaf4559..256ca09 100644
---- a/action.c
-+++ b/action.c
-@@ -445,6 +445,7 @@ static void actionCommitted(action_t *pThis)
- static void actionRetry(action_t *pThis)
- {
- 	actionSetState(pThis, ACT_STATE_RTRY);
-+	pThis->iResumeOKinRow++;
- }
- 
- 
-@@ -480,23 +481,39 @@ static inline void actionSuspend(action_t *pThis, time_t ttNow)
- /* actually do retry processing. Note that the function receives a timestamp so
-  * that we do not need to call the (expensive) time() API.
-  * Note that we do the full retry processing here, doing the configured number of
-- * iterations.
-- * rgerhards, 2009-05-07
-+ * iterations. -- rgerhards, 2009-05-07
-+ * We need to guard against module which always return RS_RET_OK from their tryResume()
-+ * entry point. This is invalid, but has harsh consequences: it will cause the rsyslog
-+ * engine to go into a tight loop. That obviously is not acceptable. As such, we track the
-+ * count of iterations that a tryResume returning RS_RET_OK is immediately followed by
-+ * an unsuccessful call to doAction(). If that happens more than 1,000 times, we assume 
-+ * the return acutally is a RS_RET_SUSPENDED. In order to go through the various 
-+ * resumption stages, we do this for every 1000 requests. This magic number 1000 may
-+ * not be the most appropriate, but it should be thought of a "if nothing else helps"
-+ * kind of facility: in the first place, the module should return a proper indication
-+ * of its inability to recover. -- rgerhards, 2010-04-26.
-  */
- static rsRetVal actionDoRetry(action_t *pThis, time_t ttNow)
- {
- 	int iRetries;
- 	int iSleepPeriod;
-+	int bTreatOKasSusp;
- 	DEFiRet;
- 
- 	ASSERT(pThis != NULL);
- 
- 	iRetries = 0;
- 	while(pThis->eState == ACT_STATE_RTRY) {
-+dbgprintf("YYY: resume in row %d\n", pThis->iResumeOKinRow);
- 		iRet = pThis->pMod->tryResume(pThis->pModData);
--		if(iRet == RS_RET_OK) {
-+		if((pThis->iResumeOKinRow > 999) && (pThis->iResumeOKinRow % 1000 == 0)) {
-+			bTreatOKasSusp = 1;
-+		} else {
-+			bTreatOKasSusp = 0;
-+		}
-+		if((iRet == RS_RET_OK) && (!bTreatOKasSusp)) {
- 			actionSetState(pThis, ACT_STATE_RDY);
--		} else if(iRet == RS_RET_SUSPENDED) {
-+		} else if(iRet == RS_RET_SUSPENDED || bTreatOKasSusp) {
- 			/* max retries reached? */
- 			if((pThis->iResumeRetryCount != -1 && iRetries >= pThis->iResumeRetryCount)) {
- 				actionSuspend(pThis, ttNow);
-@@ -715,13 +732,16 @@ actionCallDoAction(action_t *pThis, msg_t *pMsg)
- 	switch(iRet) {
- 		case RS_RET_OK:
- 			actionCommitted(pThis);
-+			pThis->iResumeOKinRow = 0; /* we had a successful call! */
- 			break;
- 		case RS_RET_DEFER_COMMIT:
-+			pThis->iResumeOKinRow = 0; /* we had a successful call! */
- 			/* we are done, action state remains the same */
- 			break;
- 		case RS_RET_PREVIOUS_COMMITTED:
- 			/* action state remains the same, but we had a commit. */
- 			pThis->bHadAutoCommit = 1;
-+			pThis->iResumeOKinRow = 0; /* we had a successful call! */
- 			break;
- 		case RS_RET_SUSPENDED:
- 			actionRetry(pThis);
-diff --git a/action.h b/action.h
-index 6cc4df5..4a6c3c8 100644
---- a/action.h
-+++ b/action.h
-@@ -56,8 +56,9 @@ struct action_s {
- 	bool	bWriteAllMarkMsgs;/* should all mark msgs be written (not matter how recent the action was executed)? */
- 	int	iSecsExecOnceInterval; /* if non-zero, minimum seconds to wait until action is executed again */
- 	action_state_t eState;	/* current state of action */
--	int	bHadAutoCommit;	/* did an auto-commit happen during doAction()? */
-+	bool	bHadAutoCommit;	/* did an auto-commit happen during doAction()? */
- 	time_t	ttResumeRtry;	/* when is it time to retry the resume? */
-+	int	iResumeOKinRow;	/* number of times in a row that resume said OK with an immediate failure following */
- 	int	iResumeInterval;/* resume interval for this action */
- 	int	iResumeRetryCount;/* how often shall we retry a suspended action? (-1 --> eternal) */
- 	int	iNbrResRtry;	/* number of retries since last suspend */