gnupg and deps in main

2015-08-21 10:26:26 +03:00
parent d1559b9776
commit 17a55ca6a4
26 changed files with 1021 additions and 0 deletions
@@ -0,0 +1,11 @@
+--- gnupg-1.9.3/g10/photoid.c.display	2004-01-24 15:03:56.745060064 +0800
+++ gnupg-1.9.3/g10/photoid.c	2004-01-24 15:04:21.560287576 +0800
+@@ -240,7 +240,7 @@
+ #elif defined(__riscos__)
+   return "Filer_Run %I";
+ #else
+-  return "xloadimage -fork -quiet -title 'KeyID 0x%k' stdin";
+  return "display -title 'KeyID 0x%k'";
+ #endif
+ }
+ #endif
@@ -0,0 +1,67 @@
+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.
+Index: gnupg-2.0.17/tests/openpgp/conventional-mdc.test
+===================================================================
+--- gnupg-2.0.17.orig/tests/openpgp/conventional-mdc.test
+++ gnupg-2.0.17/tests/openpgp/conventional-mdc.test
+@@ -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
+Index: gnupg-2.0.17/tests/openpgp/conventional.test
+===================================================================
+--- gnupg-2.0.17.orig/tests/openpgp/conventional.test
+++ gnupg-2.0.17/tests/openpgp/conventional.test
+@@ -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
+Index: gnupg-2.0.17/tests/openpgp/genkey1024.test
+===================================================================
+--- gnupg-2.0.17.orig/tests/openpgp/genkey1024.test
+++ gnupg-2.0.17/tests/openpgp/genkey1024.test
+@@ -10,7 +10,7 @@
+ 
+ . $srcdir/defs.inc || exit 3
+ 
+-$GPG --quiet --batch --debug-quick-random --gen-key <<EOF
+$GPG --quiet --batch --debug-quick-random --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
+-$GPG --quiet --batch --debug-quick-random --gen-key <<EOF
+$GPG --quiet --batch --debug-quick-random --s2k-count 65536 --gen-key <<EOF
+ Key-Type: RSA
+ Key-Length: 1024
+ Key-Usage: sign,encrypt
@@ -0,0 +1,28 @@
+diff -Naur old/agent/protect-tool.c new/agent/protect-tool.c
+--- old/agent/protect-tool.c	2012-12-08 13:53:17.067611957 +1100
+++ new/agent/protect-tool.c	2012-12-08 13:53:28.247633012 +1100
+@@ -102,6 +102,7 @@
+ static int opt_status_msg;
+ static const char *opt_p12_charset;
+ static const char *opt_agent_program; 
+static session_env_t opt_session_env;
+ 
+ static char *get_passphrase (int promptno);
+ static void release_passphrase (char *pw);
+@@ -1040,6 +1041,7 @@
+ 
+   opt_homedir = default_homedir ();
+ 
+  opt_session_env = session_env_new ();
+ 
+   pargs.argc = &argc;
+   pargs.argv = &argv;
+@@ -1091,7 +1093,7 @@
+                                 opt.verbose,
+                                 opt_homedir,
+                                 opt_agent_program,
+-                                NULL, NULL, NULL);
+                                NULL, NULL, opt_session_env);
+ 
+   if (opt_prompt)
+     opt_prompt = percent_plus_unescape (opt_prompt, 0);