tags 643404 + pending thanks Dear maintainer,
I've prepared an NMU for gyrus (versioned as 0.3.10-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Page&Plant: Walking Into Clarksdale
diff -u gyrus-0.3.10/debian/changelog gyrus-0.3.10/debian/changelog
--- gyrus-0.3.10/debian/changelog
+++ gyrus-0.3.10/debian/changelog
@@ -1,3 +1,13 @@
+gyrus (0.3.10-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "FTBFS: gyrus-admin.c:1474:4: error: format not a string literal and
+ no format arguments [-Werror=format-security]": add patch from Bart
+ Martens (minus the change in Makefile.in) as debian/patches/643404.diff.
+ Closes: #643404
+
+ -- gregor herrmann <gre...@debian.org> Sat, 15 Oct 2011 19:17:57 +0200
+
gyrus (0.3.10-1) unstable; urgency=low
* Imported Upstream version 0.3.10
only in patch2:
unchanged:
--- gyrus-0.3.10.orig/debian/patches/643404.diff
+++ gyrus-0.3.10/debian/patches/643404.diff
@@ -0,0 +1,73 @@
+diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/gyrus-0.3.10/src/gyrus-admin.c ./src/gyrus-admin.c
+--- ../orig/gyrus-0.3.10/src/gyrus-admin.c 2010-12-29 01:31:16.000000000 +0100
++++ ./src/gyrus-admin.c 2011-10-04 04:31:06.000000000 +0200
+@@ -1471,11 +1471,11 @@
+ if (!duplicated) {
+ if (!gyrus_admin_acl_set_entry (admin, mailbox,
+ newname, rights, &error)) {
+- g_warning (error);
++ g_warning ("%s", error);
+ g_free (error);
+ } else if (!gyrus_admin_acl_delete_entry (admin, mailbox,
+ oldname, &error)) {
+- g_warning (error);
++ g_warning ("%s", error);
+ g_free (error);
+ } else {
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+@@ -1486,16 +1486,16 @@
+ /* DELETE EXISTING ONE */
+ if (!gyrus_admin_acl_delete_entry (admin, mailbox,
+ newname, &error)) {
+- g_warning (error);
++ g_warning ("%s", error);
+ g_free (error);
+ } else if (!gyrus_admin_acl_set_entry (admin, mailbox,
+ newname, rights,
+ &error)) {
+- g_warning (error);
++ g_warning ("%s", error);
+ g_free (error);
+ } else if (!gyrus_admin_acl_delete_entry (admin, mailbox,
+ oldname, &error)) {
+- g_warning (error);
++ g_warning ("%s", error);
+ g_free (error);
+ } else {
+ /* All OK! */
+diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/gyrus-0.3.10/src/gyrus-admin-mailbox.c ./src/gyrus-admin-mailbox.c
+--- ../orig/gyrus-0.3.10/src/gyrus-admin-mailbox.c 2010-12-29 00:57:44.000000000 +0100
++++ ./src/gyrus-admin-mailbox.c 2011-10-04 04:32:19.000000000 +0200
+@@ -163,7 +163,7 @@
+ /* sets the quota info in the screen */
+ if (quota_limit < 0)
+ g_sprintf (str_quota_limit,
+- msg);
++ "%s", msg);
+ else
+ gyrus_admin_mailbox_get_human_quota (quota_limit,
+ str_quota_limit);
+diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/gyrus-0.3.10/src/gyrus-common.c ./src/gyrus-common.c
+--- ../orig/gyrus-0.3.10/src/gyrus-common.c 2010-12-29 00:52:13.000000000 +0100
++++ ./src/gyrus-common.c 2011-10-04 04:33:00.000000000 +0200
+@@ -36,7 +36,7 @@
+ GtkWidget *dialog;
+
+ dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL,
+- type, GTK_BUTTONS_OK, message);
++ type, GTK_BUTTONS_OK, "%s", message);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/gyrus-0.3.10/src/gyrus-session.c ./src/gyrus-session.c
+--- ../orig/gyrus-0.3.10/src/gyrus-session.c 2010-12-29 00:52:13.000000000 +0100
++++ ./src/gyrus-session.c 2011-10-04 04:31:16.000000000 +0200
+@@ -658,7 +658,7 @@
+ aux->sep_char = g_strdup (".");
+ else if (error) {
+ aux->sep_char = g_strdup (".");
+- g_warning (error->message);
++ g_warning ("%s", error->message);
+ g_error_free (error);
+ }
+
signature.asc
Description: Digital signature
