Accepting request 64162 from Base:System

Accepted submit request 64162 from user puzel

OBS-URL: https://build.opensuse.org/request/show/64162
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=52

gnupg-2.0.16.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d5abb977c02ebb0f6ce25a5ba71c8df90835aa666a85acd73a9b7f9df35a80b
-size 4004033

gnupg-2.0.17.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea649d5ecb2f97cc8d81c5796c6ad8d7d8581f9554241c39d2b11ab12139eea6
+size 3997356

gnupg-2.0.4-install_tools.diff

@@ -1,7 +1,7 @@
 Index: tools/Makefile.am
 ===================================================================
---- tools/Makefile.am.orig	2009-04-17 19:39:47.000000000 +0200
+--- tools/Makefile.am.orig
-+++ tools/Makefile.am	2009-11-13 13:01:24.000000000 +0100
++++ tools/Makefile.am
 @@ -32,8 +32,8 @@ sbin_SCRIPTS = addgnupghome applygnupgde
  
  bin_SCRIPTS = gpgsm-gencert.sh
@@ -13,9 +13,9 @@ Index: tools/Makefile.am
  endif
  
  if BUILD_SYMCRYPTRUN
-@@ -44,14 +44,14 @@ endif
+@@ -51,14 +51,14 @@ endif
  
- bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun}
+ bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} ${gpgtar}
  if !HAVE_W32_SYSTEM
 -bin_PROGRAMS += watchgnupg gpgparsemail
 +bin_PROGRAMS += watchgnupg gpgparsemail gpgsplit

gnupg-CVE-2010-2547.patch

@@ -1,12 +0,0 @@
-Index: gnupg-2.0.16/kbx/keybox-blob.c
-===================================================================
---- gnupg-2.0.16.orig/kbx/keybox-blob.c	2009-09-21 18:53:44.000000000 +0200
-+++ gnupg-2.0.16/kbx/keybox-blob.c	2010-07-28 11:28:50.000000000 +0200
-@@ -898,6 +898,7 @@ _keybox_create_x509_blob (KEYBOXBLOB *r_
-               rc = gpg_error_from_syserror ();
-               goto leave;
-             }
-+	  names = tmp;
-         }
-       names[blob->nuids++] = p;
-       if (!i && (p=x509_email_kludge (p)))

gpg2.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Mar 15 09:29:42 UTC 2011 - puzel@novell.com
+
+- update to gnupg-2.0.17
+ * Allow more hash algorithms with the OpenPGP v2 card.
+ * The gpg-agent now tests for a new gpg-agent.conf on a HUP.
+ * Fixed output of "gpgconf --check-options".
+ * Fixed a bug where Scdaemon sends a signal to Gpg-agent running
+   in non-daemon mode.
+ * Fixed TTY management for pinentries and session variable update
+   problem.
+- drop gnupg-CVE-2010-2547.patch (in upstream)
+
 -------------------------------------------------------------------
 Fri Jan  7 13:24:17 CET 2011 - sbrabec@suse.cz
 

gpg2.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package gpg2 (Version 2.0.16)
+# spec file for package gpg2 (Version 2.0.17)
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 
 Name:           gpg2
-Version:        2.0.16
+Version:        2.0.17
 Release:        4
 BuildRequires:  expect
 BuildRequires:  fdupes
@@ -57,7 +57,6 @@ Patch3:         gnupg-2.0.9-RSA_ES.patch
 Patch4:         gnupg-2.0.9-langinfo.patch
 Patch5:         gnupg-files-are-digests.patch
 Patch6:         gnupg-dont-fail-with-seahorse-agent.patch
-Patch7:         gnupg-CVE-2010-2547.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -73,10 +72,8 @@ gpg-agent, and a keybox library.
 %patch4
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %build
-# Required for patch7:
 autoreconf -fi
 # build PIEs (position independent executables) for address space randomisation:
 %ifarch s390x %sparc
@@ -119,7 +116,7 @@ ln -sf gpgv2.1 $RPM_BUILD_ROOT/usr/share/man/man1/gpgv.1
 # fix rpmlint invalid-lc-messages-dir:
 rm -rf $RPM_BUILD_ROOT/%_datadir/locale/en@{bold,}quot
 # additional files to documentation directory
-install -m 644 AUTHORS COPYING ChangeLog NEWS THANKS TODO doc/FAQ doc/faq.html $RPM_BUILD_ROOT/%{_docdir}/%{name}
+install -m 644 AUTHORS COPYING ChangeLog NEWS THANKS TODO doc/FAQ $RPM_BUILD_ROOT/%{_docdir}/%{name}
 %find_lang gnupg2
 %if 0%{?suse_version} > 1020
 %fdupes %buildroot