upgrading package: gnupg 1.2.3 -> 1.2.4

gnupg/gnupg.patch

@@ -1,67 +0,0 @@
-David Shaw wrote a patch against GnuPG 1.2.3 to disable the ability to
-create signatures using the ElGamal sign+encrypt (type 20) keys as
-well as to remove the option to create such keys.
-
-Index: g10/getkey.c
---- g10/getkey.c	21 Jul 2003 14:55:00 -0000	1.78.2.20
-+++ g10/getkey.c	27 Nov 2003 00:32:30 -0000
-@@ -1655,6 +1655,11 @@
-         if ( x ) /* mask it down to the actual allowed usage */
-             key_usage &= x; 
-     }
-+
-+    /* Type 20 Elgamal keys are not usable. */
-+    if(pk->pubkey_algo==PUBKEY_ALGO_ELGAMAL)
-+      key_usage=0;
-+
-     pk->pubkey_usage = key_usage;
- 
-     if ( !key_expire_seen ) {
-@@ -1869,6 +1874,13 @@
-         if ( x ) /* mask it down to the actual allowed usage */
-             key_usage &= x; 
-     }
-+
-+    /* Type 20 Elgamal subkeys or any subkey on a type 20 primary are
-+       not usable. */
-+    if(mainpk->pubkey_algo==PUBKEY_ALGO_ELGAMAL
-+       || subpk->pubkey_algo==PUBKEY_ALGO_ELGAMAL)
-+      key_usage=0;
-+
-     subpk->pubkey_usage = key_usage;
-     
-     p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_KEY_EXPIRE, NULL);
-Index: g10/keygen.c
---- g10/keygen.c	16 Jul 2003 03:09:15 -0000	1.90.2.11
-+++ g10/keygen.c	27 Nov 2003 00:32:31 -0000
-@@ -958,8 +958,6 @@
-     tty_printf(    _("   (%d) DSA (sign only)\n"), 2 );
-     if( addmode )
- 	tty_printf(    _("   (%d) ElGamal (encrypt only)\n"), 3 );
--    if (opt.expert)
--        tty_printf(    _("   (%d) ElGamal (sign and encrypt)\n"), 4 );
-     tty_printf(    _("   (%d) RSA (sign only)\n"), 5 );
-     if (addmode)
-         tty_printf(    _("   (%d) RSA (encrypt only)\n"), 6 );
-@@ -989,21 +987,6 @@
- 	    algo = PUBKEY_ALGO_RSA;
-             *r_usage = PUBKEY_USAGE_SIG;
- 	    break;
--	}
--	else if( algo == 4 && opt.expert)
--	  {
--	    tty_printf(_(
--"The use of this algorithm is only supported by GnuPG.  You will not be\n"
--"able to use this key to communicate with PGP users.  This algorithm is also\n"
--"very slow, and may not be as secure as the other choices.\n"));
--
--	    if( cpr_get_answer_is_yes("keygen.algo.elg_se",
--				      _("Create anyway? ")))
--	      {
--		algo = PUBKEY_ALGO_ELGAMAL;
--		*r_usage = PUBKEY_USAGE_ENC | PUBKEY_USAGE_SIG;
--		break;
--	      }
- 	}
- 	else if( algo == 3 && addmode ) {
- 	    algo = PUBKEY_ALGO_ELGAMAL_E;

gnupg/gnupg.spec

@@ -32,8 +32,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        Cryptography
 License:      GPL
-Version:      1.2.3
-Release:      20031127
+Version:      1.2.4
+Release:      20031224
 
 #   package options
 %option       with_idea  no
@@ -41,7 +41,6 @@ Release:      20031127
 #   list of sources
 Source0:      ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.gz
 Source1:      ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz
-Patch0:       gnupg.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -63,7 +62,6 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %patch -p0
 %if "%{with_idea}" == "yes"
     %{l_gzip} -d -c %{SOURCE idea.c.gz} >cipher/idea.c
 %endif