rpms/rsyslog/F-8 rsyslog-2.0.0-sockhang.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 rsyslog.spec, 1.20, 1.21 sources, 1.14, 1.15

[Peter Vrabec (pvrabec)]

Author: pvrabec

Update of /cvs/extras/rpms/rsyslog/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25866

Modified Files:
	.cvsignore rsyslog.spec sources 
Added Files:
	rsyslog-2.0.0-sockhang.patch 
Log Message:
- upgrade
- fixing bad file descriptor (#428775)


rsyslog-2.0.0-sockhang.patch:

--- NEW FILE rsyslog-2.0.0-sockhang.patch ---
diff -up rsyslog-2.0.0/omfwd.c.hang rsyslog-2.0.0/omfwd.c
--- rsyslog-2.0.0/omfwd.c.hang	2008-01-17 12:24:03.000000000 +0100
+++ rsyslog-2.0.0/omfwd.c	2008-01-17 13:34:37.000000000 +0100
@@ -116,6 +116,7 @@ typedef struct _instanceData {
 
 BEGINcreateInstance
 CODESTARTcreateInstance
+	pData->sock = -1;
 ENDcreateInstance
 
 
@@ -278,8 +279,8 @@ static rsRetVal TCPSendInit(void *pvData
 	instanceData *pData = (instanceData *) pvData;
 
 	assert(pData != NULL);
-	if(pData->sock <= 0) {
-		if((pData->sock = TCPSendCreateSocket(pData->f_addr)) <= 0)
+	if(pData->sock < 0) {
+		if((pData->sock = TCPSendCreateSocket(pData->f_addr)) < 0)
 			iRet = RS_RET_TCP_SOCKCREATE_ERR;
 	}
 
diff -up rsyslog-2.0.0/omfile.c.hang rsyslog-2.0.0/omfile.c
--- rsyslog-2.0.0/omfile.c.hang	2008-01-17 12:24:11.000000000 +0100
+++ rsyslog-2.0.0/omfile.c	2008-01-17 13:16:57.000000000 +0100
@@ -357,6 +357,7 @@ static void prepareFile(instanceData *pD
 		pData->fd = open((char*) newFileName, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY,
 				pData->fCreateMode);
 	} else {
+		pData->fd = -1;
 		/* file does not exist, create it (and eventually parent directories */
 		if(pData->bCreateDirs) {
 			/* we fist need to create parent dirs if they are missing
@@ -596,6 +597,7 @@ again:
 
 BEGINcreateInstance
 CODESTARTcreateInstance
+	pData->fd = -1;
 ENDcreateInstance
 
 
diff -up rsyslog-2.0.0/tcpsyslog.c.hang rsyslog-2.0.0/tcpsyslog.c


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/F-8/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	29 Nov 2007 12:39:08 -0000	1.14
+++ .cvsignore	18 Jan 2008 13:53:02 -0000	1.15
@@ -1,3 +1,3 @@
 rsyslog.init
 rsyslog.sysconfig
-rsyslog-1.19.11.tar.gz
+rsyslog-2.0.0.tar.gz


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/F-8/rsyslog.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rsyslog.spec	20 Dec 2007 10:53:16 -0000	1.20
+++ rsyslog.spec	18 Jan 2008 13:53:02 -0000	1.21
@@ -2,24 +2,21 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 1.19.11
-Release: 3%{?dist}
+Version: 2.0.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
 Source0: http://download.adiscon.com/rsyslog/%{name}-%{version}.tar.gz
 Source1: rsyslog.init
 Source2: rsyslog.sysconfig
-Patch1: rsyslog-1.19.11-hostacl.patch
-Patch2: rsyslog-1.19.11-race.patch 
-Conflicts: logrotate < 3.5.2
+Patch1: rsyslog-2.0.0-sockhang.patch 
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
-Requires: logrotate
-Requires: logrotate
+Requires: logrotate >= 3.5.2
 Requires: bash >= 2.0
 Requires(post): /sbin/chkconfig coreutils
-Requires(preun): /sbin/chkconfig /sbin/chkconfig
+Requires(preun): /sbin/chkconfig /sbin/service
 Requires(postun): /sbin/service
 Provides: syslog
 Provides: sysklogd = 1.4.3-1
@@ -48,8 +45,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .hostacl
-%patch2 -p1 -b .race
+%patch1 -p1 -b .sockhang
 
 %build
 %configure --sbindir=%{sbindir} --disable-static --enable-mysql
@@ -122,6 +118,10 @@
 %{_libdir}/rsyslog/ommysql.so
 
 %changelog
+* Fri Jan 18 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-1
+- upgrade
+- fixing bad file descriptor (#428775)
+
 * Thu Dec 20 2007 Peter Vrabec <pvrabec at redhat.com> 1.19.11-3
 - memory leak fix
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/F-8/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	29 Nov 2007 12:39:08 -0000	1.14
+++ sources	18 Jan 2008 13:53:02 -0000	1.15
@@ -1,3 +1,3 @@
 fe8fcd90c672701fa198dd1206df64ae  rsyslog.init
 e10d2dc3238c2cf2a54933f10b19b9bf  rsyslog.sysconfig
-ebcbd1c82885c11b4711441eb34c8393  rsyslog-1.19.11.tar.gz
+de42d8e7a6dc03e38e807662f2bfb240  rsyslog-2.0.0.tar.gz