gnupg-1.4.10: Upgrade to the latest gnupg release

* Drop all prior patches... debian has none applied so
  it should work on mips and such as well.

9 files changed, 13 insertions, 296 deletions

diff --git a/recipes/gnupg/gnupg-1.4.2.2/15_free_caps.patch b/recipes/gnupg/gnupg-1.4.2.2/15_free_caps.patch
deleted file mode 100644
index 20949a7d49..0000000000
--- a/recipes/gnupg/gnupg-1.4.2.2/15_free_caps.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- /home/weasel/tmp/debian-gpg/gnupg-1.2.5/g10/status.c	2004-07-21 09:59:45.000000000 +0200
-+++ gnupg-1.2.5/g10/status.c	2004-08-01 20:07:42.071690680 +0200
-@@ -346,6 +346,9 @@
- {
-     char buf[100];
-     struct shmid_ds shmds;
-+#ifdef USE_CAPABILITIES
-+    cap_t caps;
-+#endif
- 
- #ifndef IPC_RMID_DEFERRED_RELEASE
-     atexit( remove_shmid );
-@@ -371,7 +374,9 @@
- 			    (unsigned)shm_size/1024, shm_area, shm_id );
-     if( lock_mem ) {
- #ifdef USE_CAPABILITIES
--	cap_set_proc( cap_from_text("cap_ipc_lock+ep") );
-+	caps = cap_from_text("cap_ipc_lock=ep");
-+	cap_set_proc( caps );
-+	cap_free( caps );
- #endif
- 	/* (need the cast for Solaris with Sun's workshop compilers) */
- 	if ( mlock ( (char*)shm_area, shm_size) )
-@@ -380,7 +385,9 @@
- 	else
- 	    shm_is_locked = 1;
- #ifdef USE_CAPABILITIES
--	cap_set_proc( cap_from_text("cap_ipc_lock+p") );
-+	caps = cap_from_text("cap_ipc_lock=p");
-+	cap_set_proc( caps );
-+	cap_free( caps );
- #endif
-     }
- 
-@@ -407,7 +414,9 @@
- 
-     if( lock_mem ) {
- #ifdef USE_CAPABILITIES
--	cap_set_proc( cap_from_text("cap_ipc_lock+ep") );
-+	caps = cap_from_text("cap_ipc_lock=ep");
-+	cap_set_proc( caps );
-+	cap_free( caps );
- #endif
- #ifdef IPC_HAVE_SHM_LOCK
- 	if ( shmctl (shm_id, SHM_LOCK, 0) )
-@@ -419,7 +428,9 @@
- 	log_info("Locking shared memory %d failed: No way to do it\n", shm_id );
- #endif
- #ifdef USE_CAPABILITIES
--	cap_set_proc( cap_from_text("cap_ipc_lock+p") );
-+	caps = cap_from_text("cap_ipc_lock=p");
-+	cap_set_proc( caps );
-+	cap_free( caps );
- #endif
-     }
- 
---- /home/weasel/tmp/debian-gpg/gnupg-1.2.5/util/secmem.c	2004-02-24 17:06:58.000000000 +0100
-+++ gnupg-1.2.5/util/secmem.c	2004-08-01 20:08:10.873412378 +0200
-@@ -97,12 +97,18 @@
- {
- #if defined(USE_CAPABILITIES) && defined(HAVE_MLOCK)
-     int err;
-+    cap_t caps;
-+
-+    caps = cap_from_text("cap_ipc_lock=ep");
-+    cap_set_proc( caps );
-+    cap_free( caps );
- 
--    cap_set_proc( cap_from_text("cap_ipc_lock+ep") );
-     err = mlock( p, n );
-     if( err && errno )
- 	err = errno;
--    cap_set_proc( cap_from_text("cap_ipc_lock+p") );
-+    caps = cap_from_text("cap_ipc_lock=p");
-+    cap_set_proc( caps );
-+    cap_free( caps );
- 
-     if( err ) {
- 	if( errno != EPERM
-@@ -301,8 +307,12 @@
-     if( !n ) {
- #ifndef __riscos__
- #ifdef USE_CAPABILITIES
-+	cap_t caps;
-+
- 	/* drop all capabilities */
--	cap_set_proc( cap_from_text("all-eip") );
-+	caps = cap_from_text("all-eip");
-+	cap_set_proc( caps );
-+	cap_free( caps );
- 
- #elif !defined(HAVE_DOSISH_SYSTEM)
- 	uid_t uid;
diff --git a/recipes/gnupg/gnupg-1.4.2.2/16_min_privileges.patch b/recipes/gnupg/gnupg-1.4.2.2/16_min_privileges.patch
deleted file mode 100644
index b29233b33b..0000000000
--- a/recipes/gnupg/gnupg-1.4.2.2/16_min_privileges.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- gnupg-1.4.0/g10/g10.c	2004-12-16 09:47:36.000000000 +0000
-+++ /tmp/dpep.O5S02c/gnupg-1.4.0/g10/g10.c	2005-02-03 23:31:40.645873299 +0000
-@@ -69,6 +69,11 @@
- #endif
- 
- 
-+#ifdef USE_CAPABILITIES
-+#include <sys/capability.h>
-+#include <sys/prctl.h>
-+#endif
-+
- enum cmd_and_opt_values
-   {
-     aNull = 0,
-@@ -1618,6 +1623,10 @@
- #ifdef USE_SHM_COPROCESSING
-     ulong requested_shm_size=0;
- #endif
-+#ifdef USE_CAPABILITIES
-+    uid_t curr_uid;
-+    cap_t caps;
-+#endif
- 
- #ifdef __riscos__
-     opt.lock_once = 1;
-@@ -1629,6 +1638,33 @@
-      * when adding any stuff between here and the call to
-      * secmem_init()  somewhere after the option parsing
-      */
-+
-+    /* if we use capabilities and run as root, we can immediately setuid back
-+     * to the normal user and only keep CAP_IPC_LOCK until the shared memory is
-+     * set up.
-+     */
-+#ifdef USE_CAPABILITIES
-+    curr_uid = getuid();
-+    if( curr_uid && !geteuid() ) { /* we are setuid root */
-+	if( prctl( PR_SET_KEEPCAPS, 1, 0, 0, 0 ) ) {
-+	    perror( "main(): could not keep capabilities" );
-+	    return -100;
-+	}
-+
-+	if( setuid( curr_uid ) ) {
-+	    perror( "main(): could not set user id" );
-+	    return -100;
-+	}
-+
-+	caps = cap_from_text( "cap_ipc_lock=p" );
-+	if( cap_set_proc( caps ) ) {
-+	    perror( "main(): could not install capabilities" );
-+	    return -100;
-+	}
-+	cap_free( caps );
-+    }
-+#endif
-+
-     log_set_name("gpg");
-     secure_random_alloc(); /* put random number into secure memory */
-     may_coredump = disable_core_dumps();
-@@ -1747,7 +1783,7 @@
-     }
- #endif
-     /* initialize the secure memory. */
--    got_secmem=secmem_init( 32768 );
-+    got_secmem=secmem_init( 32768 ); /* this will drop all remaining privileges */
-     maybe_setuid = 0;
-     /* Okay, we are now working under our real uid */
- 
diff --git a/recipes/gnupg/gnupg-1.4.2.2/22_zero_length_mpi_fix.patch b/recipes/gnupg/gnupg-1.4.2.2/22_zero_length_mpi_fix.patch
deleted file mode 100644
index 8f13db4d23..0000000000
--- a/recipes/gnupg/gnupg-1.4.2.2/22_zero_length_mpi_fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -urNad gnupg-1.4.2~/mpi/mpicoder.c gnupg-1.4.2/mpi/mpicoder.c
---- gnupg-1.4.2~/mpi/mpicoder.c	2005-05-31 06:30:05.000000000 +0000
-+++ gnupg-1.4.2/mpi/mpicoder.c	2005-09-29 00:52:19.000000000 +0000
-@@ -80,16 +80,20 @@
-     mpi_limb_t a;
-     MPI val = MPI_NULL;
- 
-+    if (nread == nmax)
-+        goto overflow;
-     if( (c = iobuf_get(inp)) == -1 )
- 	goto leave;
--    if (++nread >= nmax)
--        goto overflow;
-+    nread++;
-     nbits = c << 8;
-+
-+    if (nread == nmax)
-+        goto overflow;
-     if( (c = iobuf_get(inp)) == -1 )
- 	goto leave;
--    if (++nread >= nmax)
--        goto overflow;
-+    nread++;
-     nbits |= c;
-+
-     if( nbits > MAX_EXTERN_MPI_BITS ) {
- 	log_error("mpi too large for this implementation (%u bits)\n", nbits);
- 	goto leave;
-@@ -112,7 +116,7 @@
-     for( ; j > 0; j-- ) {
- 	a = 0;
- 	for(; i < BYTES_PER_MPI_LIMB; i++ ) {
--            if (nread >= nmax) {
-+            if (nread == nmax) {
- #ifdef M_DEBUG
-                 mpi_debug_free (val);
- #else
diff --git a/recipes/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch b/recipes/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch
deleted file mode 100644
index 914f1475b7..0000000000
--- a/recipes/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Originally the test for _'s on symbols was not done when cross-compiling and
-it was assumed that the _'s were appended. The test does in fact work since
-it simply compiles a file and then run's nm on it. So patch this to enable.
-Without this x86 targets fail during linking since the assembler code has
-the _'s appended when it shouldn't.
-
---- gnupg-1.4.2.2/acinclude.m4	2006/09/11 22:11:23	1.1
-+++ gnupg-1.4.2.2/acinclude.m4	2006/09/11 22:17:25
-@@ -673,11 +673,7 @@
-         ac_cv_sys_symbol_underscore=yes
-         ;;
-     *)
--      if test "$cross_compiling" = yes; then
--         ac_cv_sys_symbol_underscore=yes
--      else
--         tmp_do_check="yes"
--      fi
-+        tmp_do_check="yes"
-        ;;
- esac
- 
diff --git a/recipes/gnupg/gnupg-1.4.2.2/dont_use_mips_h_constraint.patch b/recipes/gnupg/gnupg-1.4.2.2/dont_use_mips_h_constraint.patch
deleted file mode 100644
index e0212b8e4b..0000000000
--- a/recipes/gnupg/gnupg-1.4.2.2/dont_use_mips_h_constraint.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Avoid using h contraint on mips for gcc >= 4.4 as it has been removed
-on gcc 4.4 onwards
-
-see
-
-http://gcc.gnu.org/gcc-4.4/changes.html
-
--Khem
-
-Index: gnupg-1.4.2.2/mpi/longlong.h
-===================================================================
---- gnupg-1.4.2.2.orig/mpi/longlong.h	2009-12-18 16:44:21.334633084 -0800
-+++ gnupg-1.4.2.2/mpi/longlong.h	2009-12-18 16:48:29.202212344 -0800
-@@ -711,7 +711,15 @@ extern USItype __udiv_qrnnd ();
-  **************  MIPS  *****************
-  ***************************************/
- #if defined (__mips__) && W_TYPE_SIZE == 32
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
-+#define umul_ppmm(w1, w0, u, v) \
-+  do {                                                                 \
-+    UDItype _r;                                                        \
-+    _r = (UDItype) u * v;                                              \
-+    (w1) = _r >> 32;                                                   \
-+    (w0) = (USItype) _r;                                               \
-+  } while (0)
-+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("multu %2,%3"                                                \
- 	   : "=l" ((USItype)(w0)),                                      \
-@@ -736,7 +744,16 @@ extern USItype __udiv_qrnnd ();
-  **************  MIPS/64  **************
-  ***************************************/
- #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
-+typedef unsigned int UTItype __attribute__ ((mode (TI)));
-+#define umul_ppmm(w1, w0, u, v) \
-+ do {                                                                  \
-+    UTItype _r;                                                        \
-+    _r = (UTItype) u * v;                                              \
-+    (w1) = _r >> 64;                                                   \
-+    (w0) = (UDItype) _r;                                               \
-+  } while (0)
-+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("dmultu %2,%3"                                               \
- 	   : "=l" ((UDItype)(w0)),                                      \
diff --git a/recipes/gnupg/gnupg-1.4.2.2/long-long-thumb.patch b/recipes/gnupg/gnupg-1.4.2.2/long-long-thumb.patch
deleted file mode 100644
index 36e9992772..0000000000
--- a/recipes/gnupg/gnupg-1.4.2.2/long-long-thumb.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnupg/mpi/longlong.h~	2006-02-14 10:09:55.000000000 +0000
-+++ gnupg/mpi/longlong.h	2008-10-27 13:11:09.000000000 +0000
-@@ -181,7 +181,7 @@
- /***************************************
-  **************  ARM  ******************
-  ***************************************/
--#if defined (__arm__) && W_TYPE_SIZE == 32
-+#if defined (__arm__) && W_TYPE_SIZE == 32 && !defined(__thumb__)
- #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-   __asm__ ("adds %1, %4, %5\n"                                          \
- 	   "adc  %0, %2, %3"                                            \
diff --git a/recipes/gnupg/gnupg.inc b/recipes/gnupg/gnupg.inc
index f41dbdc73c..7115d46614 100644
--- a/recipes/gnupg/gnupg.inc
+++ b/recipes/gnupg/gnupg.inc
@@ -9,7 +9,7 @@ inherit autotools gettext
 MIRRORS_prepend () {
 ftp://ftp.gnupg.org/gcrypt	http://mirrors.rootmode.com/ftp.gnupg.org
 }
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2;name=src"
 S = "${WORKDIR}/gnupg-${PV}"
 
 #   --with-egd-socket=NAME  use NAME for the EGD socket
diff --git a/recipes/gnupg/gnupg_1.4.10.bb b/recipes/gnupg/gnupg_1.4.10.bb
new file mode 100644
index 0000000000..a5fae96342
--- /dev/null
+++ b/recipes/gnupg/gnupg_1.4.10.bb
@@ -0,0 +1,12 @@
+require gnupg.inc
+
+DEPENDS += "readline"
+EXTRA_OECONF += "--with-readline=${STAGING_LIBDIR}/.. ac_cv_sys_symbol_underscore=yes"
+#   --without-readline      do not support fancy command line editing
+
+SRC_URI[src.md5sum] = "dcf7ed712997888d616e029637bfc303"
+SRC_URI[src.sha256sum] = "a2907f4432d67894e425e48ae85785dd60ecb01658c9682bcd96f5e91043bb38"
+
+S = "${WORKDIR}/gnupg-${PV}"
+
+PR = "r1"
diff --git a/recipes/gnupg/gnupg_1.4.2.2.bb b/recipes/gnupg/gnupg_1.4.2.2.bb
deleted file mode 100644
index 7f21a312ae..0000000000
--- a/recipes/gnupg/gnupg_1.4.2.2.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require gnupg.inc
-
-DEPENDS += "readline"
-EXTRA_OECONF += "--with-readline=${STAGING_LIBDIR}/.."
-#   --without-readline      do not support fancy command line editing
-
-SRC_URI += "file://15_free_caps.patch;patch=1 \
-	    file://16_min_privileges.patch;patch=1 \
-	    file://22_zero_length_mpi_fix.patch;patch=1 \
-            file://30_nm_always_check.patch;patch=1 \
-            file://long-long-thumb.patch;patch=1 \
-            file://dont_use_mips_h_constraint.patch;patch=1 \
-	   "
-
-S = "${WORKDIR}/gnupg-${PV}"
-
-PR = "r4"