OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/seahorse?expand=0&rev=12

seahorse-abuild-warnings.patch

@@ -1,7 +1,94 @@
-Index: seahorse-2.20/plugins/nautilus/seahorse-tool-files.c
+diff -r 2b79a27fbfe7 libseahorse/seahorse-combo-keys.c
-===================================================================
+--- a/libseahorse/seahorse-combo-keys.c	Wed Nov 21 15:07:02 2007 +0000
---- seahorse-2.20.orig/plugins/nautilus/seahorse-tool-files.c
++++ b/libseahorse/seahorse-combo-keys.c	Wed Nov 21 15:08:03 2007 +0000
-+++ seahorse-2.20/plugins/nautilus/seahorse-tool-files.c
+@@ -68,7 +68,7 @@ key_changed (SeahorseKeyset *skset, Seah
+     gchar *userid;
+     gpointer pntr;
+     SeahorseKey *skeyfrommodel;
+-    
++
+     g_return_if_fail (skey != NULL);
+ 
+     model = gtk_combo_box_get_model (combo);
+@@ -76,7 +76,7 @@ key_changed (SeahorseKeyset *skset, Seah
+     
+     while (valid) {
+         gtk_tree_model_get (model, &iter,
+-                            COMBO_POINTER, pntr,
++                            COMBO_POINTER, &pntr,
+                             -1);
+                             
+         skeyfrommodel = SEAHORSE_KEY (pntr);
+@@ -104,15 +104,16 @@ key_removed (SeahorseKeyset *skset, Seah
+     gpointer pntr;
+     gboolean valid;
+     SeahorseKey *skeyfrommodel;
+-    
++
+     g_return_if_fail (skey != NULL);
+     g_return_if_fail (combo != NULL);
+ 
+     model = gtk_combo_box_get_model (combo);
++    valid = gtk_tree_model_get_iter_first (model, &iter);
+     
+     while (valid) {
+         gtk_tree_model_get (model, &iter,
+-                            COMBO_POINTER, pntr,
++                            COMBO_POINTER, &pntr,
+                             -1);
+                             
+         skeyfrommodel = SEAHORSE_KEY (pntr);
+diff -r 2b79a27fbfe7 libseahorse/seahorse-ssh-key-data.c
+--- a/libseahorse/seahorse-ssh-key-data.c	Wed Nov 21 15:07:02 2007 +0000
++++ b/libseahorse/seahorse-ssh-key-data.c	Wed Nov 21 15:08:03 2007 +0000
+@@ -79,18 +79,23 @@ parse_key_blob (guchar *bytes, gsize len
+ {
+     md5_ctx_t ctx;
+     guchar digest[MD5_LEN];
+-    gchar *fingerprint;
++    gchar *fingerprint, *fingerprint_tmp;
+     guint i;
+     
+     seahorse_md5_init (&ctx);
+     seahorse_md5_update (&ctx, bytes, len);
+     seahorse_md5_final (digest, &ctx);
+     
+-    fingerprint = g_new0 (gchar, MD5_LEN * 3 + 1);
++    /* I think this is better.  */
++    fingerprint = g_strdup("");
+     for (i = 0; i < MD5_LEN; i++) {
+-        char hex[4];
+-        snprintf (hex, sizeof (hex), "%02x:", (int)(digest[i]));
+-        strncat (fingerprint, hex, MD5_LEN * 3 + 1);
++        char *hex;
++        hex = g_strdup_printf("%02x:", (int) (digest[i]));
++        fingerprint_tmp = fingerprint;
++        fingerprint = g_strconcat (fingerprint_tmp, hex, NULL);
++        
++        g_free (fingerprint_tmp);
++        g_free (hex);
+     }
+ 
+     /* Remove the trailing ':' character */
+diff -r 2b79a27fbfe7 libseahorse/seahorse-ssh-operation.c
+--- a/libseahorse/seahorse-ssh-operation.c	Wed Nov 21 15:07:02 2007 +0000
++++ b/libseahorse/seahorse-ssh-operation.c	Wed Nov 21 15:08:03 2007 +0000
+@@ -994,8 +994,11 @@ set_keyring_passphrase (SeahorseKey *ske
+     const gchar *id;
+     gchar *display;
+     
++    g_assert ((skey != NULL) && (pass != NULL));
++    
++    id = seahorse_key_get_rawid (seahorse_key_get_keyid (skey));
+     g_assert (id != NULL);
+-    id = seahorse_key_get_rawid (seahorse_key_get_keyid (skey));
++
+     display = seahorse_key_get_display_name (skey);
+     
+     attributes = gnome_keyring_attribute_list_new ();
+diff -r 2b79a27fbfe7 plugins/nautilus/seahorse-tool-files.c
+--- a/plugins/nautilus/seahorse-tool-files.c	Wed Nov 21 15:07:02 2007 +0000
++++ b/plugins/nautilus/seahorse-tool-files.c	Wed Nov 21 15:08:03 2007 +0000
 @@ -23,8 +23,10 @@
  #include <sys/types.h>
  #include <sys/wait.h>
@@ -37,90 +124,9 @@ Index: seahorse-2.20/plugins/nautilus/seahorse-tool-files.c
          }
  
          /* Setup the main radio buttons */
-Index: seahorse-2.20/libseahorse/seahorse-ssh-operation.c
+diff -r 2b79a27fbfe7 plugins/nautilus/seahorse-tool-progress.c
-===================================================================
+--- a/plugins/nautilus/seahorse-tool-progress.c	Wed Nov 21 15:07:02 2007 +0000
---- seahorse-2.20.orig/libseahorse/seahorse-ssh-operation.c
++++ b/plugins/nautilus/seahorse-tool-progress.c	Wed Nov 21 15:08:03 2007 +0000
-+++ seahorse-2.20/libseahorse/seahorse-ssh-operation.c
-@@ -994,8 +994,11 @@ set_keyring_passphrase (SeahorseKey *ske
-     const gchar *id;
-     gchar *display;
-     
--    g_assert (id != NULL);
-+    g_assert ((skey != NULL) && (pass != NULL));
-+    
-     id = seahorse_key_get_rawid (seahorse_key_get_keyid (skey));
-+    g_assert (id != NULL);
-+
-     display = seahorse_key_get_display_name (skey);
-     
-     attributes = gnome_keyring_attribute_list_new ();
-Index: seahorse-2.20/src/seahorse-pgp-generate.c
-===================================================================
---- seahorse-2.20.orig/src/seahorse-pgp-generate.c
-+++ seahorse-2.20/src/seahorse-pgp-generate.c
-@@ -65,7 +65,6 @@ on_response (GtkDialog *dialog, guint re
-     const gchar *email;
-     const gchar *comment;
-     const gchar *pass;
--    const gchar *t;
-     gpgme_error_t gerr;
-     gint sel;
-     guint type;
-@@ -114,7 +113,7 @@ on_response (GtkDialog *dialog, guint re
-     g_return_if_fail (widget != NULL);
-     bits = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
-     if (bits < 512 || bits > 8192) {
--        g_message ("invalid key size: %s defaulting to 2048", t);
-+        g_message ("invalid key size: %s defaulting to 2048", available_algorithms[sel].desc);
-         bits = 2048;
-     }
-     
-Index: seahorse-2.20/libseahorse/seahorse-combo-keys.c
-===================================================================
---- seahorse-2.20.orig/libseahorse/seahorse-combo-keys.c
-+++ seahorse-2.20/libseahorse/seahorse-combo-keys.c
-@@ -68,7 +68,7 @@ key_changed (SeahorseKeyset *skset, Seah
-     gchar *userid;
-     gpointer pntr;
-     SeahorseKey *skeyfrommodel;
--    
-+
-     g_return_if_fail (skey != NULL);
- 
-     model = gtk_combo_box_get_model (combo);
-@@ -76,7 +76,7 @@ key_changed (SeahorseKeyset *skset, Seah
-     
-     while (valid) {
-         gtk_tree_model_get (model, &iter,
--                            COMBO_POINTER, pntr,
-+                            COMBO_POINTER, &pntr,
-                             -1);
-                             
-         skeyfrommodel = SEAHORSE_KEY (pntr);
-@@ -104,15 +104,17 @@ key_removed (SeahorseKeyset *skset, Seah
-     gpointer pntr;
-     gboolean valid;
-     SeahorseKey *skeyfrommodel;
--    
-+
-     g_return_if_fail (skey != NULL);
-     g_return_if_fail (combo != NULL);
- 
-+    valid = gtk_tree_model_get_iter_first (model, &iter);
-+
-     model = gtk_combo_box_get_model (combo);
-     
-     while (valid) {
-         gtk_tree_model_get (model, &iter,
--                            COMBO_POINTER, pntr,
-+                            COMBO_POINTER, &pntr,
-                             -1);
-                             
-         skeyfrommodel = SEAHORSE_KEY (pntr);
-Index: seahorse-2.20/plugins/nautilus/seahorse-tool-progress.c
-===================================================================
---- seahorse-2.20.orig/plugins/nautilus/seahorse-tool-progress.c
-+++ seahorse-2.20/plugins/nautilus/seahorse-tool-progress.c
 @@ -24,6 +24,7 @@
  #include <signal.h>
  
@@ -138,3 +144,23 @@ Index: seahorse-2.20/plugins/nautilus/seahorse-tool-progress.c
      else
          msg = g_strdup (""); 
  
+diff -r 2b79a27fbfe7 src/seahorse-pgp-generate.c
+--- a/src/seahorse-pgp-generate.c	Wed Nov 21 15:07:02 2007 +0000
++++ b/src/seahorse-pgp-generate.c	Wed Nov 21 15:08:03 2007 +0000
+@@ -65,7 +65,6 @@ on_response (GtkDialog *dialog, guint re
+     const gchar *email;
+     const gchar *comment;
+     const gchar *pass;
+-    const gchar *t;
+     gpgme_error_t gerr;
+     gint sel;
+     guint type;
+@@ -114,7 +113,7 @@ on_response (GtkDialog *dialog, guint re
+     g_return_if_fail (widget != NULL);
+     bits = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
+     if (bits < 512 || bits > 8192) {
+-        g_message ("invalid key size: %s defaulting to 2048", t);
++        g_message ("invalid key size: %s defaulting to 2048", available_algorithms[sel].desc);
+         bits = 2048;
+     }
+     

seahorse.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 21 16:12:13 CET 2007 - maw@suse.de
+
+- Rename abuild.patch to seahorse-abuild-warnings.patch
+- That patch now fixes more questionable code.
+
 -------------------------------------------------------------------
 Thu Oct 11 17:21:59 CEST 2007 - sbrabec@suse.cz
 

seahorse.spec

@@ -17,13 +17,14 @@ Group:          System/GUI/GNOME
 AutoReqProv:    on
 PreReq:         gconf2
 Version:        2.20
-Release:        12
+Release:        31
 Requires:       %{name}-lang = %{version}
 Summary:        GNOME2 interface for gnupg
 Source:         ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2
-Patch2:         %{name}-gpgme-version.patch
+Patch0:         %{name}-gpgme-version.patch
-Patch3:         abuild.patch
+Patch1:         seahorse-desktop.patch
-Patch5:         seahorse-desktop.patch
+# PATCH-FIX-UPSTREAM seahorse-abuild-warnings.patch
+Patch2:         seahorse-abuild-warnings.patch
 Url:            http://seahorse.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %gconf_schemas_prereq
@@ -63,9 +64,9 @@ Authors:
 %lang_package
 %prep
 %setup
-%patch2
+%patch0
-%patch3 -p1
+%patch1 -p1
-%patch5 -p1
+%patch2 -p1
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}
@@ -83,7 +84,7 @@ make -i install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT/var/%_lib/scrollkeeper
 # ...everywhere.
 rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
-rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.*a
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
 ( cd ${RPM_BUILD_ROOT}/%{_datadir}/mime/ && rm -rf XMLnamespaces globs mime application magic )
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL 
 %suse_update_desktop_file %{name} Security -G "Passwords and Encryption Keys" -N "Seahorse"
@@ -156,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/libcryptui
 %{_includedir}/libcryptui/*.h
 %changelog
+* Wed Nov 21 2007 - maw@suse.de
+- Rename abuild.patch to seahorse-abuild-warnings.patch
+- That patch now fixes more questionable code.
 * Thu Oct 11 2007 - sbrabec@suse.cz
 - Use correct binding specific avahi package instead of
   mDNSResponder.