rpms/rsyslog/devel rsyslog-3.12.3-imklogleak.patch, NONE, 1.1 rsyslog-3.12.3-objinfo.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 rsyslog.spec, 1.30, 1.31 sources, 1.19, 1.20 rsyslog-3.12.1-omfile.patch, 1.1, NONE

Wed Mar 19 09:54:09 UTC 2008

Author: pvrabec

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

Modified Files:
	.cvsignore rsyslog.spec sources 
Added Files:
	rsyslog-3.12.3-imklogleak.patch rsyslog-3.12.3-objinfo.patch 
Removed Files:
	rsyslog-3.12.1-omfile.patch 
Log Message:
upgrade


rsyslog-3.12.3-imklogleak.patch:

--- NEW FILE rsyslog-3.12.3-imklogleak.patch ---
--- rsyslog-3.12.3/plugins/imklog/ksym.c.leak	2008-03-18 23:37:23.000000000 +0100
+++ rsyslog-3.12.3/plugins/imklog/ksym.c	2008-03-18 23:42:49.000000000 +0100
@@ -269,6 +269,12 @@
 }
 
 
+extern void DeinitKsyms(void)
+{
+	FreeSymbols();
+}
+
+
 /**************************************************************************
  * Function:	FindSymbolFile
  *
--- rsyslog-3.12.3/plugins/imklog/imklog.h.leak	2008-03-18 23:36:57.000000000 +0100
+++ rsyslog-3.12.3/plugins/imklog/imklog.h	2008-03-18 23:41:03.000000000 +0100
@@ -33,7 +33,9 @@
 
 /* prototypes */
 extern int InitKsyms(char *);
+extern void DeinitKsyms(void);
 extern int InitMsyms(void);
+extern void DeinitMsyms(void);
 extern char * ExpandKadds(char *, char *);
 extern void SetParanoiaLevel(int);
 extern void vsyslog(int pri, const char *fmt, va_list ap);
--- rsyslog-3.12.3/plugins/imklog/imklog.c.leak	2008-03-18 23:37:50.000000000 +0100
+++ rsyslog-3.12.3/plugins/imklog/imklog.c	2008-03-18 23:42:22.000000000 +0100
@@ -642,6 +642,9 @@
 	/* cleanup here */
 	if(logsrc != none)
 		CloseLogSrc();
+
+	DeinitKsyms();
+	DeinitMsyms();
 ENDafterRun
 
 
--- rsyslog-3.12.3/plugins/imklog/ksym_mod.c.leak	2008-03-18 23:37:34.000000000 +0100
+++ rsyslog-3.12.3/plugins/imklog/ksym_mod.c	2008-03-18 23:42:56.000000000 +0100
@@ -279,6 +279,12 @@
 }
 
 
+extern void DeinitMsyms(void)
+{
+	FreeModules();
+}
+
+
 /**************************************************************************
  * Function:	FreeModules
  *

rsyslog-3.12.3-objinfo.patch:

--- NEW FILE rsyslog-3.12.3-objinfo.patch ---
diff -up rsyslog-3.12.3/modules.c.objinfo rsyslog-3.12.3/modules.c
--- rsyslog-3.12.3/modules.c.objinfo	2008-03-18 18:21:48.000000000 +0100
+++ rsyslog-3.12.3/modules.c	2008-03-18 18:22:14.000000000 +0100
@@ -700,7 +700,6 @@ Release(char *srcFile, modInfo_t **ppThi
 		/* we have a zero refcount, so we must unload the module */
 		dbgprintf("module '%s' has zero reference count, unloading...\n", pThis->pszName);
 		modUnlinkAndDestroy(&pThis);
-		*ppThis = NULL; /* nobody can access it any longer! */
 	}
 
 	RETiRet;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	7 Mar 2008 11:12:39 -0000	1.18
+++ .cvsignore	19 Mar 2008 09:53:31 -0000	1.19
@@ -1,4 +1,4 @@
-rsyslog-3.12.1.tar.gz
+rsyslog-3.12.3.tar.gz
 rsyslog.conf
 rsyslog.init
 rsyslog.sysconfig


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- rsyslog.spec	11 Mar 2008 11:29:05 -0000	1.30
+++ rsyslog.spec	19 Mar 2008 09:53:31 -0000	1.31
@@ -2,8 +2,8 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 3.12.1
-Release: 2%{?dist}
+Version: 3.12.3
+Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -12,7 +12,8 @@
 Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Patch1: rsyslog-3.11.4-undef.patch
-Patch2: rsyslog-3.12.1-omfile.patch
+Patch2: rsyslog-3.12.3-imklogleak.patch
+Patch3: rsyslog-3.12.3-objinfo.patch
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
 Requires: logrotate >= 3.5.2
@@ -68,10 +69,16 @@
 %prep
 %setup -q
 %patch1 -p1 -b .undef
-%patch2 -p1 -b .omfile
+%patch2 -p1 -b .imklogleak
+%patch3 -p1 -b .objinfo
 
 %build
-%configure --sbindir=%{sbindir} --disable-static --enable-mysql --enable-pgsql --enable-gssapi-krb5
+%configure	--sbindir=%{sbindir} \
+		--disable-static \
+		--enable-mysql \
+		--enable-pgsql \
+		--enable-gssapi-krb5 \
+		--enable-imfile
 make %{?_smp_mflags}
 
 %install
@@ -123,10 +130,14 @@
 %{_libdir}/rsyslog/imklog.so
 %{_libdir}/rsyslog/immark.so
 %{_libdir}/rsyslog/imtcp.so
-%{_libdir}/rsyslog/tcpsrv.so
 %{_libdir}/rsyslog/imudp.so
 %{_libdir}/rsyslog/imuxsock.so
+%{_libdir}/rsyslog/imfile.so
 %{_libdir}/rsyslog/omtesting.so
+%{_libdir}/rsyslog/lmnet.so
+%{_libdir}/rsyslog/lmregexp.so
+%{_libdir}/rsyslog/lmtcpclt.so
+%{_libdir}/rsyslog/lmtcpsrv.so
 %config %{_sysconfdir}/rsyslog.conf
 %config %{_sysconfdir}/sysconfig/rsyslog
 %config(noreplace) %{_sysconfdir}/logrotate.d/syslog
@@ -147,11 +158,15 @@
 
 %files gssapi
 %defattr(-,root,root)
-%{_libdir}/rsyslog/gssutil.so
+%{_libdir}/rsyslog/lmgssutil.so
 %{_libdir}/rsyslog/imgssapi.so
 %{_libdir}/rsyslog/omgssapi.so
 
 %changelog
+* Wed Mar 19 2008 Peter Vrabec <pvrabec at redhat.com> 3.12.3-1
+- upgrade 
+- fix some significant memory leaks
+
 * Tue Mar 11 2008 Peter Vrabec <pvrabec at redhat.com> 3.12.1-2
 - init script fixes (#436854)
 - fix config file parsing (#436722)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	11 Mar 2008 10:42:39 -0000	1.19
+++ sources	19 Mar 2008 09:53:31 -0000	1.20
@@ -1,4 +1,4 @@
-12c743b21a0984467bc4c05b6ee887e2  rsyslog-3.12.1.tar.gz
+a4df17b87cae167db488648726656068  rsyslog-3.12.3.tar.gz
 9730674162e08bcc88503a19e21ac2d4  rsyslog.conf
-04f3868aa518d33809f5943d7bc2fc0b  rsyslog.sysconfig
 8121efe30193878a7315fe12c25cc292  rsyslog.init
+04f3868aa518d33809f5943d7bc2fc0b  rsyslog.sysconfig


--- rsyslog-3.12.1-omfile.patch DELETED ---


