From 9d3ea030add2ff980e890ff2c931e9b568249d07 Mon Sep 17 00:00:00 2001
From: Peter Vrabec <pvrabec@fedoraproject.org>
Date: Tue, 25 Mar 2008 11:12:01 +0000
Subject: [PATCH] upgrade

---
 .cvsignore                      |  2 +-
 rsyslog-3.12.3-imklogleak.patch | 54 ---------------------------------
 rsyslog-3.12.3-objinfo.patch    | 11 -------
 rsyslog.spec                    |  9 +++---
 sources                         |  2 +-
 5 files changed, 6 insertions(+), 72 deletions(-)
 delete mode 100644 rsyslog-3.12.3-imklogleak.patch
 delete mode 100644 rsyslog-3.12.3-objinfo.patch

diff --git a/.cvsignore b/.cvsignore
index 21aea51..7fe1568 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-rsyslog-3.12.3.tar.gz
 rsyslog.conf
 rsyslog.init
 rsyslog.sysconfig
+rsyslog-3.12.4.tar.gz
diff --git a/rsyslog-3.12.3-imklogleak.patch b/rsyslog-3.12.3-imklogleak.patch
deleted file mode 100644
index a5acb0d..0000000
--- a/rsyslog-3.12.3-imklogleak.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- 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
-  *
diff --git a/rsyslog-3.12.3-objinfo.patch b/rsyslog-3.12.3-objinfo.patch
deleted file mode 100644
index 9b80a21..0000000
--- a/rsyslog-3.12.3-objinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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;
diff --git a/rsyslog.spec b/rsyslog.spec
index b487a10..2610999 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -2,7 +2,7 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 3.12.3
+Version: 3.12.4
 Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
@@ -12,8 +12,6 @@ Source1: rsyslog.init
 Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Patch1: rsyslog-3.11.4-undef.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
@@ -69,8 +67,6 @@ authentication.
 %prep
 %setup -q
 %patch1 -p1 -b .undef
-%patch2 -p1 -b .imklogleak
-%patch3 -p1 -b .objinfo
 
 %build
 %configure	--sbindir=%{sbindir} \
@@ -163,6 +159,9 @@ fi
 %{_libdir}/rsyslog/omgssapi.so
 
 %changelog
+* Mon Mar 25 2008 Peter Vrabec <pvrabec@redhat.com> 3.12.4-1
+- upgrade
+
 * Wed Mar 19 2008 Peter Vrabec <pvrabec@redhat.com> 3.12.3-1
 - upgrade 
 - fix some significant memory leaks
diff --git a/sources b/sources
index 9610ad6..cbe1eaf 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-a4df17b87cae167db488648726656068  rsyslog-3.12.3.tar.gz
 9730674162e08bcc88503a19e21ac2d4  rsyslog.conf
 8121efe30193878a7315fe12c25cc292  rsyslog.init
 04f3868aa518d33809f5943d7bc2fc0b  rsyslog.sysconfig
+dedb7b736968eeca5983a72f417b2976  rsyslog-3.12.4.tar.gz