Version bump

(Portage version: 2.1.4_rc10)

3 files changed, 133 insertions, 0 deletions

diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.8 b/app-crypt/gnupg/files/digest-gnupg-1.4.8
new file mode 100644
index 000000000000..095177b611e0
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.4.8
@@ -0,0 +1,9 @@
+MD5 6169eb1d9f562b9c7ced37bb7d1ca4f0 gnupg-1.4.7-ecc0.1.8.diff.bz2 17772
+RMD160 83bbdb3d226716acaf749659374579ca023ca0cd gnupg-1.4.7-ecc0.1.8.diff.bz2 17772
+SHA256 71e67ac4196a8911b4cec4e052c418ce4bec23c70111a879d5e4303fcd19af29 gnupg-1.4.7-ecc0.1.8.diff.bz2 17772
+MD5 e5be39ea81bb07de006e7dd44439cb76 gnupg-1.4.8.tar.bz2 3320100
+RMD160 75228c02ea1999494232cb2eb2107951d1602c4d gnupg-1.4.8.tar.bz2 3320100
+SHA256 119d2574deafe8c2d4444e53051ebad215d375f94f29c520ff891275f14e006c gnupg-1.4.8.tar.bz2 3320100
+MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
+RMD160 e35be5a031d10d52341ac5f029d28f811edd908d idea.c.gz 5216
+SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844 idea.c.gz 5216
diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.8 b/app-crypt/gnupg/files/digest-gnupg-2.0.8
new file mode 100644
index 000000000000..d232924e9693
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-2.0.8
@@ -0,0 +1,3 @@
+MD5 fc4377ca67e1bf687eeaf22e79c0b9d1 gnupg-2.0.8.tar.bz2 3654523
+RMD160 bfd8cfb48ff74834c80d09d040921e005af9550c gnupg-2.0.8.tar.bz2 3654523
+SHA256 16f310afe4740a26475c7273f585861a4bdefecbde27c214cc30c0db45d26913 gnupg-2.0.8.tar.bz2 3654523
diff --git a/app-crypt/gnupg/files/gnupg-1.4.8-ecc-glue.patch b/app-crypt/gnupg/files/gnupg-1.4.8-ecc-glue.patch
new file mode 100644
index 000000000000..40385a48e1f9
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-1.4.8-ecc-glue.patch
@@ -0,0 +1,121 @@
+--- gnupg-1.4.7-ecc0.1.8.diff	2007-12-20 21:24:04.000000000 +0200
++++ gnupg-1.4.8-ecc0.1.8.diff	2007-12-20 21:23:30.000000000 +0200
+@@ -1914,48 +1914,48 @@ diff -Nru gnupg-1.4.7/cipher/Makefile.am
+  
+  if USE_RNDLINUX
+  libcipher_a_SOURCES+=rndlinux.c
+-diff -Nru gnupg-1.4.7/cipher/Makefile.in gnupg-1.4.7-ecc/cipher/Makefile.in
+---- gnupg-1.4.7/cipher/Makefile.in	2007-03-05 10:44:42.000000000 +0100
+-+++ gnupg-1.4.7-ecc/cipher/Makefile.in	2007-11-08 22:24:55.000000000 +0100
+-@@ -96,7 +96,7 @@
+- 	elgamal.c elgamal.h rsa.c rsa.h primegen.c random.h random.c \
+- 	rand-internal.h rmd.h dsa.h dsa.c smallprime.c algorithms.h \
+- 	md5.c rmd160.c sha1.c sha256.c rndlinux.c rndunix.c rndegd.c \
+--	rndw32.c sha512.c
+-+	rndw32.c sha512.c ecc.c
++diff -urNp gnupg-1.4.8/cipher/Makefile.in gnupg-1.4.8.ecc/cipher/Makefile.in
++--- gnupg-1.4.8/cipher/Makefile.in	2007-12-20 09:54:08.000000000 +0200
+++++ gnupg-1.4.8.ecc/cipher/Makefile.in	2007-12-20 21:16:08.000000000 +0200
++@@ -93,7 +93,7 @@ am__libcipher_a_SOURCES_DIST = cipher.c 
++ 	camellia.c camellia.h camellia-glue.c elgamal.c elgamal.h \
++ 	rsa.c rsa.h primegen.c random.h random.c rand-internal.h rmd.h \
++ 	dsa.h dsa.c smallprime.c algorithms.h md5.c rmd160.c sha1.c \
++-	sha256.c rndlinux.c rndunix.c rndegd.c rndw32.c sha512.c
+++	sha256.c rndlinux.c rndunix.c rndegd.c rndw32.c sha512.c ecc.c
+  @USE_RNDLINUX_TRUE@am__objects_1 = rndlinux.$(OBJEXT)
+  @USE_RNDUNIX_TRUE@am__objects_2 = rndunix.$(OBJEXT)
+  @USE_RNDEGD_TRUE@am__objects_3 = rndegd.$(OBJEXT)
+-@@ -107,7 +107,7 @@
+- 	blowfish.$(OBJEXT) cast5.$(OBJEXT) rijndael.$(OBJEXT) \
+- 	elgamal.$(OBJEXT) rsa.$(OBJEXT) primegen.$(OBJEXT) \
+- 	random.$(OBJEXT) dsa.$(OBJEXT) smallprime.$(OBJEXT) \
+--	md5.$(OBJEXT) rmd160.$(OBJEXT) sha1.$(OBJEXT) sha256.$(OBJEXT) \
+-+	md5.$(OBJEXT) rmd160.$(OBJEXT) sha1.$(OBJEXT) sha256.$(OBJEXT) ecc.$(OBJEXT) \
++@@ -105,7 +105,7 @@ am_libcipher_a_OBJECTS = cipher.$(OBJEXT
++ 	camellia.$(OBJEXT) camellia-glue.$(OBJEXT) elgamal.$(OBJEXT) \
++ 	rsa.$(OBJEXT) primegen.$(OBJEXT) random.$(OBJEXT) \
++ 	dsa.$(OBJEXT) smallprime.$(OBJEXT) md5.$(OBJEXT) \
++-	rmd160.$(OBJEXT) sha1.$(OBJEXT) sha256.$(OBJEXT) \
+++	rmd160.$(OBJEXT) sha1.$(OBJEXT) sha256.$(OBJEXT) ecc.$(OBJEXT) \
+  	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
+  	$(am__objects_4) $(am__objects_5)
+  libcipher_a_OBJECTS = $(am_libcipher_a_OBJECTS)
+-@@ -325,7 +325,7 @@
+- 	twofish.c blowfish.c cast5.c rijndael.c elgamal.c elgamal.h \
+- 	rsa.c rsa.h primegen.c random.h random.c rand-internal.h rmd.h \
+- 	dsa.h dsa.c smallprime.c algorithms.h md5.c rmd160.c sha1.c \
+--	sha256.c $(am__append_2) $(am__append_3) $(am__append_4) \
+-+	sha256.c ecc.c $(am__append_2) $(am__append_3) $(am__append_4) \
++@@ -302,7 +302,7 @@ libcipher_a_SOURCES = cipher.c pubkey.c 
++ 	twofish.c blowfish.c cast5.c rijndael.c camellia.c camellia.h \
++ 	camellia-glue.c elgamal.c elgamal.h rsa.c rsa.h primegen.c \
++ 	random.h random.c rand-internal.h rmd.h dsa.h dsa.c \
++-	smallprime.c algorithms.h md5.c rmd160.c sha1.c sha256.c \
+++	smallprime.c algorithms.h md5.c rmd160.c sha1.c sha256.c ecc.c \
++ 	$(am__append_2) $(am__append_3) $(am__append_4) \
+  	$(am__append_5) $(am__append_6)
+  EXTRA_libcipher_a_SOURCES = idea-stub.c
+- libcipher_a_DEPENDENCIES = @IDEA_O@
+-@@ -402,6 +402,7 @@
++@@ -382,6 +382,7 @@ distclean-compile:
+  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha512.Po@am__quote@
+  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smallprime.Po@am__quote@
+  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/twofish.Po@am__quote@
+ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecc.Po@am__quote@
+  
+  .c.o:
+- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-diff -Nru gnupg-1.4.7/cipher/pubkey.c gnupg-1.4.7-ecc/cipher/pubkey.c
+---- gnupg-1.4.7/cipher/pubkey.c	2005-07-27 19:02:55.000000000 +0200
+-+++ gnupg-1.4.7-ecc/cipher/pubkey.c	2007-11-08 22:24:55.000000000 +0100
+-@@ -33,6 +33,9 @@
++ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++diff -urNp gnupg-1.4.8/cipher/pubkey.c gnupg-1.4.8.ecc/cipher/pubkey.c
++--- gnupg-1.4.8/cipher/pubkey.c	2007-12-12 20:06:55.000000000 +0200
+++++ gnupg-1.4.8.ecc/cipher/pubkey.c	2007-12-20 21:13:31.000000000 +0200
++@@ -31,6 +31,9 @@
+  #include "elgamal.h"
+  #include "dsa.h"
+  #include "rsa.h"
+@@ -2311,25 +2311,23 @@ diff -Nru gnupg-1.4.7/g10/keyid.c gnupg-
+        default: return '?';
+      }
+  }
+-diff -Nru gnupg-1.4.7/g10/mainproc.c gnupg-1.4.7-ecc/g10/mainproc.c
+---- gnupg-1.4.7/g10/mainproc.c	2007-03-05 10:08:41.000000000 +0100
+-+++ gnupg-1.4.7-ecc/g10/mainproc.c	2007-11-08 22:24:55.000000000 +0100
+-@@ -399,7 +399,10 @@
+-     }
++diff -urNp gnupg-1.4.8/g10/mainproc.c gnupg-1.4.8.ecc/g10/mainproc.c
++--- gnupg-1.4.8/g10/mainproc.c	2007-12-12 19:44:49.000000000 +0200
+++++ gnupg-1.4.8.ecc/g10/mainproc.c	2007-12-20 21:17:33.000000000 +0200
++@@ -404,6 +404,9 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
+      else if( is_ELGAMAL(enc->pubkey_algo)
+- 	|| enc->pubkey_algo == PUBKEY_ALGO_DSA
+--	|| is_RSA(enc->pubkey_algo)  ) {
+-+	|| is_RSA(enc->pubkey_algo)
+-+/*begin ECC mod*/
+-+        || is_ECC(enc->pubkey_algo) ) {
+-+/*end ECC mod*/
+-       /* FIXME:  strore this all in a list and process it later */
+- 
+- 	if ( !c->dek && ((!enc->keyid[0] && !enc->keyid[1])
+-diff -Nru gnupg-1.4.7/g10/misc.c gnupg-1.4.7-ecc/g10/misc.c
+---- gnupg-1.4.7/g10/misc.c	2006-06-30 11:01:49.000000000 +0200
+-+++ gnupg-1.4.7-ecc/g10/misc.c	2007-11-08 22:24:55.000000000 +0100
+-@@ -421,6 +421,11 @@
++              || enc->pubkey_algo == PUBKEY_ALGO_DSA
++              || is_RSA(enc->pubkey_algo)  
+++/*begin ECC mod*/
+++             || is_ECC(enc->pubkey_algo)
+++/*end ECC mod*/
++              || (RFC2440 && enc->pubkey_algo == PUBKEY_ALGO_ELGAMAL)) {
++       /* Note that we also allow type 20 Elgamal keys for decryption.
++          There are still a couple of those keys in active use as a
++diff -urNp gnupg-1.4.8/g10/misc.c gnupg-1.4.8.ecc/g10/misc.c
++--- gnupg-1.4.8/g10/misc.c	2007-12-12 19:35:18.000000000 +0200
+++++ gnupg-1.4.8.ecc/g10/misc.c	2007-12-20 21:13:31.000000000 +0200
++@@ -433,6 +433,11 @@ openpgp_pk_algo_usage ( int algo )
+        case PUBKEY_ALGO_DSA:  
+            use = PUBKEY_USAGE_CERT | PUBKEY_USAGE_SIG | PUBKEY_USAGE_AUTH;
+            break;