[Pkg-xfce-commits] r6158 - in goodies/trunk/xfce4-mailwatch-plugin/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-10-24 16:21:10 +0000 (Mon, 24 Oct 2011)
New Revision: 6158

Added:
   goodies/trunk/xfce4-mailwatch-plugin/debian/patches/04_fix-format-string-errors.patch
Modified:
   goodies/trunk/xfce4-mailwatch-plugin/debian/changelog
   goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series
Log:
* debian/patches:
  - 04_fix-format-string-errors added, fix some string format errors leading
    to a FTBFS when building with -Werror=format-security.    closes: #646497

Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/changelog	2011-10-24 16:02:15 UTC (rev 6157)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/changelog	2011-10-24 16:21:10 UTC (rev 6158)
@@ -1,3 +1,11 @@
+xfce4-mailwatch-plugin (1.1.0-5) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 04_fix-format-string-errors added, fix some string format errors leading
+      to a FTBFS when building with -Werror=format-security.    closes: #646497
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 24 Oct 2011 18:12:37 +0200
+
 xfce4-mailwatch-plugin (1.1.0-4) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Added: goodies/trunk/xfce4-mailwatch-plugin/debian/patches/04_fix-format-string-errors.patch
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/patches/04_fix-format-string-errors.patch	                        (rev 0)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/patches/04_fix-format-string-errors.patch	2011-10-24 16:21:10 UTC (rev 6158)
@@ -0,0 +1,43 @@
+Description: Link format string errors
+Author: Yves-Alexis Perez <corsac at debian.org>
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8063
+Index: xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c
+===================================================================
+--- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-net-conn.c	2011-10-24 18:08:09.891132011 +0200
++++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c	2011-10-24 18:08:53.387469616 +0200
+@@ -224,7 +224,7 @@
+         else
+             reason = gnutls_strerror(ret);
+         if(error)
+-            g_set_error(error, XFCE_MAILWATCH_ERROR, code, reason);
++            g_set_error(error, XFCE_MAILWATCH_ERROR, code, "%s", reason);
+         g_critical("XfceMailwatch: TLS handshake failed: %s", reason);
+ 
+         return FALSE;
+@@ -761,7 +761,7 @@
+             break;
+         else if(ret < 0 && EINTR != errno) {
+             g_set_error(error, XFCE_MAILWATCH_ERROR,
+-                        XFCE_MAILWATCH_ERROR_FAILED, strerror(errno));
++                        XFCE_MAILWATCH_ERROR_FAILED, "%s", strerror(errno));
+             return -1;
+         } else if(!block)
+             return 0;
+@@ -771,7 +771,7 @@
+     if(ret < 0 && EINTR != errno) {
+         if(error) {
+             g_set_error(error, XFCE_MAILWATCH_ERROR,
+-                        XFCE_MAILWATCH_ERROR_FAILED, strerror(errno));
++                        XFCE_MAILWATCH_ERROR_FAILED, "%s", strerror(errno));
+         }
+         return -1;
+     } else if(!SHOULD_CONTINUE(net_conn)) {
+@@ -783,7 +783,7 @@
+     } else if(TIMER_EXPIRED(RECV_TIMEOUT)) {
+         if(error) {
+             g_set_error(error, XFCE_MAILWATCH_ERROR,
+-                        XFCE_MAILWATCH_ERROR_FAILED, strerror(ETIMEDOUT));
++                        XFCE_MAILWATCH_ERROR_FAILED, "%s", strerror(ETIMEDOUT));
+         }
+         return -1;
+     }

Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series	2011-10-24 16:02:15 UTC (rev 6157)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series	2011-10-24 16:21:10 UTC (rev 6158)
@@ -2,3 +2,4 @@
 02_mbox-interval.diff
 02_link-with-libxfcegui4.patch
 03_fix-implicit-dso-linking.patch
+04_fix-format-string-errors.patch