From 9728fa70badbabd763dc07cf3a032465c6cdd0a4d328fd4c44d2990f53c01738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 25 Dec 2013 20:49:31 +0000 Subject: [PATCH] Accepting request 212210 from home:dimstar:branches:GNOME:Factory Hmm. why did that never make it to Factory.. it's in the 13.1 Update channel OBS-URL: https://build.opensuse.org/request/show/212210 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=157 --- seahorse-ssh-keypair.patch | 29 +++++++++++++++++++++++++++++ seahorse.changes | 6 ++++++ seahorse.spec | 3 +++ 3 files changed, 38 insertions(+) create mode 100644 seahorse-ssh-keypair.patch diff --git a/seahorse-ssh-keypair.patch b/seahorse-ssh-keypair.patch new file mode 100644 index 0000000..1fe55d2 --- /dev/null +++ b/seahorse-ssh-keypair.patch @@ -0,0 +1,29 @@ +From db804a82e7828848bcf48b1603f7bcbb0ad78a5a Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Fri, 22 Nov 2013 22:44:47 -0600 +Subject: [PATCH] Fix SSH key generation + +Here, i used to be a guint, but was recently changed into a gint to +silence a compiler warning. This caused the for loop to terminate +without ever iterating. + +https://bugzilla.gnome.org/show_bug.cgi?id=715053 +--- + ssh/seahorse-ssh-source.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ssh/seahorse-ssh-source.c b/ssh/seahorse-ssh-source.c +index 1f015f0..8cc233e 100644 +--- a/ssh/seahorse-ssh-source.c ++++ b/ssh/seahorse-ssh-source.c +@@ -917,7 +917,7 @@ seahorse_ssh_source_file_for_algorithm (SeahorseSSHSource *ssrc, guint algo) + break; + } + +- for (i = 0; i < ~0; i++) { ++ for (i = 0; i < G_MAXINT; i++) { + t = (i == 0) ? g_strdup (pref) : g_strdup_printf ("%s.%d", pref, i); + filename = g_build_filename (ssrc->priv->ssh_homedir, t, NULL); + g_free (t); +-- +1.8.3.1 diff --git a/seahorse.changes b/seahorse.changes index e8f71d4..27a83d6 100644 --- a/seahorse.changes +++ b/seahorse.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 23 04:54:40 UTC 2013 - dimstar@opensuse.org + +- Add seahorse-ssh-keypair.patch: Fix SSH key generation + (bnc#851050, bgo#715053). + ------------------------------------------------------------------- Thu Oct 17 06:51:49 UTC 2013 - dimstar@opensuse.org diff --git a/seahorse.spec b/seahorse.spec index 544a0a5..b71160d 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -24,6 +24,8 @@ License: GPL-2.0+ Group: Productivity/Security Url: http://projects.gnome.org/seahorse/ Source: http://download.gnome.org/sources/seahorse/3.10/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM seahorse-ssh-keypair.patch bnc#851050 bgo#715053 dimstar@opensuse.org -- Fix SSH key generation +Patch0: seahorse-ssh-keypair.patch BuildRequires: fdupes BuildRequires: gpg2 BuildRequires: gpgme-devel @@ -66,6 +68,7 @@ search results from documents. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build