rpms/rsyslog/devel rsyslog-3.16.1-cfsline.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 rsyslog.spec, 1.37, 1.38 sources, 1.23, 1.24 rsyslog-3.14.1-segfaultExprFilt.patch, 1.1, NONE rsyslog-3.14.1-symbolLookup.patch, 1.1, NONE rsyslog-3.14.1.legacyOpts.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-serv9397

Modified Files:
	.cvsignore rsyslog.spec sources 
Added Files:
	rsyslog-3.16.1-cfsline.patch 
Removed Files:
	rsyslog-3.14.1-segfaultExprFilt.patch 
	rsyslog-3.14.1-symbolLookup.patch 
	rsyslog-3.14.1.legacyOpts.patch 
Log Message:
upgrade to new stable release with RELP support


rsyslog-3.16.1-cfsline.patch:

--- NEW FILE rsyslog-3.16.1-cfsline.patch ---
diff -up rsyslog-3.16.1/plugins/omsnmp/omsnmp.c.cfsline rsyslog-3.16.1/plugins/omsnmp/omsnmp.c
--- rsyslog-3.16.1/plugins/omsnmp/omsnmp.c.cfsline	2008-05-14 10:50:13.000000000 +0200
+++ rsyslog-3.16.1/plugins/omsnmp/omsnmp.c	2008-05-14 10:54:09.000000000 +0200
@@ -518,14 +518,14 @@ CODEmodInit_QueryRegCFSLineHdlr
 
 	CHKiRet(omsdRegCFSLineHdlr(	(uchar *)"actionsnmptransport", 0, eCmdHdlrGetWord, NULL, &pszTransport, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr(	(uchar *)"actionsnmptarget", 0, eCmdHdlrGetWord, NULL, &pszTarget, STD_LOADABLE_MODULE_ID));
-	CHKiRet(regCfSysLineHdlr(	(uchar *)"actionsnmptargetport", 0, eCmdHdlrInt, NULL, &iPort, NULL));
-	CHKiRet(regCfSysLineHdlr(	(uchar *)"actionsnmpversion", 0, eCmdHdlrInt, NULL, &iSNMPVersion, NULL));
+	CHKiRet(omsdRegCFSLineHdlr(	(uchar *)"actionsnmptargetport", 0, eCmdHdlrInt, NULL, &iPort, STD_LOADABLE_MODULE_ID));
+	CHKiRet(omsdRegCFSLineHdlr(	(uchar *)"actionsnmpversion", 0, eCmdHdlrInt, NULL, &iSNMPVersion, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr(	(uchar *)"actionsnmpcommunity", 0, eCmdHdlrGetWord, NULL, &pszCommunity, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr(	(uchar *)"actionsnmpenterpriseoid", 0, eCmdHdlrGetWord, NULL, &pszEnterpriseOID, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr(	(uchar *)"actionsnmptrapoid", 0, eCmdHdlrGetWord, NULL, &pszSnmpTrapOID, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr(	(uchar *)"actionsnmpsyslogmessageoid", 0, eCmdHdlrGetWord, NULL, &pszSyslogMessageOID, STD_LOADABLE_MODULE_ID));
-	CHKiRet(regCfSysLineHdlr(	(uchar *)"actionsnmpspecifictype", 0, eCmdHdlrInt, NULL, &iSpecificType, NULL));
-	CHKiRet(regCfSysLineHdlr(	(uchar *)"actionsnmptraptype", 0, eCmdHdlrInt, NULL, &iTrapType, NULL));
+	CHKiRet(omsdRegCFSLineHdlr(	(uchar *)"actionsnmpspecifictype", 0, eCmdHdlrInt, NULL, &iSpecificType, STD_LOADABLE_MODULE_ID));
+	CHKiRet(omsdRegCFSLineHdlr(	(uchar *)"actionsnmptraptype", 0, eCmdHdlrInt, NULL, &iTrapType, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr(	(uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID));
 ENDmodInit
 /*
diff -up rsyslog-3.16.1/plugins/omgssapi/omgssapi.c.cfsline rsyslog-3.16.1/plugins/omgssapi/omgssapi.c
--- rsyslog-3.16.1/plugins/omgssapi/omgssapi.c.cfsline	2008-05-14 10:50:23.000000000 +0200
+++ rsyslog-3.16.1/plugins/omgssapi/omgssapi.c	2008-05-14 10:54:43.000000000 +0200
@@ -696,7 +696,7 @@ CODEmodInit_QueryRegCFSLineHdlr
 
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"gssforwardservicename", 0, eCmdHdlrGetWord, NULL, &gss_base_service_name, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"gssmode", 0, eCmdHdlrGetWord, setGSSMode, &gss_mode, STD_LOADABLE_MODULE_ID));
-	CHKiRet(regCfSysLineHdlr((uchar *)"actiongssforwarddefaulttemplate", 0, eCmdHdlrGetWord, NULL, &pszTplName, NULL));
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"actiongssforwarddefaulttemplate", 0, eCmdHdlrGetWord, NULL, &pszTplName, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID));
 ENDmodInit
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	4 Apr 2008 15:01:22 -0000	1.21
+++ .cvsignore	14 May 2008 09:56:20 -0000	1.22
@@ -2,3 +2,4 @@
 rsyslog.conf
 rsyslog.init
 rsyslog.sysconfig
+rsyslog-3.16.1.tar.gz


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- rsyslog.spec	8 Apr 2008 12:39:09 -0000	1.37
+++ rsyslog.spec	14 May 2008 09:56:20 -0000	1.38
@@ -2,8 +2,8 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 3.14.1
-Release: 5%{?dist}
+Version: 3.16.1
+Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -12,9 +12,7 @@
 Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Patch1: rsyslog-3.11.4-undef.patch
-Patch2: rsyslog-3.14.1-segfaultExprFilt.patch
-Patch3: rsyslog-3.14.1-symbolLookup.patch
-Patch4: rsyslog-3.14.1.legacyOpts.patch
+Patch2: rsyslog-3.16.1-cfsline.patch
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
 Requires: logrotate >= 3.5.2
@@ -45,6 +43,12 @@
 Requires: %name = %version-%release
 BuildRequires: krb5-devel 
 
+%package relp
+Summary: RELP protocol support for rsyslog
+Group: System Environment/Daemons
+Requires: %name = %version-%release
+BuildRequires: librelp-devel 
+
 %description
 Rsyslog is an enhanced multi-threaded syslogd supporting, among others, MySQL,
 syslog/tcp, RFC 3195, permitted sender lists, filtering on any message part,
@@ -67,12 +71,16 @@
 authentication and secure connections. GSSAPI is commonly used for Kerberos 
 authentication.
 
+%description relp
+The rsyslog-relp package contains the rsyslog plugins that provide
+the ability to receive syslog messages via the reliable RELP
+protocol. 
+
+
 %prep
 %setup -q
 %patch1 -p1 -b .undef
-%patch2 -p1 -b .segfaultExprFilt
-%patch3 -p1 -b .symbolLookup
-%patch4 -p1 -b .legacyOpts
+%patch2 -p1 -b .cfsline
 
 %build
 %configure	--sbindir=%{sbindir} \
@@ -80,7 +88,8 @@
 		--enable-mysql \
 		--enable-pgsql \
 		--enable-gssapi-krb5 \
-		--enable-imfile
+		--enable-imfile \
+		--enable-relp
 make %{?_smp_mflags}
 
 %install
@@ -163,7 +172,15 @@
 %{_libdir}/rsyslog/imgssapi.so
 %{_libdir}/rsyslog/omgssapi.so
 
+%files relp
+%defattr(-,root,root)
+%{_libdir}/rsyslog/imrelp.so
+%{_libdir}/rsyslog/omrelp.so
+
 %changelog
+* Wed May 14 2008 Tomas Heinrich <theinric at redhat.com> 3.16.1-1
+- upgrade
+
 * Tue Apr 08 2008 Peter Vrabec <pvrabec at redhat.com> 3.14.1-5
 - prevent undesired error description in legacy 
   warning messages


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	7 Apr 2008 09:31:09 -0000	1.23
+++ sources	14 May 2008 09:56:20 -0000	1.24
@@ -2,3 +2,4 @@
 e6fd8aa699a50ec9abffae50a423aca9  rsyslog.conf
 04f3868aa518d33809f5943d7bc2fc0b  rsyslog.sysconfig
 26fb52edc816e59e29b1f3b4ac520d30  rsyslog.init
+eb371da5e221182fa77c5d814212e460  rsyslog-3.16.1.tar.gz


--- rsyslog-3.14.1-segfaultExprFilt.patch DELETED ---


--- rsyslog-3.14.1-symbolLookup.patch DELETED ---


--- rsyslog-3.14.1.legacyOpts.patch DELETED ---