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

gnupg-2.0.10-fix-convert.patch

@@ -1,15 +0,0 @@
-# Patch from upstream - fixes broken make check on ppc, s390, s390x
-Index: common/convert.c
-===================================================================
---- common/convert.c    (revision 4915)
-+++ common/convert.c    (working copy)
-@@ -194,7 +194,9 @@
-     ;
-   if (*s && (!isascii (*s) || !isspace (*s)) )
-     return NULL;   /* Not followed by Nul or white space.  */
--  need_nul = !(s[-2] == '0' && s[-1] == '0');
-+  /* We need to append a nul character.  However we don't want that if
-+     the hexstring already ends with "00".  */
-+  need_nul = ((s == hexstring) || !(s[-2] == '0' && s[-1] == '0'));
-   if (need_nul)
-     count++;

gnupg-2.0.10-fix-missing-option.patch

@@ -1,44 +0,0 @@
-# From upstream, SVN rev. 4937
-# Fix (bnc#477362)
-Index: doc/gpg-agent.texi
-===================================================================
---- doc/gpg-agent.texi	(revision 4936)
-+++ doc/gpg-agent.texi	(revision 4937)
-@@ -433,13 +433,13 @@
- @item --display @var{string}
- @itemx --ttyname @var{string}
- @itemx --ttytype @var{string}
--@itemx --lc-type @var{string}
-+@itemx --lc-ctype @var{string}
- @itemx --lc-messages @var{string}
- @itemx --xauthority @var{string}
- @opindex display 
- @opindex ttyname 
- @opindex ttytype 
--@opindex lc-type 
-+@opindex lc-ctype 
- @opindex lc-messages
- @opindex xauthority
- These options are used with the server mode to pass localization
-Index: agent/gpg-agent.c
-===================================================================
---- agent/gpg-agent.c	(revision 4936)
-+++ agent/gpg-agent.c	(revision 4937)
-@@ -1,6 +1,6 @@
- /* gpg-agent.c  -  The GnuPG Agent
-  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-- *               2006, 2007 Free Software Foundation, Inc.
-+ *               2006, 2007, 2009 Free Software Foundation, Inc.
-  *
-  * This file is part of GnuPG.
-  *
-@@ -141,6 +141,9 @@
-   { oDisableScdaemon, "disable-scdaemon", 0, N_("do not use the SCdaemon") },
-   { oFakedSystemTime, "faked-system-time", 2, "@" }, /* (epoch time) */
- 
-+  { oBatch,      "batch",       0, "@" },
-+  { oHomedir,    "homedir",     2, "@"},   
-+
-   { oDisplay,    "display",     2, "@" },
-   { oTTYname,    "ttyname",     2, "@" },
-   { oTTYtype,    "ttytype",     2, "@" },

gnupg-2.0.10.tar.bz2

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

gnupg-2.0.11.tar.bz2

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

gpg2.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Mar  5 13:39:42 CET 2009 - puzel@suse.cz
+
+- update to 2.0.11
+  * Fixed a problem in SCDAEMON which caused unexpected card resets.
+  * SCDAEMON is now aware of the Geldkarte.
+  * The SCDAEMON option --allow-admin is now used by default.
+  * GPGCONF now restarts SCdaemon if necessary.
+  * The default cipher algorithm in GPGSM is now again 3DES.  This is
+    due to interoperability problems with Outlook 2003 which still
+    can't cope with AES.
+- dropped gnupg-2.0.10-fix-convert.patch (upstream)
+- dropped gnupg-2.0.10-fix-missing-option.patch (upstream)
+- disabled gnupg-1.9.22-ccid-driver-fix.diff (does not apply and it is
+  not clear what it is good for)
+
 -------------------------------------------------------------------
 Mon Mar  2 15:53:22 CET 2009 - puzel@suse.cz
 

gpg2.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package gpg2 (Version 2.0.10)
+# spec file for package gpg2 (Version 2.0.11)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,8 +19,8 @@
 
 
 Name:           gpg2
-Version:        2.0.10
+Version:        2.0.11
-Release:        3
+Release:        1
 BuildRequires:  expect fdupes pth
 BuildRequires:  libgpg-error-devel >= 1.4
 BuildRequires:  libgcrypt-devel >= 1.4.0
@@ -49,9 +49,6 @@ Patch7:         gnupg-2.0.4-install_tools.diff
 Patch9:         gnupg-2.0.4-default-tty.diff
 Patch10:        gnupg-2.0.9-RSA_ES.patch
 Patch11:        gnupg-2.0.9-langinfo.patch
-Patch12:        gnupg-2.0.10-fix-convert.patch
-# PATCH-FIX-UPSTREAM gnupg-2.0.10-fix-missing.option.patch bnc477362 petr.uzel@suse.cz -- gnupg2 SVN rev. 4937
-Patch13:        gnupg-2.0.10-fix-missing-option.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -69,13 +66,12 @@ Authors:
 %prep
 %setup  -q -n gnupg-%version
 %patch5 -p1
-%patch6
+# Patch disabled - it does not apply to 2.0.11 and it is unclear, what it is actually good for
+#% patch6
 %patch7
 %patch9
 %patch10 -p1
 %patch11
-%patch12
-%patch13
 
 %build
 # Required for patch7:
@@ -157,6 +153,19 @@ $RPM_BUILD_ROOT/usr/bin/gpgsplit -v -p secsplit- --secret-to-public --uncompress
 %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
 
 %changelog
+* Thu Mar 05 2009 puzel@suse.cz
+- update to 2.0.11
+  * Fixed a problem in SCDAEMON which caused unexpected card resets.
+  * SCDAEMON is now aware of the Geldkarte.
+  * The SCDAEMON option --allow-admin is now used by default.
+  * GPGCONF now restarts SCdaemon if necessary.
+  * The default cipher algorithm in GPGSM is now again 3DES.  This is
+  due to interoperability problems with Outlook 2003 which still
+  can't cope with AES.
+- dropped gnupg-2.0.10-fix-convert.patch (upstream)
+- dropped gnupg-2.0.10-fix-missing-option.patch (upstream)
+- disabled gnupg-1.9.22-ccid-driver-fix.diff (does not apply and it is
+  not clear what it is good for)
 * Mon Mar 02 2009 puzel@suse.cz
 - gnupg-2.0.10-fix-missing-option.patch (bnc#477362)
 * Mon Jan 19 2009 puzel@suse.cz