rpms/rsyslog/devel rsyslog-1.19.2-invertAppSelect.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 rsyslog.spec, 1.12, 1.13 sources, 1.9, 1.10 rsyslog-1.19.0-libPath.patch, 1.1, NONE rsyslog-1.19.0-modUnload.patch, 1.1, NONE rsyslog-1.19.0-ommysqlLeak.patch, 1.1, NONE rsyslog-1.19.0-readfds.patch, 1.1, NONE

[Peter Vrabec (pvrabec)]

Author: pvrabec

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3661

Modified Files:
	.cvsignore rsyslog.spec sources 
Added Files:
	rsyslog-1.19.2-invertAppSelect.patch 
Removed Files:
	rsyslog-1.19.0-libPath.patch rsyslog-1.19.0-modUnload.patch 
	rsyslog-1.19.0-ommysqlLeak.patch rsyslog-1.19.0-readfds.patch 
Log Message:
- upstream bugfix release
- support for negative app selector, patch from
  theinric at redhat.com


rsyslog-1.19.2-invertAppSelect.patch:

--- NEW FILE rsyslog-1.19.2-invertAppSelect.patch ---
--- rsyslog/syslogd.c.orig	2007-08-28 11:41:08.000000000 +0200
+++ rsyslog/syslogd.c	2007-08-28 12:35:55.000000000 +0200
@@ -2302,8 +2302,20 @@ int shouldProcessThisMessage(selector_t 
 	}
 	
 	if(f->pCSProgNameComp != NULL) {
-		if(rsCStrSzStrCmp(f->pCSProgNameComp, (uchar*) getProgramName(pMsg), getProgramNameLen(pMsg))) {
-			/* not equal, so we are already done... */
+		int bInv = 0, bEqv = 0, offset = 0;
+		if(*(rsCStrGetSzStr(f->pCSProgNameComp)) == '-') {
+			if(*(rsCStrGetSzStr(f->pCSProgNameComp) + 1) == '-')
+				offset = 1;
+			else {
+				bInv = 1;
+				offset = 1;
+			}
+		}
+		if(!rsCStrOffsetSzStrCmp(f->pCSProgNameComp, offset, (uchar*) getProgramName(pMsg), getProgramNameLen(pMsg)))
+			bEqv = 1;
+
+		if((!bEqv && !bInv) || (bEqv && bInv)) {
+			/* not equal or inverted selection, so we are already done... */
 			dbgprintf("programname filter '%s' does not match '%s'\n", 
 				rsCStrGetSzStr(f->pCSProgNameComp), getProgramName(pMsg));
 			return 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Aug 2007 15:36:20 -0000	1.9
+++ .cvsignore	28 Aug 2007 12:39:16 -0000	1.10
@@ -1,3 +1,3 @@
-rsyslog-1.19.0.tar.gz
 rsyslog.init
 rsyslog.sysconfig
+rsyslog-1.19.2.tar.gz


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rsyslog.spec	23 Aug 2007 08:57:07 -0000	1.12
+++ rsyslog.spec	28 Aug 2007 12:39:16 -0000	1.13
@@ -2,7 +2,7 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 1.19.0
+Version: 1.19.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -10,13 +10,11 @@
 Source0: http://download.adiscon.com/rsyslog/%{name}-%{version}.tar.gz
 Source1: rsyslog.init
 Source2: rsyslog.sysconfig
-Patch1: rsyslog-1.19.0-libPath.patch
-Patch2: rsyslog-1.19.0-ommysqlLeak.patch
-Patch3: rsyslog-1.19.0-modUnload.patch
-Patch4: rsyslog-1.19.0-readfds.patch
+Patch1: rsyslog-1.19.2-invertAppSelect.patch
 Conflicts: logrotate < 3.5.2
 BuildRequires: zlib-devel
-BuildRequires: autoconf, automake, libtool
+BuildRequires: autoconf automake
+Requires: logrotate
 Requires: logrotate
 Requires: bash >= 2.0
 Requires(post): /sbin/chkconfig coreutils
@@ -48,11 +46,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .libPath
-%patch2 -p1 -b .ommysqlLeak
-%patch3 -p1 -b .modUnload
-%patch4 -p1 -b .readfds
-autoreconf
+%patch1 -p1 -b .invertAppSelect
 
 %build
 %configure --sbindir=%{sbindir} --disable-static
@@ -125,6 +119,11 @@
 %{_libdir}/rsyslog/ommysql.so
 
 %changelog
+* Tue Aug 28 2007 Peter Vrabec <pvrabec at redhat.com> 1.19.2-1
+- upstream bugfix release
+- support for negative app selector, patch from 
+  theinric at redhat.com
+
 * Fri Aug 17 2007 Peter Vrabec <pvrabec at redhat.com> 1.19.0-1
 - new upstream release with MySQL support(as plugin)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Aug 2007 15:36:20 -0000	1.9
+++ sources	28 Aug 2007 12:39:16 -0000	1.10
@@ -1,3 +1,3 @@
-5a1852cd86e55dd0d3125e0d7a6af1ca  rsyslog-1.19.0.tar.gz
 fe8fcd90c672701fa198dd1206df64ae  rsyslog.init
 e10d2dc3238c2cf2a54933f10b19b9bf  rsyslog.sysconfig
+d4066f735ce235bc2ef1f1409262ec57  rsyslog-1.19.2.tar.gz


--- rsyslog-1.19.0-libPath.patch DELETED ---


--- rsyslog-1.19.0-modUnload.patch DELETED ---


--- rsyslog-1.19.0-ommysqlLeak.patch DELETED ---


--- rsyslog-1.19.0-readfds.patch DELETED ---