r29884 - in /desktop/experimental/yelp/debian: changelog patches/05_fix-format-string.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Sep 30 11:27:51 2011
New Revision: 29884

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29884
Log:
* debian/patches/05_fix-format-string.patch:
  - Fix format string error which causes FTBFS with -Werror=format-security.
    Patch cherry-picked from upstream Git.

Added:
    desktop/experimental/yelp/debian/patches/05_fix-format-string.patch
Modified:
    desktop/experimental/yelp/debian/changelog
    desktop/experimental/yelp/debian/patches/series

Modified: desktop/experimental/yelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/changelog?rev=29884&op=diff
==============================================================================
--- desktop/experimental/yelp/debian/changelog [utf-8] (original)
+++ desktop/experimental/yelp/debian/changelog [utf-8] Fri Sep 30 11:27:51 2011
@@ -6,6 +6,9 @@
   * Build gtk-doc API documentation:
     - Add Build-Depends on gtk-doc-tools.
     - Set --enable-gtk-doc configure flag.
+  * debian/patches/05_fix-format-string.patch:
+    - Fix format string error which causes FTBFS with -Werror=format-security.
+      Patch cherry-picked from upstream Git.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 30 Sep 2011 12:50:33 +0200
 

Added: desktop/experimental/yelp/debian/patches/05_fix-format-string.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/patches/05_fix-format-string.patch?rev=29884&op=file
==============================================================================
--- desktop/experimental/yelp/debian/patches/05_fix-format-string.patch (added)
+++ desktop/experimental/yelp/debian/patches/05_fix-format-string.patch [utf-8] Fri Sep 30 11:27:51 2011
@@ -1,0 +1,21 @@
+From d9d6f06bcd90ccab5a7f10cc3f505afb2994e2dd Mon Sep 17 00:00:00 2001
+From: Dexter Morgan <dmorganec at gmail.com>
+Date: Mon, 26 Sep 2011 22:27:38 +0000
+Subject: fix format string
+
+---
+diff --git a/libyelp/yelp-man-parser.c b/libyelp/yelp-man-parser.c
+index 3c75642..25b0f0c 100644
+--- a/libyelp/yelp-man-parser.c
++++ b/libyelp/yelp-man-parser.c
+@@ -380,7 +380,7 @@ get_troff (gchar *path, GError **error)
+                                    NULL, NULL, &ystdout, NULL, &err)) {
+         /* We failed to run the man program. Return a "Huh?" error. */
+         *error = g_error_new (YELP_ERROR, YELP_ERROR_UNKNOWN,
+-                              err->message);
++                              "%s", err->message);
+         g_error_free (err);
+         return NULL;
+     }
+--
+cgit v0.9.0.2

Modified: desktop/experimental/yelp/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/patches/series?rev=29884&op=diff
==============================================================================
--- desktop/experimental/yelp/debian/patches/series [utf-8] (original)
+++ desktop/experimental/yelp/debian/patches/series [utf-8] Fri Sep 30 11:27:51 2011
@@ -1,3 +1,4 @@
 #02_man-utf8.patch
 03_info_crasher.patch
 #04_use_doc-base.patch
+05_fix-format-string.patch