[bustle] 03/09: debian/patches: update for new release

Hector Oron zumbi at moszumanska.debian.org
Sun Dec 11 23:04:34 UTC 2016


This is an automated email from the git hooks/post-receive script.

zumbi pushed a commit to branch master
in repository bustle.

commit d51519ea64943307a74575ebf1d54c0af9ab5a17
Author: Héctor Orón Martínez <zumbi at debian.org>
Date:   Sun Dec 11 23:16:42 2016 +0100

    debian/patches: update for new release
    
    Signed-off-by: Héctor Orón Martínez <zumbi at debian.org>
---
 debian/changelog                                   | 13 +++
 ...p-stop-leaking-so-much-in-parse_arguments.patch | 95 ++++++++++++++++++++++
 ...hread_try_new-rather-than-g_thread_create.patch | 25 ------
 debian/patches/series                              |  2 +-
 4 files changed, 109 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a5a3b48..1226483 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+bustle (0.5.4-1) UNRELEASED; urgency=medium
+
+  * New upstream version 0.5.4
+  * debian/watch: improve regex and use https url
+  * move bustle-pcap man file into bustle-pcap package. (Closes: #783689)
+  * debian/patches:
+    - drop 0002-Use-g_thread_try_new-rather-than-g_thread_create.patch
+      (upstreamed)
+    - add 0001-bustle-pcap-stop-leaking-so-much-in-parse_arguments.patch
+      (taken from upstream)
+
+ -- Héctor Orón Martínez <zumbi at debian.org>  Sun, 11 Dec 2016 23:08:30 +0100
+
 bustle (0.5.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/0001-bustle-pcap-stop-leaking-so-much-in-parse_arguments.patch b/debian/patches/0001-bustle-pcap-stop-leaking-so-much-in-parse_arguments.patch
new file mode 100644
index 0000000..17f40fd
--- /dev/null
+++ b/debian/patches/0001-bustle-pcap-stop-leaking-so-much-in-parse_arguments.patch
@@ -0,0 +1,95 @@
+From 5051295aae3d85f6052568c8c86e4ef16c884b21 Mon Sep 17 00:00:00 2001
+From: Jonny Lamb <jonny.lamb at collabora.co.uk>
+Date: Thu, 28 Jan 2016 15:07:43 +0000
+Subject: [PATCH] bustle-pcap: stop leaking so much in parse_arguments()
+
+---
+ c-sources/bustle-pcap.c | 30 +++++++++++++++++++++++++-----
+ 1 file changed, 25 insertions(+), 5 deletions(-)
+
+diff --git a/c-sources/bustle-pcap.c b/c-sources/bustle-pcap.c
+index f68553a..29082c3 100644
+--- a/c-sources/bustle-pcap.c
++++ b/c-sources/bustle-pcap.c
+@@ -109,6 +109,7 @@ parse_arguments (
+   gchar *usage;
+   GError *error = NULL;
+   gboolean ret;
++  gint exit_status = -1;
+ 
+   context = g_option_context_new ("FILENAME");
+   g_option_context_add_main_entries (context, entries, NULL);
+@@ -121,7 +122,9 @@ parse_arguments (
+     {
+       fprintf (stderr, "%s\n", error->message);
+       fprintf (stderr, "%s", usage);
+-      exit (2);
++
++      exit_status = 2;
++      goto out;
+     }
+ 
+   if (version)
+@@ -130,13 +133,17 @@ parse_arguments (
+       fprintf (stdout, "Copyright 2011 Will Thompson <will at willthompson.co.uk>\n");
+       fprintf (stdout, "This is free software; see the source for copying conditions.  There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n");
+       fprintf (stdout, "Written by Will Thompson <will at willthompson.co.uk>\n");
+-      exit (0);
++
++      exit_status = 0;
++      goto out;
+     }
+   else if (session_specified && system_specified)
+     {
+       fprintf (stderr, "You may only specify one of --session and --system\n");
+       fprintf (stderr, "%s", usage);
+-      exit (2);
++
++      exit_status = 2;
++      goto out;
+     }
+   else if (system_specified)
+     {
+@@ -153,10 +160,21 @@ parse_arguments (
+     {
+       fprintf (stderr, "You must specify exactly one output filename\n");
+       fprintf (stderr, "%s", usage);
+-      exit (2);
++
++      exit_status = 2;
++      goto out;
+     }
+ 
+-  *filename = filenames[0];
++  *filename = g_strdup (filenames[0]);
++
++out:
++  g_free (usage);
++  g_strfreev (filenames);
++  g_option_context_free (context);
++  g_clear_error (&error);
++
++  if (exit_status > -1)
++    exit (exit_status);
+ }
+ 
+ static void
+@@ -196,6 +214,7 @@ main (
+   if (pcap == NULL)
+     {
+       fprintf (stderr, "%s", error->message);
++      g_clear_error (&error);
+       exit (1);
+     }
+ 
+@@ -214,6 +233,7 @@ main (
+ 
+   bustle_pcap_monitor_stop (pcap);
+   g_object_unref (pcap);
++  g_free (filename);
+ 
+   return 0;
+ }
+-- 
+2.7.0.rc3
+
diff --git a/debian/patches/0002-Use-g_thread_try_new-rather-than-g_thread_create.patch b/debian/patches/0002-Use-g_thread_try_new-rather-than-g_thread_create.patch
deleted file mode 100644
index 9af518a..0000000
--- a/debian/patches/0002-Use-g_thread_try_new-rather-than-g_thread_create.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b5bdd77ff2c8532365806bdfae490b59295fd795 Mon Sep 17 00:00:00 2001
-From: Will Thompson <will at willthompson.co.uk>
-Date: Mon, 3 Sep 2012 10:50:22 -0400
-Subject: [PATCH 2/2] Use g_thread_try_new rather than g_thread_create
-
-The latter is deprecated. This seems like an extremely worthwhile change
-to have to make.
----
- Makefile                 |    2 +-
- c-sources/pcap-monitor.c |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: b/c-sources/pcap-monitor.c
-===================================================================
---- a/c-sources/pcap-monitor.c
-+++ b/c-sources/pcap-monitor.c
-@@ -444,7 +444,7 @@
-       return FALSE;
-     }
- 
--  priv->thread = g_thread_create (log_thread, &priv->td, TRUE, error);
-+  priv->thread = g_thread_try_new ("monitor", log_thread, &priv->td, error);
-   if (priv->thread == NULL)
-     {
-       g_prefix_error (error, "Couldn't spawn logging thread: ");
diff --git a/debian/patches/series b/debian/patches/series
index da5a43a..55bc525 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-##0002-Use-g_thread_try_new-rather-than-g_thread_create.patch
 use-system-usr-prefix.patch
+0001-bustle-pcap-stop-leaking-so-much-in-parse_arguments.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/bustle.git



More information about the Pkg-haskell-commits mailing list