r36996 - in /desktop/experimental/gcr/debian: changelog libgcr-3-1.symbols patches/ patches/0001-fix-build-error-with-Werror-format-security.patch patches/series rules
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Sat Mar 16 17:53:58 UTC 2013
Author: ah
Date: Sat Mar 16 17:53:57 2013
New Revision: 36996
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36996
Log:
* New upstream release (v3.7.5)
- Explicitly pass --with-gtk
* New upstream release (v3.7.91)
* Dropped debian/patches/00git.patch, now included in released version.
* Added debian/patches/0001-fix-build-error-with-Werror-format-security.patch
* debian/rules: no need for debian/libgcr-3-1/usr/lib/libgcr-3.so.1:0:0
fix anymore so drop it. (see "Fix broken symlink name" above?)
* debian/libgcr-3-1.symbols: updated.
- many symbols dropped, but none used outside gcr.
* Fix "Explictly" spelling error in debian/changelog found by lintian.
Added:
desktop/experimental/gcr/debian/patches/
desktop/experimental/gcr/debian/patches/0001-fix-build-error-with-Werror-format-security.patch
desktop/experimental/gcr/debian/patches/series
Modified:
desktop/experimental/gcr/debian/changelog
desktop/experimental/gcr/debian/libgcr-3-1.symbols
desktop/experimental/gcr/debian/rules
Modified: desktop/experimental/gcr/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gcr/debian/changelog?rev=36996&op=diff
==============================================================================
--- desktop/experimental/gcr/debian/changelog [utf-8] (original)
+++ desktop/experimental/gcr/debian/changelog [utf-8] Sat Mar 16 17:53:57 2013
@@ -1,11 +1,11 @@
-gcr (3.7.5-1) UNRELEASED; urgency=low
+gcr (3.7.91-1) UNRELEASED; urgency=low
[ Rico Tzschichholz ]
- * New upstream release
+ * New upstream release (v3.7.5)
* debian/control:
- Bump build-dep on gobject-introspection (>= 1.34)
* debian/rules:
- - Explictly pass --with-gtk
+ - Explicitly pass --with-gtk
* debian/libgcr-3-*.*,gir1.2-gcr-3.install:
- Install libgcr-ui-3.so.* and GI files, backward compat symlinks to
libgcr-3.so are provided
@@ -18,7 +18,17 @@
* debian/libgcr-3-0.symbols:
- Updated
- -- Rico Tzschichholz <ricotz at ubuntu.com> Wed, 20 Feb 2013 18:49:37 +0100
+ [ Andreas Henriksson ]
+ * New upstream release (v3.7.91)
+ * Dropped debian/patches/00git.patch, now included in released version.
+ * Added debian/patches/0001-fix-build-error-with-Werror-format-security.patch
+ * debian/rules: no need for debian/libgcr-3-1/usr/lib/libgcr-3.so.1:0:0
+ fix anymore so drop it. (see "Fix broken symlink name" above?)
+ * debian/libgcr-3-1.symbols: updated.
+ - many symbols dropped, but none used outside gcr.
+ * Fix "Explictly" spelling error in debian/changelog found by lintian.
+
+ -- Andreas Henriksson <andreas at fatal.se> Sat, 16 Mar 2013 17:54:16 +0100
gcr (3.6.0-1) experimental; urgency=low
Modified: desktop/experimental/gcr/debian/libgcr-3-1.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gcr/debian/libgcr-3-1.symbols?rev=36996&op=diff
==============================================================================
--- desktop/experimental/gcr/debian/libgcr-3-1.symbols [utf-8] (original)
+++ desktop/experimental/gcr/debian/libgcr-3-1.symbols [utf-8] Sat Mar 16 17:53:57 2013
@@ -1,6 +1,5 @@
libgcr-base-3.so.1 libgcr-3-1 #MINVER#
* Build-Depends-Package: libgcr-3-dev
- SECMEM_pool_data_v1_0 at Base 3.4.0
_gcr_callback_output_stream_get_type at Base 3.7.5
_gcr_callback_output_stream_new at Base 3.7.5
_gcr_certificate_extension_basic_constraints at Base 3.7.5
@@ -105,7 +104,28 @@
_gcr_memory_icon_new at Base 3.7.5
_gcr_memory_icon_new_full at Base 3.7.5
_gcr_mock_prompt_get_type at Base 3.7.5
- _gcr_oids_init at Base 3.7.5
+ _gcr_oid_alt_name_dns_srv_get_quark at Base 3.7.91
+ _gcr_oid_alt_name_xmpp_addr_get_quark at Base 3.7.91
+ _gcr_oid_basic_constraints_get_quark at Base 3.7.91
+ _gcr_oid_extended_key_usage_get_quark at Base 3.7.91
+ _gcr_oid_key_usage_get_quark at Base 3.7.91
+ _gcr_oid_name_cn_get_quark at Base 3.7.91
+ _gcr_oid_pkcs12_bag_certificate_get_quark at Base 3.7.91
+ _gcr_oid_pkcs12_bag_crl_get_quark at Base 3.7.91
+ _gcr_oid_pkcs12_bag_pkcs8_encrypted_key_get_quark at Base 3.7.91
+ _gcr_oid_pkcs12_bag_pkcs8_key_get_quark at Base 3.7.91
+ _gcr_oid_pkcs7_data_get_quark at Base 3.7.91
+ _gcr_oid_pkcs7_encrypted_data_get_quark at Base 3.7.91
+ _gcr_oid_pkcs7_signed_data_get_quark at Base 3.7.91
+ _gcr_oid_pkcs9_attribute_extension_req_get_quark at Base 3.7.91
+ _gcr_oid_pkcs9_attribute_friendly_get_quark at Base 3.7.91
+ _gcr_oid_pkcs9_attribute_local_key_id_get_quark at Base 3.7.91
+ _gcr_oid_pkix1_dsa_get_quark at Base 3.7.91
+ _gcr_oid_pkix1_rsa_get_quark at Base 3.7.91
+ _gcr_oid_pkix1_sha1_with_dsa_get_quark at Base 3.7.91
+ _gcr_oid_pkix1_sha1_with_rsa_get_quark at Base 3.7.91
+ _gcr_oid_subject_alt_name_get_quark at Base 3.7.91
+ _gcr_oid_subject_key_identifier_get_quark at Base 3.7.91
_gcr_openpgp_parse at Base 3.7.5
_gcr_openssh_pub_parse at Base 3.7.5
_gcr_pkcs11_importer_get_imported at Base 3.7.5
@@ -151,7 +171,6 @@
_gcr_subject_public_key_load_finish at Base 3.7.5
_gcr_uninitialize_library at Base 3.7.5
_gcr_util_parse_lines at Base 3.7.5
- gcr_certificate_compare at Base 3.4.0
gcr_certificate_chain_add at Base 3.4.0
gcr_certificate_chain_build at Base 3.4.0
gcr_certificate_chain_build_async at Base 3.4.0
@@ -165,6 +184,7 @@
gcr_certificate_chain_get_type at Base 3.4.0
gcr_certificate_chain_new at Base 3.4.0
gcr_certificate_chain_status_get_type at Base 3.4.0
+ gcr_certificate_compare at Base 3.4.0
gcr_certificate_get_basic_constraints at Base 3.4.0
gcr_certificate_get_columns at Base 3.4.0
gcr_certificate_get_der_data at Base 3.4.0
@@ -187,11 +207,11 @@
gcr_certificate_get_subject_part at Base 3.4.0
gcr_certificate_get_subject_raw at Base 3.4.0
gcr_certificate_get_type at Base 3.4.0
+ gcr_certificate_is_issuer at Base 3.4.0
gcr_certificate_mixin_class_init at Base 3.4.0
gcr_certificate_mixin_comparable_init at Base 3.4.0
gcr_certificate_mixin_emit_notify at Base 3.4.0
gcr_certificate_mixin_get_property at Base 3.4.0
- gcr_certificate_is_issuer at Base 3.4.0
gcr_certificate_request_capable at Base 3.4.0
gcr_certificate_request_capable_async at Base 3.4.0
gcr_certificate_request_capable_finish at Base 3.4.0
@@ -227,6 +247,11 @@
gcr_fingerprint_from_attributes at Base 3.4.0
gcr_fingerprint_from_subject_public_key_info at Base 3.4.0
gcr_icon_for_token at Base 3.4.0
+ gcr_import_interaction_get_type at Base 3.4.0
+ gcr_import_interaction_supplement at Base 3.4.0
+ gcr_import_interaction_supplement_async at Base 3.4.0
+ gcr_import_interaction_supplement_finish at Base 3.4.0
+ gcr_import_interaction_supplement_prep at Base 3.4.0
gcr_importer_create_for_parsed at Base 3.4.0
gcr_importer_get_interaction at Base 3.4.0
gcr_importer_get_parser at Base 3.4.0
@@ -245,11 +270,6 @@
gcr_importer_set_parser at Base 3.4.0
gcr_importer_set_prompt_behavior at Base 3.4.0
gcr_importer_set_slot at Base 3.4.0
- gcr_import_interaction_get_type at Base 3.4.0
- gcr_import_interaction_supplement at Base 3.4.0
- gcr_import_interaction_supplement_async at Base 3.4.0
- gcr_import_interaction_supplement_finish at Base 3.4.0
- gcr_import_interaction_supplement_prep at Base 3.4.0
gcr_mock_prompter_disconnect at Base 3.7.2
gcr_mock_prompter_expect_close at Base 3.7.2
gcr_mock_prompter_expect_confirm_cancel at Base 3.4.0
@@ -360,6 +380,18 @@
gcr_simple_collection_get_type at Base 3.4.0
gcr_simple_collection_new at Base 3.4.0
gcr_simple_collection_remove at Base 3.4.0
+ gcr_system_prompt_close at Base 3.4.0
+ gcr_system_prompt_close_async at Base 3.4.0
+ gcr_system_prompt_close_finish at Base 3.4.0
+ gcr_system_prompt_error_get_domain at Base 3.4.0
+ gcr_system_prompt_error_get_type at Base 3.4.0
+ gcr_system_prompt_get_secret_exchange at Base 3.4.0
+ gcr_system_prompt_get_type at Base 3.4.0
+ gcr_system_prompt_open at Base 3.4.0
+ gcr_system_prompt_open_async at Base 3.4.0
+ gcr_system_prompt_open_finish at Base 3.4.0
+ gcr_system_prompt_open_for_prompter at Base 3.4.0
+ gcr_system_prompt_open_for_prompter_async at Base 3.4.0
gcr_system_prompter_get_mode at Base 3.4.0
gcr_system_prompter_get_prompt_type at Base 3.4.0
gcr_system_prompter_get_prompting at Base 3.4.0
@@ -368,18 +400,6 @@
gcr_system_prompter_new at Base 3.4.0
gcr_system_prompter_register at Base 3.4.0
gcr_system_prompter_unregister at Base 3.4.0
- gcr_system_prompt_close at Base 3.4.0
- gcr_system_prompt_close_async at Base 3.4.0
- gcr_system_prompt_close_finish at Base 3.4.0
- gcr_system_prompt_error_get_domain at Base 3.4.0
- gcr_system_prompt_error_get_type at Base 3.4.0
- gcr_system_prompt_get_type at Base 3.4.0
- gcr_system_prompt_get_secret_exchange at Base 3.4.0
- gcr_system_prompt_open at Base 3.4.0
- gcr_system_prompt_open_async at Base 3.4.0
- gcr_system_prompt_open_finish at Base 3.4.0
- gcr_system_prompt_open_for_prompter at Base 3.4.0
- gcr_system_prompt_open_for_prompter_async at Base 3.4.0
gcr_trust_add_pinned_certificate at Base 3.4.0
gcr_trust_add_pinned_certificate_async at Base 3.4.0
gcr_trust_add_pinned_certificate_finish at Base 3.4.0
Added: desktop/experimental/gcr/debian/patches/0001-fix-build-error-with-Werror-format-security.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gcr/debian/patches/0001-fix-build-error-with-Werror-format-security.patch?rev=36996&op=file
==============================================================================
--- desktop/experimental/gcr/debian/patches/0001-fix-build-error-with-Werror-format-security.patch (added)
+++ desktop/experimental/gcr/debian/patches/0001-fix-build-error-with-Werror-format-security.patch [utf-8] Sat Mar 16 17:53:57 2013
@@ -1,0 +1,59 @@
+From 5766d3a99f4944ee962969031e1a34b6b5db6236 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Sat, 16 Mar 2013 17:51:22 +0100
+Subject: [PATCH] fix build error with -Werror=format-security
+
+partial build output:
+
+libtool: compile: gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I.. -pthread -I/usr/includ
+e/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/gio-unix-
+2.0/ -I/usr/include/p11-kit-1 -DG_LOG_DOMAIN=\"Gcr\" -DGCR_API_SUBJECT_TO_CHANGE
+ -DLOCALEDIR=\"/usr/share/locale\" -D_FORTIFY_SOURCE=2 -DGCK_API_SUBJECT_TO_CHAN
+GE -DP11_KIT_API_SUBJECT_TO_CHANGE -DGCR_COMPILATION -pthread -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/libpng12 -DUIDIR=\"/usr/share/gcr-3/ui/\" -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall -g -Wno-strict-aliasing -Wno-sign-compare -c gcr-certificate-exporter.c -fPIC -DPIC -o .libs/libgcr_ui_3_la-gcr-certificate-exporter.o
+gcr-certificate-exporter.c: In function 'on_create_file_ready':
+gcr-certificate-exporter.c:230:8: error: format not a string literal and no format arguments [-Werror=format-security]
+cc1: some warnings being treated as errors
+make[5]: *** [libgcr_ui_3_la-gcr-certificate-exporter.lo] Error 1
+---
+ ui/gcr-certificate-exporter.c | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/ui/gcr-certificate-exporter.c b/ui/gcr-certificate-exporter.c
+index b448034..8b0977f 100644
+--- a/ui/gcr-certificate-exporter.c
++++ b/ui/gcr-certificate-exporter.c
+@@ -214,7 +214,6 @@ on_create_file_ready (GObject *source, GAsyncResult *res, gpointer user_data)
+ GcrCertificateExporter *self = GCR_CERTIFICATE_EXPORTER (user_data);
+ GFileOutputStream *os;
+ GtkWidget *dialog;
+- gchar *msg;
+
+ os = g_file_create_finish (self->pv->output_file, res, &self->pv->error);
+
+@@ -222,12 +221,11 @@ on_create_file_ready (GObject *source, GAsyncResult *res, gpointer user_data)
+ if (g_error_matches (self->pv->error, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
+ g_clear_error (&self->pv->error);
+
+- msg = g_strdup_printf ("<b>%s</b>\n\n%s",
+- _("A file already exists with this name."),
+- _("Do you want to replace it with a new file?"));
+ dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (self->pv->chooser_dialog),
+ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION,
+- GTK_BUTTONS_NONE, msg);
++ GTK_BUTTONS_NONE, "<b>%s</b>\n\n%s",
++ _("A file already exists with this name."),
++ _("Do you want to replace it with a new file?"));
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Replace"), GTK_RESPONSE_ACCEPT, NULL);
+@@ -239,7 +237,6 @@ on_create_file_ready (GObject *source, GAsyncResult *res, gpointer user_data)
+ G_CALLBACK (on_cancel_replace_dialog),
+ g_object_ref (dialog), g_object_unref);
+ gtk_widget_show (dialog);
+- g_free(msg);
+
+ return;
+ }
+--
+1.7.10.4
+
Added: desktop/experimental/gcr/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gcr/debian/patches/series?rev=36996&op=file
==============================================================================
--- desktop/experimental/gcr/debian/patches/series (added)
+++ desktop/experimental/gcr/debian/patches/series [utf-8] Sat Mar 16 17:53:57 2013
@@ -1,0 +1,1 @@
+0001-fix-build-error-with-Werror-format-security.patch
Modified: desktop/experimental/gcr/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gcr/debian/rules?rev=36996&op=diff
==============================================================================
--- desktop/experimental/gcr/debian/rules [utf-8] (original)
+++ desktop/experimental/gcr/debian/rules [utf-8] Sat Mar 16 17:53:57 2013
@@ -19,7 +19,4 @@
DEB_DH_MAKESHLIBS_ARGS_libgcr-3-1 += -V -- -c4
DEB_DH_MAKESHLIBS_ARGS_libgck-1-0 += -V -- -c4
-binary-install/libgcr-3-1::
- mv debian/libgcr-3-1/usr/lib/libgcr-3.so.1:0:0 debian/libgcr-3-1/usr/lib/libgcr-3.so.1.0.0
-
common-binary-post-install-arch:: list-missing
More information about the pkg-gnome-commits
mailing list