Accepting request 43430 from Base:System

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

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

gnupg-2.0.14-s2kcount.patch

@@ -1,65 +0,0 @@
-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
-

gnupg-2.0.15.tar.bz2

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

gnupg-2.0.16.tar.bz2

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

gpg2.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Jul 19 21:49:40 UTC 2010 - puzel@novell.com
+
+- update to gnupg-2.0.16
+ * If the agent's --use-standard-socket option is active, all tools
+   try to start and daemonize the agent on the fly.  In the past this
+   was only supported on W32; on non-W32 systems the new configure
+   option --use-standard-socket may now be used to use this feature by
+   default.
+ * The gpg-agent commands KILLAGENT and RELOADAGENT are now available
+   on all platforms.
+ * Minor bug fixes.
+- drop gnupg-2.0.14-s2kcount.patch (builds fine without it now)
+
 -------------------------------------------------------------------
 Mon Jun  7 09:40:32 UTC 2010 - adrian@suse.de
 

gpg2.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package gpg2 (Version 2.0.15)
+# spec file for package gpg2 (Version 2.0.16)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,13 +19,13 @@
 
 
 Name:           gpg2
-Version:        2.0.15
+Version:        2.0.16
-Release:        4
+Release:        1
 BuildRequires:  expect
 BuildRequires:  fdupes
-BuildRequires:  libgpg-error-devel >= 1.4
+BuildRequires:  libgpg-error-devel >= 1.7
 BuildRequires:  libgcrypt-devel >= 1.4.0
-BuildRequires:  libksba-devel >= 1.0.2
+BuildRequires:  libksba-devel >= 1.0.7
 BuildRequires:  libassuan-devel >= 2.0.0
 BuildRequires:  opensc-devel
 BuildRequires:  libusb-devel
@@ -57,8 +57,6 @@ Patch7:         gnupg-2.0.4-install_tools.diff
 Patch10:        gnupg-2.0.9-RSA_ES.patch
 Patch11:        gnupg-2.0.9-langinfo.patch
 Patch12:        gnupg-files-are-digests.patch
-# PATCH-FIX-UPSTREAM gnupg-2.0.14-s2kcount.patch dimstar@opensuse.org -- use fixed s2k-count number to not use gpg-agent.
-Patch13:        gnupg-2.0.14-s2kcount.patch
 Patch14:        gnupg-dont-fail-with-seahorse-agent.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -74,7 +72,6 @@ gpg-agent, and a keybox library.
 %patch10 -p1
 %patch11
 %patch12 -p1
-%patch13 -p1
 %patch14 -p1
 
 %build