[pkgsrc/trunk]: pkgsrc/security/gnupg2 kill the "idea" option -- gnupg2 uses ...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/312debf7a5df
branches:  trunk
changeset: 568778:312debf7a5df
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Dec 18 17:49:51 2009 +0000

description:
kill the "idea" option -- gnupg2 uses libgcrypt which used to have
an "idea" option, but that was removed more than a year ago when it
got updated from 1.2 to 1.4
The patch was was used on gnupg2 in the "idea" case was just a four-line
memory initialization fix, there is no point in LICENSE restrictions
due to this, so I've pulled it in as regular patch so that it doesn't
get lost for the case someone fixes idea support in libgcrypt
(which isn't hard).

diffstat:

 security/gnupg2/buildlink3.mk    |  13 +------------
 security/gnupg2/distinfo         |   3 ++-
 security/gnupg2/options.mk       |  17 ++---------------
 security/gnupg2/patches/patch-al |  17 +++++++++++++++++
 4 files changed, 22 insertions(+), 28 deletions(-)

diffs (92 lines):

diff -r 24c5e312c5ef -r 312debf7a5df security/gnupg2/buildlink3.mk
--- a/security/gnupg2/buildlink3.mk     Fri Dec 18 14:39:42 2009 +0000
+++ b/security/gnupg2/buildlink3.mk     Fri Dec 18 17:49:51 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/12/18 17:49:51 drochner Exp $
 
 BUILDLINK_TREE+=       gnupg2
 
@@ -9,17 +9,6 @@
 BUILDLINK_PKGSRCDIR.gnupg2?=   ../../security/gnupg2
 BUILDLINK_PREFIX.gnupg2?=      ${LOCALBASE}
 
-pkgbase:=      gnupg2
-.include "../../mk/pkg-build-options.mk"
-
-.   if !empty(PKG_BUILD_OPTIONS.gnupg2:Midea)
-pkgbase:=      libgcrypt
-.      include "../../mk/pkg-build-options.mk"
-.      if empty(PKG_BUILD_OPTIONS.libgcrypt:Midea)
-PKGSRC_MAKE_ENV+=      PKG_OPTIONS.libgcrypt+=idea
-.      endif
-.   endif
-
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libksba/buildlink3.mk"
diff -r 24c5e312c5ef -r 312debf7a5df security/gnupg2/distinfo
--- a/security/gnupg2/distinfo  Fri Dec 18 14:39:42 2009 +0000
+++ b/security/gnupg2/distinfo  Fri Dec 18 17:49:51 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2009/12/16 18:52:49 drochner Exp $
+$NetBSD: distinfo,v 1.15 2009/12/18 17:49:51 drochner Exp $
 
 SHA1 (gnupg-2.0.13.tar.bz2) = 2ff42aff14cdddafc291d44ac1968af5f09a9d4d
 RMD160 (gnupg-2.0.13.tar.bz2) = a2291f4d5923b50bca980b726e2fe0c31c2589a9
@@ -17,3 +17,4 @@
 SHA1 (patch-ai) = 555b8768c30f470e98e5be62a4a4bea29eefdf78
 SHA1 (patch-aj) = 20be6b455167962ffa556979d8d0f167dd14131e
 SHA1 (patch-ak) = 74b26ce441ea99ff28a09a3f0c643456daf48f35
+SHA1 (patch-al) = ef7c698ed102c4e27bbf707ae5d1fce4c2b5d8d4
diff -r 24c5e312c5ef -r 312debf7a5df security/gnupg2/options.mk
--- a/security/gnupg2/options.mk        Fri Dec 18 14:39:42 2009 +0000
+++ b/security/gnupg2/options.mk        Fri Dec 18 17:49:51 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2009/12/15 20:10:41 drochner Exp $
+# $NetBSD: options.mk,v 1.4 2009/12/18 17:49:51 drochner Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gnupg2
-PKG_SUPPORTED_OPTIONS= gpgsm idea
+PKG_SUPPORTED_OPTIONS= gpgsm
 PKG_SUGGESTED_OPTIONS= gpgsm
 
 .include "../../mk/bsd.prefs.mk"
@@ -24,16 +24,3 @@
 PLIST_SRC+=     ${.CURDIR}/PLIST.gpgsm
 .  include "../../security/dirmngr/buildlink3.mk"
 .endif
-
-.if !empty(PKG_OPTIONS:Midea)
-LICENSE=        idea-license
-RESTRICTED=     Commercial distribution is claimed to require a license.
-NO_SRC_ON_CDROM=        ${RESTRICTED}
-NO_BIN_ON_CDROM=        ${RESTRICTED}
-
-PATCH_SITES=           http://www.kfwebs.com/
-PATCHFILES+=           gnupg-2.0.4-idea.patch
-PATCH_DIST_STRIP=      -p1
-
-PKGSRC_MAKE_ENV+=      PKG_OPTIONS.libgcrypt+=idea
-.endif
diff -r 24c5e312c5ef -r 312debf7a5df security/gnupg2/patches/patch-al
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gnupg2/patches/patch-al  Fri Dec 18 17:49:51 2009 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-al,v 1.1 2009/12/18 17:49:51 drochner Exp $
+
+--- g10/seckey-cert.c.orig     2009-08-06 17:32:40.000000000 +0000
++++ g10/seckey-cert.c
+@@ -209,6 +209,12 @@ do_check( PKT_secret_key *sk, const char
+                 csum += checksum (buffer, ndata);
+                 gcry_mpi_release (sk->skey[i]);
+ 
++/* http://www.kfwebs.net/articles/article/42/GnuPG-2.0---IDEA-support */
++              if (sk->protect.algo == CIPHER_ALGO_IDEA) {
++                      buffer[0] = 0;
++                      buffer[1] = 0;
++              }
++
+               err = gcry_mpi_scan( &sk->skey[i], GCRYMPI_FMT_PGP,
+                                    buffer, ndata, &ndata );
+               xfree (buffer);