From: Sebastian Harl <sh@teamix.net>
Date: Wed, 30 Jan 2013 20:13:16 +0000 (+0100)
Subject: patches: Removed postgresql_writer_memleak.dpatch -- applied upstream.
X-Git-Tag: collectd-5.2.1-1~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e55ecaca14396b83e068be128a7be240508c5f2d;p=pkg-collectd.git

patches: Removed postgresql_writer_memleak.dpatch -- applied upstream.
---

diff --git a/debian/changelog b/debian/changelog
index 454b699..682c1af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 collectd (5.2.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches:
+    - Removed postgresql_writer_memleak.dpatch -- applied upstream.
 
  -- Sebastian Harl <tokkee@debian.org>  Wed, 30 Jan 2013 20:54:27 +0100
 
diff --git a/debian/patches/00list b/debian/patches/00list
index c3bdb36..23aacf6 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,4 +2,3 @@ rrd_filter_path.dpatch
 collection_conf_path.dpatch
 myplugin_includes.dpatch
 bts559801_plugin_find_fix.dpatch
-postgresql_writer_memleak.dpatch
diff --git a/debian/patches/postgresql_writer_memleak.dpatch b/debian/patches/postgresql_writer_memleak.dpatch
deleted file mode 100755
index 78bfd76..0000000
--- a/debian/patches/postgresql_writer_memleak.dpatch
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## postgresql_writer_memleak.dpatch by Sebastian Harl <sh@tokkee.org>
-##
-## DP: postgresql plugin: Fixed a memory leak occurring on every write.
-
-@DPATCH@
-
-diff a/src/postgresql.c b/src/postgresql.c
---- a/src/postgresql.c
-+++ b/src/postgresql.c
-@@ -900,10 +900,10 @@ static int c_psql_write (const data_set_t *ds, const value_list_t *vl,
- 
- 		if ((PGRES_COMMAND_OK != PQresultStatus (res))
- 				&& (PGRES_TUPLES_OK != PQresultStatus (res))) {
-+			PQclear (res);
-+
- 			if ((CONNECTION_OK != PQstatus (db->conn))
- 					&& (0 == c_psql_check_connection (db))) {
--				PQclear (res);
--
- 				/* try again */
- 				res = PQexecParams (db->conn, writer->statement,
- 						STATIC_ARRAY_SIZE (params), NULL,
-@@ -912,6 +912,7 @@ static int c_psql_write (const data_set_t *ds, const value_list_t *vl,
- 
- 				if ((PGRES_COMMAND_OK == PQresultStatus (res))
- 						|| (PGRES_TUPLES_OK == PQresultStatus (res))) {
-+					PQclear (res);
- 					success = 1;
- 					continue;
- 				}
-@@ -932,6 +933,8 @@ static int c_psql_write (const data_set_t *ds, const value_list_t *vl,
- 			pthread_mutex_unlock (&db->db_lock);
- 			return -1;
- 		}
-+
-+		PQclear (res);
- 		success = 1;
- 	}
-