From dba12d1b8e7e0de13db03f7e8918e077266ec4fe17ab035625c2c93c5da3e98f Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 18 Feb 2010 16:01:36 +0000
Subject: [PATCH] Accepting request 32876 from Base:System

Copy from Base:System/gpg2 based on submit request 32876 from user puzel

OBS-URL: https://build.opensuse.org/request/show/32876
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=35
---
 gnupg-2.0.13.tar.bz2        |  3 --
 gnupg-2.0.14-s2kcount.patch | 65 +++++++++++++++++++++++++++++++++++++
 gnupg-2.0.14.tar.bz2        |  3 ++
 gpg2.changes                | 18 ++++++++++
 gpg2.spec                   | 16 ++++-----
 5 files changed, 92 insertions(+), 13 deletions(-)
 delete mode 100644 gnupg-2.0.13.tar.bz2
 create mode 100644 gnupg-2.0.14-s2kcount.patch
 create mode 100644 gnupg-2.0.14.tar.bz2

diff --git a/gnupg-2.0.13.tar.bz2 b/gnupg-2.0.13.tar.bz2
deleted file mode 100644
index 0e832ce..0000000
--- a/gnupg-2.0.13.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d9b3d71f8f2930483d7b7b56276ebe954175b72b34128c6669d0fc00d289aa2e
-size 3946616
diff --git a/gnupg-2.0.14-s2kcount.patch b/gnupg-2.0.14-s2kcount.patch
new file mode 100644
index 0000000..cd937c5
--- /dev/null
+++ b/gnupg-2.0.14-s2kcount.patch
@@ -0,0 +1,65 @@
+We have to use fixed s2k-count number otherwise the gpg2 would
+want to consult gpg-agent which is not yet installed in the mock
+chroot.
+diff -up gnupg-2.0.14/tests/openpgp/conventional-mdc.test.s2k gnupg-2.0.14/tests/openpgp/conventional-mdc.test
+--- gnupg-2.0.14/tests/openpgp/conventional-mdc.test.s2k	2009-09-21 18:53:46.000000000 +0200
++++ gnupg-2.0.14/tests/openpgp/conventional-mdc.test	2010-01-11 10:42:36.000000000 +0100
+@@ -21,9 +21,9 @@ for ciph in `all_cipher_algos`; do
+         dd if=data-80000 of=z bs=1 count=$i 2>/dev/null
+     fi
+     echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \
+-	--force-mdc --cipher $ciph -c -o x --yes z
++	--force-mdc --cipher $ciph -c -o x --yes --s2k-count 65536 z
+     echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \
+-	-o y --yes x
++	-o y --yes --s2k-count 96 x
+     cmp z y || error "$ciph/$i: mismatch"
+   done
+ done
+diff -up gnupg-2.0.14/tests/openpgp/conventional.test.s2k gnupg-2.0.14/tests/openpgp/conventional.test
+--- gnupg-2.0.14/tests/openpgp/conventional.test.s2k	2009-09-21 18:53:46.000000000 +0200
++++ gnupg-2.0.14/tests/openpgp/conventional.test	2010-01-11 10:43:00.000000000 +0100
+@@ -12,8 +12,8 @@
+ 
+ #info Checking conventional encryption
+ for i in plain-2 data-32000 ; do
+-    echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -c -o x --yes $i
+-    echo "Hier spricht HAL" | $GPG --passphrase-fd 0    -o y --yes x
++    echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -c -o x --yes --s2k-count 65536 $i
++    echo "Hier spricht HAL" | $GPG --passphrase-fd 0    -o y --yes --s2k-count 65536 x
+     cmp $i y || error "$i: mismatch"
+ done
+ 
+@@ -21,8 +21,8 @@ for a in `all_cipher_algos`; do
+     echo_n "$a "
+     for i in plain-1 data-80000 ; do
+       echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \
+-					  --cipher-algo $a -c -o x --yes $i
+-      echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -o y --yes x
++					  --cipher-algo $a -c -o x --yes --s2k-count 65536 $i
++      echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -o y --yes --s2k-count 65536 x
+       cmp $i y || error "$i: ($a) mismatch"
+     done
+ done
+diff -up gnupg-2.0.14/tests/openpgp/genkey1024.test.s2k gnupg-2.0.14/tests/openpgp/genkey1024.test
+--- gnupg-2.0.14/tests/openpgp/genkey1024.test.s2k	2009-09-21 18:53:46.000000000 +0200
++++ gnupg-2.0.14/tests/openpgp/genkey1024.test	2010-01-11 10:43:14.000000000 +0100
+@@ -10,7 +10,7 @@
+ 
+ . $srcdir/defs.inc || exit 3
+ 
+-../../g10/gpg2 --quiet --batch --debug-quick-random --homedir . --gen-key <<EOF
++../../g10/gpg2 --quiet --batch --debug-quick-random --homedir . --s2k-count 65536 --gen-key <<EOF
+ Key-Type: DSA
+ Key-Length: 1024
+ Subkey-Type: ELG
+@@ -24,7 +24,7 @@ Passphrase: abc
+ EOF
+ 
+ if have_pubkey_algo "RSA"; then
+-../../g10/gpg2 --quiet --batch --debug-quick-random --homedir . --gen-key <<EOF
++../../g10/gpg2 --quiet --batch --debug-quick-random --homedir . --s2k-count 65536 --gen-key <<EOF
+ Key-Type: RSA
+ Key-Length: 1024
+ Key-Usage: sign,encrypt
+
diff --git a/gnupg-2.0.14.tar.bz2 b/gnupg-2.0.14.tar.bz2
new file mode 100644
index 0000000..ada738e
--- /dev/null
+++ b/gnupg-2.0.14.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:feb6050dc00e59d426485550a2af8d416cf975e5e1e0ecf1c5f1bd139baafca5
+size 3982080
diff --git a/gpg2.changes b/gpg2.changes
index ea6d99e..ad883ce 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Feb 17 13:29:18 CET 2010 - dimstar@opensuse.org
+
+- Update to version 2.0.14:
+  + The default for --include-cert is now to include all
+    certificates in the chain except for the root certificate.
+  + Numerical values may now be used as an alternative to the
+    debug-level keywords.
+  + The GPGSM --audit-log feature is now more complete.
+  + GPG now supports DNS lookups for SRV, PKA and CERT on W32.
+  + New GPGSM option --ignore-cert-extension.
+  + New and changed passphrases are now created with an iteration
+    count requiring about 100ms of CPU work.
+- Add gnupg-2.0.14-s2kcount.patch: use fixed s2k-count number
+  otherwise the gpg2 would want to consult gpg-agent which is not
+  yet installed in the mock chroot (Patch shamelessly stolen from
+  Fedora).
+
 -------------------------------------------------------------------
 Thu Jan 28 14:15:24 UTC 2010 - puzel@novell.com
 
diff --git a/gpg2.spec b/gpg2.spec
index bd23eac..db9d954 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gpg2 (Version 2.0.13)
+# spec file for package gpg2 (Version 2.0.14)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,8 +19,8 @@
 
 
 Name:           gpg2
-Version:        2.0.13
-Release:        3
+Version:        2.0.14
+Release:        1
 BuildRequires:  expect
 BuildRequires:  fdupes
 BuildRequires:  libgpg-error-devel >= 1.4
@@ -54,19 +54,14 @@ Patch5:         gnupg-2.0.10-tmpdir.diff
 Patch7:         gnupg-2.0.4-install_tools.diff
 Patch10:        gnupg-2.0.9-RSA_ES.patch
 Patch11:        gnupg-2.0.9-langinfo.patch
+# PATCH-FIX-UPSTREAM gnupg-2.0.14-s2kcount.patch dimstar@opensuse.org -- use fixed s2k-count number to not use gpg-agent.
+Patch12:        gnupg-2.0.14-s2kcount.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 GnuPG 2 is the successor of "GnuPG" or GPG. It provides: GPGSM,
 gpg-agent, and a keybox library.
 
-
-
-Authors:
---------
-    Werner Koch       <wk@gnupg.org>
-    Neal H. Walfield  <neal@g10code.de>
-
 %lang_package
 %prep
 %setup  -q -n gnupg-%version
@@ -74,6 +69,7 @@ Authors:
 %patch7
 %patch10 -p1
 %patch11
+%patch12 -p1
 
 %build
 # Required for patch7: