[Pkg-gnupg-commit] [gnupg2] 20/21: drop patches already applied upstream

Daniel Kahn Gillmor dkg at fifthhorseman.net
Tue Sep 19 15:34:12 UTC 2017


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit eee4ab37db7b3e483431ecc36574d234982df93c
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Sep 19 08:25:26 2017 -0400

    drop patches already applied upstream
---
 .../patches/0013-scd-Fix-for-large-ECC-keys.patch  | 70 ---------------------
 ...ix-a-test-which-specifies-expiration-date.patch | 47 --------------
 ...0003-Avoid-simple-memory-dumps-via-ptrace.patch |  2 +-
 .../0013-gpgsm-default-to-3072-bit-keys.patch}     |  2 +
 .../0014-gpg-default-to-3072-bit-RSA-keys.patch}   |  8 ++-
 .../0015-gpg-default-to-AES-256.patch}             | 13 ++--
 ...ile-time-configuration-of-s2k-calibration.patch | 72 ++++++++++++++++++++++
 debian/patches/series                              | 14 ++---
 ...to-SHA-512-for-all-signature-types-on-RS.patch} |  8 +--
 ...HA-512-and-SHA-384-in-default-preference.patch} |  2 +-
 ...lt-to-protection-that-takes-300ms-up-from.patch | 48 ---------------
 debian/rules                                       |  5 +-
 12 files changed, 100 insertions(+), 191 deletions(-)

diff --git a/debian/patches/0013-scd-Fix-for-large-ECC-keys.patch b/debian/patches/0013-scd-Fix-for-large-ECC-keys.patch
deleted file mode 100644
index 33e819b..0000000
--- a/debian/patches/0013-scd-Fix-for-large-ECC-keys.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: NIIBE Yutaka <gniibe at fsij.org>
-Date: Tue, 29 Aug 2017 14:35:47 +0900
-Subject: scd: Fix for large ECC keys.
-
-* scd/app-openpgp.c (do_decipher): Support larger length.
-
---
-
-Reported-by: Achim Pietig <achim at pietig.com>
-Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
----
- scd/app-openpgp.c | 40 ++++++++++++++++++++++++++++++++--------
- 1 file changed, 32 insertions(+), 8 deletions(-)
-
-diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
-index f9d07ac..6fcec3e 100644
---- a/scd/app-openpgp.c
-+++ b/scd/app-openpgp.c
-@@ -4575,19 +4575,43 @@ do_decipher (app_t app, const char *keyidstr,
-             }
-         }
- 
--      fixuplen = 7;
-+      n = 0;
-+      if (indatalen < 128)
-+        fixuplen = 7;
-+      else
-+        fixuplen = 10;
-+
-       fixbuf = xtrymalloc (fixuplen + indatalen);
-       if (!fixbuf)
-         return gpg_error_from_syserror ();
- 
-       /* Build 'Cipher DO' */
--      fixbuf[0] = '\xa6';
--      fixbuf[1] = (char)(indatalen+5);
--      fixbuf[2] = '\x7f';
--      fixbuf[3] = '\x49';
--      fixbuf[4] = (char)(indatalen+2);
--      fixbuf[5] = '\x86';
--      fixbuf[6] = (char)indatalen;
-+      fixbuf[n++] = '\xa6';
-+      if (indatalen < 128)
-+        fixbuf[n++] = (char)(indatalen+5);
-+      else
-+        {
-+          fixbuf[n++] = 0x81;
-+          fixbuf[n++] = (char)(indatalen+7);
-+        }
-+      fixbuf[n++] = '\x7f';
-+      fixbuf[n++] = '\x49';
-+      if (indatalen < 128)
-+        fixbuf[n++] = (char)(indatalen+2);
-+      else
-+        {
-+          fixbuf[n++] = 0x81;
-+          fixbuf[n++] = (char)(indatalen+3);
-+        }
-+      fixbuf[n++] = '\x86';
-+      if (indatalen < 128)
-+        fixbuf[n++] = (char)indatalen;
-+      else
-+        {
-+          fixbuf[n++] = 0x81;
-+          fixbuf[n++] = (char)indatalen;
-+        }
-+
-       if (old_format_len)
-         {
-           memset (fixbuf+fixuplen, 0, 32 - old_format_len);
diff --git a/debian/patches/0020-tests-Fix-a-test-which-specifies-expiration-date.patch b/debian/patches/0020-tests-Fix-a-test-which-specifies-expiration-date.patch
deleted file mode 100644
index 1a49ddf..0000000
--- a/debian/patches/0020-tests-Fix-a-test-which-specifies-expiration-date.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: NIIBE Yutaka <gniibe at fsij.org>
-Date: Fri, 8 Sep 2017 14:21:29 +0900
-Subject: tests: Fix a test which specifies expiration date.
-
-* tests/openpgp/quick-key-manipulation.scm: Fix expiration time
-comparison.
-
---
-
-This is a bug fix for Amelia Earhart who is probably in UTC-12.
-
-When expiration date is specified, GnuPG interprets it as noon of the
-date in local time.
-
-Before this fix, the test compared the value by 2145916800 which is
-2038-01-01 00:00:00 in UTC with allowance of 1 day.  When the test
-was ran in UTC-12 timezone, it failed because of noon in the timezone
-is midnight of the next day in UTC.
-
-GnuPG-bug-id: 3393
-Reported-by: Daniel Kahn Gillmor
-Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
-(cherry picked from commit 17f764dd4972a063fe09c4b9d2846e8efcb25c7a)
----
- tests/openpgp/quick-key-manipulation.scm | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/openpgp/quick-key-manipulation.scm b/tests/openpgp/quick-key-manipulation.scm
-index c21abfe..2023f17 100755
---- a/tests/openpgp/quick-key-manipulation.scm
-+++ b/tests/openpgp/quick-key-manipulation.scm
-@@ -178,11 +178,11 @@
-   (lambda (subkey)
-     (assert (= 1 (:alg subkey)))
-     (assert (string-contains? (:cap subkey) "s"))
--    (assert (time-matches? 2145916800    ;; 2038-01-01
--			   ;; 4260207600 ;; 2105-01-01
-+    (assert (time-matches? 2145960000    ;; UTC 2038-01-01 12:00:00
-+			   ;; 4260254400 ;; UTC 2105-01-01 12:00:00
- 			   (string->number (:expire subkey))
--			   ;; This is off by 12h, but I guess it just
--			   ;; choses the middle of the day.
-+			   ;; GnuPG choses the middle of the day (local time)
-+			   ;; when no hh:mm:ss is specified
- 			   (days->seconds 1))))
-   (lambda (subkey)
-     (assert (= 1 (:alg subkey)))
diff --git a/debian/patches/block-ptrace-on-agent/0003-Avoid-simple-memory-dumps-via-ptrace.patch b/debian/patches/block-ptrace-on-agent/0003-Avoid-simple-memory-dumps-via-ptrace.patch
index 7e50289..98e7788 100644
--- a/debian/patches/block-ptrace-on-agent/0003-Avoid-simple-memory-dumps-via-ptrace.patch
+++ b/debian/patches/block-ptrace-on-agent/0003-Avoid-simple-memory-dumps-via-ptrace.patch
@@ -47,7 +47,7 @@ index 030d1da..d91d687 100644
       file descriptors and the signal mask.  This info is required to
       do the exec call properly.  We don't need it on Windows.  */
 diff --git a/configure.ac b/configure.ac
-index 6f945bd..f520d1c 100644
+index fbd5c18..e5ade60 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1361,6 +1361,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
diff --git a/debian/patches/update-defaults/0014-gpgsm-default-to-3072-bit-keys.patch b/debian/patches/from-master/0013-gpgsm-default-to-3072-bit-keys.patch
similarity index 98%
rename from debian/patches/update-defaults/0014-gpgsm-default-to-3072-bit-keys.patch
rename to debian/patches/from-master/0013-gpgsm-default-to-3072-bit-keys.patch
index d24a83c..bdba664 100644
--- a/debian/patches/update-defaults/0014-gpgsm-default-to-3072-bit-keys.patch
+++ b/debian/patches/from-master/0013-gpgsm-default-to-3072-bit-keys.patch
@@ -15,6 +15,8 @@ default to 3072 bits.
 This is a sensible default in 2017.
 
 Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+(cherry picked from commit 7955262151a5c755814dd23414e6804f79125355)
 ---
  doc/gpgsm.texi                      |  2 +-
  doc/howto-create-a-server-cert.texi | 14 +++++++-------
diff --git a/debian/patches/update-defaults/0015-gpg-default-to-3072-bit-RSA-keys.patch b/debian/patches/from-master/0014-gpg-default-to-3072-bit-RSA-keys.patch
similarity index 95%
rename from debian/patches/update-defaults/0015-gpg-default-to-3072-bit-RSA-keys.patch
rename to debian/patches/from-master/0014-gpg-default-to-3072-bit-RSA-keys.patch
index 1ce99d9..9983ff7 100644
--- a/debian/patches/update-defaults/0015-gpg-default-to-3072-bit-RSA-keys.patch
+++ b/debian/patches/from-master/0014-gpg-default-to-3072-bit-RSA-keys.patch
@@ -17,6 +17,8 @@ is the default 3072-bit RSA.
 This is a sensible default in 2017.
 
 Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+(cherry picked from commit 909fbca19678e6e36968607e8a2348381da39d8c)
 ---
  agent/command.c | 2 +-
  doc/wks.texi    | 4 ++--
@@ -38,10 +40,10 @@ index f2a6683..fd39c68 100644
    "  S: D (public-key\n"
    "  S: D   (rsa (n 326487324683264) (e 10001)))\n"
 diff --git a/doc/wks.texi b/doc/wks.texi
-index f9b1a0c..f17497f 100644
+index 029dbf0..55dfee6 100644
 --- a/doc/wks.texi
 +++ b/doc/wks.texi
-@@ -301,11 +301,11 @@ the submission address:
+@@ -303,11 +303,11 @@ the submission address:
  The output of the last command looks similar to this:
  
  @example
@@ -56,7 +58,7 @@ index f9b1a0c..f17497f 100644
  
  Take the hash of the string "key-submission", which is
 diff --git a/g10/keygen.c b/g10/keygen.c
-index 6a3d323..048a391 100644
+index 2b17a1e..e959ee9 100644
 --- a/g10/keygen.c
 +++ b/g10/keygen.c
 @@ -46,11 +46,10 @@
diff --git a/debian/patches/update-defaults/0018-gpg-default-to-AES-256.patch b/debian/patches/from-master/0015-gpg-default-to-AES-256.patch
similarity index 78%
rename from debian/patches/update-defaults/0018-gpg-default-to-AES-256.patch
rename to debian/patches/from-master/0015-gpg-default-to-AES-256.patch
index a9f7d26..c86f92e 100644
--- a/debian/patches/update-defaults/0018-gpg-default-to-AES-256.patch
+++ b/debian/patches/from-master/0015-gpg-default-to-AES-256.patch
@@ -13,22 +13,23 @@ large-scale decryption efforts, and longer key lengths provide a hedge
 against unforseen cryptanalysis.
 
 Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+(cherry picked from commit 73ff075204df09db5248170a049f06498cdbb7aa)
 ---
- g10/main.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ g10/main.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/g10/main.h b/g10/main.h
-index cd7f600..8773c43 100644
+index 87417ee..4850360 100644
 --- a/g10/main.h
 +++ b/g10/main.h
-@@ -31,8 +31,8 @@
+@@ -31,7 +31,9 @@
     (i.e. uncompressed) rather than 1 (zip).  However, the real world
     issues of speed and size come into play here. */
  
 -#if GPG_USE_AES128
--# define DEFAULT_CIPHER_ALGO     CIPHER_ALGO_AES
 +#if GPG_USE_AES256
 +# define DEFAULT_CIPHER_ALGO     CIPHER_ALGO_AES256
++#elif GPG_USE_AES128
+ # define DEFAULT_CIPHER_ALGO     CIPHER_ALGO_AES
  #elif GPG_USE_CAST5
  # define DEFAULT_CIPHER_ALGO     CIPHER_ALGO_CAST5
- #else
diff --git a/debian/patches/from-master/0016-agent-compile-time-configuration-of-s2k-calibration.patch b/debian/patches/from-master/0016-agent-compile-time-configuration-of-s2k-calibration.patch
new file mode 100644
index 0000000..0bf4261
--- /dev/null
+++ b/debian/patches/from-master/0016-agent-compile-time-configuration-of-s2k-calibration.patch
@@ -0,0 +1,72 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Fri, 8 Sep 2017 17:08:57 -0400
+Subject: agent: compile-time configuration of s2k calibration.
+
+* configure.ac: add --with-agent-s2k-calibration=MSEC, introduces
+AGENT_S2K_CALIBRATION (measured in milliseconds)
+* agent/protect.c (calibrate_s2k_count): Calibrate based on
+AGENT_S2K_CALIBRATION.
+
+Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+GnuPG-bug-id: 3399
+(cherry picked from commit 926d07c5fa05de05caef3a72b6fe156606ac0549)
+---
+ agent/protect.c |  6 +++---
+ configure.ac    | 10 +++++++++-
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/agent/protect.c b/agent/protect.c
+index c257861..9b262a9 100644
+--- a/agent/protect.c
++++ b/agent/protect.c
+@@ -159,7 +159,7 @@ calibrate_s2k_count_one (unsigned long count)
+ 
+ 
+ /* Measure the time we need to do the hash operations and deduce an
+-   S2K count which requires about 100ms of time.  */
++   S2K count which requires roughly some targeted amount of time.  */
+ static unsigned long
+ calibrate_s2k_count (void)
+ {
+@@ -171,11 +171,11 @@ calibrate_s2k_count (void)
+       ms = calibrate_s2k_count_one (count);
+       if (opt.verbose > 1)
+         log_info ("S2K calibration: %lu -> %lums\n", count, ms);
+-      if (ms > 100)
++      if (ms > AGENT_S2K_CALIBRATION)
+         break;
+     }
+ 
+-  count = (unsigned long)(((double)count / ms) * 100);
++  count = (unsigned long)(((double)count / ms) * AGENT_S2K_CALIBRATION);
+   count /= 1024;
+   count *= 1024;
+   if (count < 65536)
+diff --git a/configure.ac b/configure.ac
+index e5ade60..5a56950 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -122,7 +122,6 @@ use_tls_library=no
+ large_secmem=no
+ show_tor_support=no
+ 
+-
+ GNUPG_BUILD_PROGRAM(gpg, yes)
+ GNUPG_BUILD_PROGRAM(gpgsm, yes)
+ # The agent is a required part and can't be disabled anymore.
+@@ -250,6 +249,15 @@ fi
+ AC_DEFINE_UNQUOTED(SECMEM_BUFFER_SIZE,$SECMEM_BUFFER_SIZE,
+                    [Size of secure memory buffer])
+ 
++AC_MSG_CHECKING([calibrated passphrase-stretching (s2k) duration])
++AC_ARG_WITH(agent-s2k-calibration,
++              AC_HELP_STRING([--with-agent-s2k-calibration=MSEC],
++                             [calibrate passphrase stretching (s2k) to MSEC milliseconds]),
++              agent_s2k_calibration=$withval, agent_s2k_calibration=100)
++AC_MSG_RESULT($agent_s2k_calibration milliseconds)
++AC_DEFINE_UNQUOTED(AGENT_S2K_CALIBRATION, $agent_s2k_calibration,
++                   [Agent s2k calibration time (ms)])
++
+ AC_MSG_CHECKING([whether to enable trust models])
+ AC_ARG_ENABLE(trust-models,
+               AC_HELP_STRING([--disable-trust-models],
diff --git a/debian/patches/series b/debian/patches/series
index 12014db..9468904 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,11 +10,9 @@ gpg-agent-idling/0009-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
 gpg-agent-idling/0010-agent-Avoid-tight-timer-tick-when-possible.patch
 gpg-agent-idling/0011-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
 skip-missing-signing-keys/0013-g10-Skip-signing-keys-where-no-secret-key-is-availab.patch
-0013-scd-Fix-for-large-ECC-keys.patch
-update-defaults/0014-gpgsm-default-to-3072-bit-keys.patch
-update-defaults/0015-gpg-default-to-3072-bit-RSA-keys.patch
-update-defaults/0016-gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch
-update-defaults/0017-gpg-Prefer-SHA-512-and-SHA-384-in-default-preference.patch
-update-defaults/0018-gpg-default-to-AES-256.patch
-update-defaults/0019-agent-default-to-protection-that-takes-300ms-up-from.patch
-0020-tests-Fix-a-test-which-specifies-expiration-date.patch
+from-master/0013-gpgsm-default-to-3072-bit-keys.patch
+from-master/0014-gpg-default-to-3072-bit-RSA-keys.patch
+from-master/0015-gpg-default-to-AES-256.patch
+from-master/0016-agent-compile-time-configuration-of-s2k-calibration.patch
+update-defaults/0017-gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch
+update-defaults/0018-gpg-Prefer-SHA-512-and-SHA-384-in-default-preference.patch
diff --git a/debian/patches/update-defaults/0016-gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch b/debian/patches/update-defaults/0017-gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch
similarity index 92%
rename from debian/patches/update-defaults/0016-gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch
rename to debian/patches/update-defaults/0017-gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch
index 7f006c0..e2135d1 100644
--- a/debian/patches/update-defaults/0016-gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch
+++ b/debian/patches/update-defaults/0017-gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch
@@ -20,10 +20,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
  3 files changed, 3 insertions(+), 6 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index f520d1c..0d1e883 100644
+index 5a56950..e0f1610 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -312,7 +312,7 @@ GNUPG_GPG_DISABLE_ALGO([rmd160],[RIPE-MD160 hash])
+@@ -320,7 +320,7 @@ GNUPG_GPG_DISABLE_ALGO([rmd160],[RIPE-MD160 hash])
  GNUPG_GPG_DISABLE_ALGO([sha224],[SHA-224 hash])
  # SHA256 is a MUST algorithm for GnuPG.
  GNUPG_GPG_DISABLE_ALGO([sha384],[SHA-384 hash])
@@ -33,10 +33,10 @@ index f520d1c..0d1e883 100644
  
  # Allow disabling of zip support.
 diff --git a/g10/main.h b/g10/main.h
-index 87417ee..cd7f600 100644
+index 4850360..8296323 100644
 --- a/g10/main.h
 +++ b/g10/main.h
-@@ -39,7 +39,7 @@
+@@ -41,7 +41,7 @@
  # define DEFAULT_CIPHER_ALGO     CIPHER_ALGO_3DES
  #endif
  
diff --git a/debian/patches/update-defaults/0017-gpg-Prefer-SHA-512-and-SHA-384-in-default-preference.patch b/debian/patches/update-defaults/0018-gpg-Prefer-SHA-512-and-SHA-384-in-default-preference.patch
similarity index 98%
rename from debian/patches/update-defaults/0017-gpg-Prefer-SHA-512-and-SHA-384-in-default-preference.patch
rename to debian/patches/update-defaults/0018-gpg-Prefer-SHA-512-and-SHA-384-in-default-preference.patch
index f37a215..c1bf9ea 100644
--- a/debian/patches/update-defaults/0017-gpg-Prefer-SHA-512-and-SHA-384-in-default-preference.patch
+++ b/debian/patches/update-defaults/0018-gpg-Prefer-SHA-512-and-SHA-384-in-default-preference.patch
@@ -21,7 +21,7 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/g10/keygen.c b/g10/keygen.c
-index 048a391..2f6bf56 100644
+index e959ee9..82e35a4 100644
 --- a/g10/keygen.c
 +++ b/g10/keygen.c
 @@ -383,16 +383,16 @@ keygen_set_std_prefs (const char *string,int personal)
diff --git a/debian/patches/update-defaults/0019-agent-default-to-protection-that-takes-300ms-up-from.patch b/debian/patches/update-defaults/0019-agent-default-to-protection-that-takes-300ms-up-from.patch
deleted file mode 100644
index 0d60ea0..0000000
--- a/debian/patches/update-defaults/0019-agent-default-to-protection-that-takes-300ms-up-from.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Thu, 7 Sep 2017 19:10:48 -0400
-Subject: agent: default to protection that takes 300ms (up from 100ms).
-
-* agent/protect.c (calibrate_s2k_count): Calibrate to 300ms instead of
-100ms.
-
---
-
-It's likely that the user will keep their secret keys unlocked in the
-gpg-agent, so the costs of doing an unlock should be amortized over
-time.  Additionally, attackers might have computers more powerful than
-the machine the secret key is generated on.  Both of these factors
-suggest that we should probably increase the default lock/unlock costs
-for the secret key when it is placed in long-term storage.
-
-Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
----
- agent/protect.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/agent/protect.c b/agent/protect.c
-index c257861..04e87a2 100644
---- a/agent/protect.c
-+++ b/agent/protect.c
-@@ -159,7 +159,7 @@ calibrate_s2k_count_one (unsigned long count)
- 
- 
- /* Measure the time we need to do the hash operations and deduce an
--   S2K count which requires about 100ms of time.  */
-+   S2K count which requires about 300ms of time.  */
- static unsigned long
- calibrate_s2k_count (void)
- {
-@@ -171,11 +171,11 @@ calibrate_s2k_count (void)
-       ms = calibrate_s2k_count_one (count);
-       if (opt.verbose > 1)
-         log_info ("S2K calibration: %lu -> %lums\n", count, ms);
--      if (ms > 100)
-+      if (ms > 300)
-         break;
-     }
- 
--  count = (unsigned long)(((double)count / ms) * 100);
-+  count = (unsigned long)(((double)count / ms) * 300);
-   count /= 1024;
-   count *= 1024;
-   if (count < 65536)
diff --git a/debian/rules b/debian/rules
index 223d195..772eaac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,15 +31,14 @@ WIN32_FLAGS=LDFLAGS="-Xlinker --no-insert-timestamp -static" CFLAGS="-g -Os" CPP
 
 override_dh_auto_configure:
 	dh_auto_configure --builddirectory=build-gpgv-udeb -- \
-		--enable-gpg2-is-gpg \
 	   	$(foreach x, $(GPGV_UDEB_UNNEEDED), --disable-$(x))
 	dh_auto_configure --builddirectory=build-maintainer -- \
-		--enable-gpg2-is-gpg --enable-maintainer-mode \
+		--enable-maintainer-mode \
 	   	$(foreach x, $(GPGV_UDEB_UNNEEDED), --disable-$(x))
 	dh_auto_configure --builddirectory=build -- --libexecdir=\$${prefix}/lib/gnupg \
-		--enable-gpg2-is-gpg \
 		--enable-wks-tools \
 		--enable-all-tests \
+		--with-agent-s2k-calibration=300 \
 		--enable-symcryptrun --enable-large-secmem
 
 override_dh_auto_build-arch:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list