diff -Nru gnupg2-2.0.14/debian/changelog gnupg2-2.0.14/debian/changelog --- gnupg2-2.0.14/debian/changelog 2010-02-03 19:00:15.000000000 +0100 +++ gnupg2-2.0.14/debian/changelog 2010-06-19 11:02:21.000000000 +0200 @@ -1,3 +1,11 @@ +gnupg2 (2.0.14-1ubuntu1.1) lucid-proposed; urgency=low + + * Fix a regression in gnupg2 2.0.14 which prevents unprotection of new or + changed gpg-agent passphrases. Patch provided by Werner Koch (upstream) + (lp: #567106). + + -- Michael Bienia Sat, 19 Jun 2010 11:01:30 +0200 + gnupg2 (2.0.14-1ubuntu1) lucid; urgency=low * Merge with Debian testing (lp: #511356). Remaining changes: diff -Nru gnupg2-2.0.14/debian/patches/debian-changes gnupg2-2.0.14/debian/patches/debian-changes --- gnupg2-2.0.14/debian/patches/debian-changes 2010-01-10 03:33:09.000000000 +0100 +++ gnupg2-2.0.14/debian/patches/debian-changes 2010-06-19 11:02:35.000000000 +0200 @@ -1,14 +1,34 @@ Please use the git repo for development. +--- gnupg2-2.0.14.orig/configure ++++ gnupg2-2.0.14/configure +@@ -746,6 +746,7 @@ GNUPG_PINENTRY_PGM + GNUPG_AGENT_PGM_FALSE + GNUPG_AGENT_PGM_TRUE + GNUPG_AGENT_PGM ++pkgdatadir + PACKAGE_GT + EGREP + GREP +@@ -4803,6 +4804,9 @@ fi + + + ++# Override for Debian packaging. ++pkgdatadir="\$(datadir)/gnupg2" ++ + + cat >>confdefs.h <<_ACEOF + #define PACKAGE "$PACKAGE" --- /dev/null +++ gnupg2-2.0.14/config.guess -@@ -0,0 +1,1500 @@ +@@ -0,0 +1,1502 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -+# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ++# Free Software Foundation, Inc. + -+timestamp='2006-07-02' ++timestamp='2009-12-30' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by @@ -31,16 +51,16 @@ +# the same distribution terms that you use for the rest of that program. + + -+# Originally written by Per Bothner . -+# Please send patches to . Submit a context -+# diff and a properly formatted ChangeLog entry. ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a ChangeLog ++# entry. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# -+# The plan is that this can be called by configure scripts if you -+# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + +me=`echo "$0" | sed -e 's,.*/,,'` + @@ -60,8 +80,9 @@ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free ++Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -165,6 +186,7 @@ + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched @@ -173,7 +195,7 @@ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? @@ -327,14 +349,33 @@ + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; -+ i86pc:SunOS:5.*:*) -+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize @@ -535,7 +576,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; -+ *:AIX:*:[45]) ++ *:AIX:*:[456]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 @@ -643,7 +684,7 @@ + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ grep __LP64__ >/dev/null ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else @@ -784,7 +825,7 @@ + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; -+ i*:MINGW*:*) ++ *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) @@ -794,15 +835,24 @@ + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; -+ x86:Interix*:[3456]*) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ EM64T:Interix*:[3456]*) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ authenticamd | genuineintel | EM64T) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -832,8 +882,29 @@ + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; + arm*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -847,6 +918,17 @@ + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; @@ -856,74 +938,33 @@ + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; -+ mips:Linux:*:*) -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #undef CPU -+ #undef mips -+ #undef mipsel -+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -+ CPU=mipsel -+ #else -+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -+ CPU=mips -+ #else -+ CPU= -+ #endif -+ #endif -+EOF -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -+ ;; -+ mips64:Linux:*:*) ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU -+ #undef mips64 -+ #undef mips64el ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -+ CPU=mips64el ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -+ CPU=mips64 ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu + exit ;; -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu -+ exit ;; -+ alpha:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ EV5) UNAME_MACHINE=alphaev5 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level @@ -933,8 +974,11 @@ + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux @@ -954,69 +998,9 @@ + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; -+ i*86:Linux:*:*) -+ # The BFD linker knows what the default object file format is, so -+ # first see if it will tell us. cd to the root directory to prevent -+ # problems with other programs or directories called `ld' in the path. -+ # Set LC_ALL=C to ensure ld outputs messages in English. -+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ -+ | sed -ne '/supported targets:/!d -+ s/[ ][ ]*/ /g -+ s/.*supported targets: *// -+ s/ .*// -+ p'` -+ case "$ld_supported_targets" in -+ elf32-i386) -+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -+ ;; -+ a.out-i386-linux) -+ echo "${UNAME_MACHINE}-pc-linux-gnuaout" -+ exit ;; -+ coff-i386) -+ echo "${UNAME_MACHINE}-pc-linux-gnucoff" -+ exit ;; -+ "") -+ # Either a pre-BFD a.out linker (linux-gnuoldld) or -+ # one that does not give us useful --help. -+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -+ exit ;; -+ esac -+ # Determine whether the default compiler is a.out or elf -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #include -+ #ifdef __ELF__ -+ # ifdef __GLIBC__ -+ # if __GLIBC__ >= 2 -+ LIBC=gnu -+ # else -+ LIBC=gnulibc1 -+ # endif -+ # else -+ LIBC=gnulibc1 -+ # endif -+ #else -+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+ LIBC=gnu -+ #else -+ LIBC=gnuaout -+ #endif -+ #endif -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif -+EOF -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^LIBC/{ -+ s: ::g -+ p -+ }'`" -+ test x"${LIBC}" != x && { -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit -+ } -+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } -+ ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both @@ -1045,7 +1029,7 @@ + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) @@ -1089,8 +1073,11 @@ + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i386. -+ echo i386-pc-msdosdjgpp ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 @@ -1128,6 +1115,16 @@ + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; @@ -1140,7 +1137,7 @@ + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) @@ -1203,6 +1200,9 @@ + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; @@ -1212,6 +1212,15 @@ + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; @@ -1221,6 +1230,16 @@ + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1302,6 +1321,9 @@ + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; +esac + +#echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1462,9 +1484,9 @@ +the operating system you are using. It is advised that you +download the most up to date version of the config scripts from + -+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +and -+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + +If the version you run ($0) is already up to date, please +send the following data and any information you think might be @@ -1515,14 +1537,14 @@ [Name of this package for gettext]) --- /dev/null +++ gnupg2-2.0.14/config.sub -@@ -0,0 +1,1616 @@ +@@ -0,0 +1,1714 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -+# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ++# Free Software Foundation, Inc. + -+timestamp='2006-09-20' ++timestamp='2010-01-22' + +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software @@ -1550,13 +1572,16 @@ + + +# Please send patches to . Submit a context -+# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. @@ -1590,8 +1615,9 @@ +version="\ +GNU config.sub ($timestamp) + -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free ++Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1640,6 +1666,7 @@ +case $maybe_os in + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -1666,10 +1693,13 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -+ -apple | -axis | -knuth | -cray) ++ -apple | -axis | -knuth | -cray | -microblaze) + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 @@ -1763,17 +1793,20 @@ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ -+ | fr30 | frv \ ++ | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | mcore \ ++ | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ -+ | mips64vr | mips64vrel \ ++ | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ @@ -1786,6 +1819,7 @@ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ + | mt \ + | msp430 \ + | nios | nios2 \ @@ -1794,20 +1828,22 @@ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ ++ | rx \ + | score \ -+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ ++ | ubicom32 \ + | v850 | v850e \ + | we32k \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | z8k) ++ | z8k | z80) + basic_machine=$basic_machine-unknown + ;; -+ m6811 | m68hc11 | m6812 | m68hc12) ++ m6811 | m68hc11 | m6812 | m68hc12 | picochip) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none @@ -1842,19 +1878,22 @@ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ -+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ ++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ -+ | mips64vr-* | mips64vrel-* \ ++ | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ @@ -1875,21 +1914,27 @@ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ -+ | romp-* | rs6000-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | romp-* | rs6000-* | rx-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile-* | tilegx-* \ + | tron-* \ ++ | ubicom32-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | xstormy16-* | xtensa-* \ ++ | xstormy16-* | xtensa*-* \ + | ymp-* \ -+ | z8k-*) ++ | z8k-* | z80-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. @@ -1953,6 +1998,10 @@ + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux @@ -1961,10 +2010,26 @@ + basic_machine=ns32k-sequent + os=-dynix + ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd @@ -1993,8 +2058,8 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; -+ cr16c) -+ basic_machine=cr16c-unknown ++ cr16) ++ basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) @@ -2032,6 +2097,10 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp @@ -2186,6 +2255,14 @@ + basic_machine=m68k-isi + os=-sysv + ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + m88k-omron*) + basic_machine=m88k-omron + ;; @@ -2197,10 +2274,17 @@ + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze) ++ basic_machine=microblaze-xilinx ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; + miniframe) + basic_machine=m68000-convergent + ;; @@ -2327,6 +2411,14 @@ + basic_machine=i860-intel + os=-osf + ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + pbd) + basic_machine=sparc-tti + ;; @@ -2443,6 +2535,9 @@ + basic_machine=sh-hitachi + os=-hms + ;; ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; + sh64) + basic_machine=sh64-unknown + ;; @@ -2532,6 +2627,15 @@ + basic_machine=tic6x-unknown + os=-coff + ;; ++ # This must be matched before tile*. ++ tilegx*) ++ basic_machine=tilegx-unknown ++ os=-linux-gnu ++ ;; ++ tile*) ++ basic_machine=tile-unknown ++ os=-linux-gnu ++ ;; + tx39) + basic_machine=mipstx39-unknown + ;; @@ -2607,6 +2711,10 @@ + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none @@ -2645,7 +2753,7 @@ + we32k) + basic_machine=we32k-att + ;; -+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -2695,6 +2803,9 @@ + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; @@ -2715,10 +2826,11 @@ + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -+ | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -2727,7 +2839,7 @@ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -+ | -chorusos* | -chorusrdb* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -2737,7 +2849,7 @@ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) @@ -2867,6 +2979,11 @@ + -zvmoe) + os=-zvmoe + ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -nacl*) ++ ;; + -none) + ;; + *) @@ -2932,6 +3049,9 @@ + m68*-cisco) + os=-aout + ;; ++ mep-*) ++ os=-elf ++ ;; + mips*-cisco) + os=-elf + ;; @@ -3061,7 +3181,7 @@ + -sunos*) + vendor=sun + ;; -+ -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) @@ -3165,33 +3285,13 @@ ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ ACLOCAL = @ACLOCAL@ ADNSLIBS = @ADNSLIBS@ ---- gnupg2-2.0.14.orig/configure -+++ gnupg2-2.0.14/configure -@@ -746,6 +746,7 @@ GNUPG_PINENTRY_PGM - GNUPG_AGENT_PGM_FALSE - GNUPG_AGENT_PGM_TRUE - GNUPG_AGENT_PGM -+pkgdatadir - PACKAGE_GT - EGREP - GREP -@@ -4803,6 +4804,9 @@ fi - - - -+# Override for Debian packaging. -+pkgdatadir="\$(datadir)/gnupg2" -+ - - cat >>confdefs.h <<_ACEOF - #define PACKAGE "$PACKAGE" --- /dev/null +++ gnupg2-2.0.14/version @@ -0,0 +1 @@ +2.0.14-1 ---- gnupg2-2.0.14.orig/kbx/Makefile.in -+++ gnupg2-2.0.14/kbx/Makefile.in -@@ -34,7 +34,6 @@ +--- gnupg2-2.0.14.orig/gl/Makefile.in ++++ gnupg2-2.0.14/gl/Makefile.in +@@ -27,7 +27,6 @@ VPATH = @srcdir@ @@ -3199,7 +3299,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -114,6 +113,7 @@ DIST_SOURCES = $(libkeybox_a_SOURCES) $( +@@ -94,6 +93,7 @@ HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -3225,17 +3325,89 @@ ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ ACLOCAL = @ACLOCAL@ ADNSLIBS = @ADNSLIBS@ ---- gnupg2-2.0.14.orig/gl/Makefile.in -+++ gnupg2-2.0.14/gl/Makefile.in -@@ -27,7 +27,6 @@ +--- gnupg2-2.0.14.orig/doc/gnupg.texi ++++ gnupg2-2.0.14/doc/gnupg.texi +@@ -1,6 +1,6 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename gnupg.info ++@setfilename gnupg2.info + @include version.texi + @settitle Using the GNU Privacy Guard +@@ -48,8 +48,8 @@ section entitled ``Copying''. + + @dircategory GNU Utilities + @direntry +-* gpg2: (gnupg). OpenPGP encryption and signing tool. +-* gpgsm: (gnupg). S/MIME encryption and signing tool. ++* gpg2: (gnupg2). OpenPGP encryption and signing tool. ++* gpgsm: (gnupg2). S/MIME encryption and signing tool. + @end direntry + + +--- gnupg2-2.0.14.orig/doc/Makefile.in ++++ gnupg2-2.0.14/doc/Makefile.in +@@ -32,7 +32,6 @@ + # along with this program; if not, see . VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -94,6 +93,7 @@ HEADERS = $(noinst_HEADERS) +@@ -84,7 +83,7 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + SOURCES = + DIST_SOURCES = +-INFO_DEPS = $(srcdir)/gnupg.info ++INFO_DEPS = $(srcdir)/gnupg2.info + TEXINFO_TEX = $(top_srcdir)/scripts/texinfo.tex + am__TEXINFO_TEX_DIR = $(top_srcdir)/scripts + DVIS = gnupg.dvi +@@ -114,6 +113,7 @@ dist_pkgdataDATA_INSTALL = $(INSTALL_DAT + nobase_dist_docDATA_INSTALL = $(install_sh_DATA) + DATA = $(dist_html_DATA) $(dist_pkgdata_DATA) $(nobase_dist_doc_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++pkgdatadir = @pkgdatadir@ + ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ + ACLOCAL = @ACLOCAL@ + ADNSLIBS = @ADNSLIBS@ +@@ -444,10 +444,10 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $( + rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ + exit 1; \ + fi +-$(srcdir)/gnupg.info: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) +-gnupg.dvi: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) +-gnupg.pdf: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) +-gnupg.html: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) ++$(srcdir)/gnupg2.info: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) ++gnupg2.dvi: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) ++gnupg2.pdf: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) ++gnupg2.html: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) + $(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-vti + $(srcdir)/stamp-vti: gnupg.texi $(top_srcdir)/configure + @(dir=.; test -f ./gnupg.texi || dir=$(srcdir); \ +@@ -547,7 +547,7 @@ dist-info: $(INFO_DEPS) + mostlyclean-aminfo: + -rm -rf gnupg.aux gnupg.cp gnupg.cps gnupg.fn gnupg.ky gnupg.log gnupg.op \ + gnupg.ops gnupg.pg gnupg.tmp gnupg.toc gnupg.tp gnupg.vr \ +- gnupg.dvi gnupg.pdf gnupg.ps gnupg.html ++ gnupg2.dvi gnupg2.pdf gnupg2.ps gnupg2.html + + maintainer-clean-aminfo: + @list='$(INFO_DEPS)'; for i in $$list; do \ +--- gnupg2-2.0.14.orig/kbx/Makefile.in ++++ gnupg2-2.0.14/kbx/Makefile.in +@@ -34,7 +34,6 @@ + + + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +@@ -114,6 +113,7 @@ DIST_SOURCES = $(libkeybox_a_SOURCES) $( ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -3243,9 +3415,9 @@ ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ ACLOCAL = @ACLOCAL@ ADNSLIBS = @ADNSLIBS@ ---- gnupg2-2.0.14.orig/keyserver/Makefile.in -+++ gnupg2-2.0.14/keyserver/Makefile.in -@@ -53,7 +53,6 @@ +--- gnupg2-2.0.14.orig/jnlib/Makefile.in ++++ gnupg2-2.0.14/jnlib/Makefile.in +@@ -35,7 +35,6 @@ VPATH = @srcdir@ @@ -3253,7 +3425,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -193,6 +192,7 @@ DIST_SOURCES = $(am__gpg2keys_curl_SOURC +@@ -123,6 +122,7 @@ DIST_SOURCES = $(am__libjnlib_a_SOURCES_ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -3261,17 +3433,17 @@ ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ ACLOCAL = @ACLOCAL@ ADNSLIBS = @ADNSLIBS@ ---- gnupg2-2.0.14.orig/agent/Makefile.in -+++ gnupg2-2.0.14/agent/Makefile.in -@@ -50,7 +50,6 @@ - # along with this program; if not, see . +--- gnupg2-2.0.14.orig/common/Makefile.in ++++ gnupg2-2.0.14/common/Makefile.in +@@ -52,7 +52,6 @@ + VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -171,6 +170,7 @@ DIST_SOURCES = $(gpg_agent_SOURCES) $(gp +@@ -265,6 +264,7 @@ DIST_SOURCES = $(am__libcommon_a_SOURCES ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -3279,9 +3451,9 @@ ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ ACLOCAL = @ACLOCAL@ ADNSLIBS = @ADNSLIBS@ ---- gnupg2-2.0.14.orig/g10/Makefile.in -+++ gnupg2-2.0.14/g10/Makefile.in -@@ -51,7 +51,6 @@ +--- gnupg2-2.0.14.orig/tests/Makefile.in ++++ gnupg2-2.0.14/tests/Makefile.in +@@ -33,7 +33,6 @@ # along with this program; if not, see . VPATH = @srcdir@ @@ -3289,25 +3461,25 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -190,6 +189,7 @@ DIST_SOURCES = $(am__gpg2_SOURCES_DIST) - ETAGS = etags +@@ -108,6 +107,7 @@ ETAGS = etags CTAGS = ctags + DIST_SUBDIRS = openpgp . pkits DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ ACLOCAL = @ACLOCAL@ ADNSLIBS = @ADNSLIBS@ ---- gnupg2-2.0.14.orig/include/Makefile.in -+++ gnupg2-2.0.14/include/Makefile.in -@@ -14,7 +14,6 @@ - - @SET_MAKE@ +--- gnupg2-2.0.14.orig/tests/openpgp/Makefile.in ++++ gnupg2-2.0.14/tests/openpgp/Makefile.in +@@ -32,7 +32,6 @@ + # along with this program; if not, see . + # Process this file with automake to create Makefile.in VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -64,6 +63,7 @@ CONFIG_CLEAN_FILES = +@@ -82,6 +81,7 @@ CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -3315,27 +3487,27 @@ ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ ACLOCAL = @ACLOCAL@ ADNSLIBS = @ADNSLIBS@ ---- gnupg2-2.0.14.orig/common/Makefile.in -+++ gnupg2-2.0.14/common/Makefile.in -@@ -52,7 +52,6 @@ - - +--- gnupg2-2.0.14.orig/tests/pkits/Makefile.in ++++ gnupg2-2.0.14/tests/pkits/Makefile.in +@@ -32,7 +32,6 @@ + # You should have received a copy of the GNU General Public License + # along with this program; if not, see . VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -265,6 +264,7 @@ DIST_SOURCES = $(am__libcommon_a_SOURCES - ETAGS = etags - CTAGS = ctags +@@ -83,6 +82,7 @@ CONFIG_CLEAN_FILES = + SOURCES = + DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ ACLOCAL = @ACLOCAL@ ADNSLIBS = @ADNSLIBS@ ---- gnupg2-2.0.14.orig/jnlib/Makefile.in -+++ gnupg2-2.0.14/jnlib/Makefile.in -@@ -35,7 +35,6 @@ +--- gnupg2-2.0.14.orig/tools/Makefile.in ++++ gnupg2-2.0.14/tools/Makefile.in +@@ -52,7 +52,6 @@ VPATH = @srcdir@ @@ -3343,7 +3515,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -123,6 +122,7 @@ DIST_SOURCES = $(am__libjnlib_a_SOURCES_ +@@ -211,6 +210,7 @@ DIST_SOURCES = clean-sat.c $(am__gpg_che ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -3369,30 +3541,9 @@ ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ ACLOCAL = @ACLOCAL@ ADNSLIBS = @ADNSLIBS@ ---- gnupg2-2.0.14.orig/doc/gnupg.texi -+++ gnupg2-2.0.14/doc/gnupg.texi -@@ -1,6 +1,6 @@ - \input texinfo @c -*-texinfo-*- - @c %**start of header --@setfilename gnupg.info -+@setfilename gnupg2.info - @include version.texi - @settitle Using the GNU Privacy Guard - -@@ -48,8 +48,8 @@ section entitled ``Copying''. - - @dircategory GNU Utilities - @direntry --* gpg2: (gnupg). OpenPGP encryption and signing tool. --* gpgsm: (gnupg). S/MIME encryption and signing tool. -+* gpg2: (gnupg2). OpenPGP encryption and signing tool. -+* gpgsm: (gnupg2). S/MIME encryption and signing tool. - @end direntry - - ---- gnupg2-2.0.14.orig/doc/Makefile.in -+++ gnupg2-2.0.14/doc/Makefile.in -@@ -32,7 +32,6 @@ +--- gnupg2-2.0.14.orig/agent/Makefile.in ++++ gnupg2-2.0.14/agent/Makefile.in +@@ -50,7 +50,6 @@ # along with this program; if not, see . VPATH = @srcdir@ @@ -3400,58 +3551,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -84,7 +83,7 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - SOURCES = - DIST_SOURCES = --INFO_DEPS = $(srcdir)/gnupg.info -+INFO_DEPS = $(srcdir)/gnupg2.info - TEXINFO_TEX = $(top_srcdir)/scripts/texinfo.tex - am__TEXINFO_TEX_DIR = $(top_srcdir)/scripts - DVIS = gnupg.dvi -@@ -114,6 +113,7 @@ dist_pkgdataDATA_INSTALL = $(INSTALL_DAT - nobase_dist_docDATA_INSTALL = $(install_sh_DATA) - DATA = $(dist_html_DATA) $(dist_pkgdata_DATA) $(nobase_dist_doc_DATA) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+pkgdatadir = @pkgdatadir@ - ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ - ACLOCAL = @ACLOCAL@ - ADNSLIBS = @ADNSLIBS@ -@@ -444,10 +444,10 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $( - rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ - exit 1; \ - fi --$(srcdir)/gnupg.info: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) --gnupg.dvi: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) --gnupg.pdf: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) --gnupg.html: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) -+$(srcdir)/gnupg2.info: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) -+gnupg2.dvi: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) -+gnupg2.pdf: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) -+gnupg2.html: gnupg.texi $(srcdir)/version.texi $(gnupg_TEXINFOS) - $(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-vti - $(srcdir)/stamp-vti: gnupg.texi $(top_srcdir)/configure - @(dir=.; test -f ./gnupg.texi || dir=$(srcdir); \ -@@ -547,7 +547,7 @@ dist-info: $(INFO_DEPS) - mostlyclean-aminfo: - -rm -rf gnupg.aux gnupg.cp gnupg.cps gnupg.fn gnupg.ky gnupg.log gnupg.op \ - gnupg.ops gnupg.pg gnupg.tmp gnupg.toc gnupg.tp gnupg.vr \ -- gnupg.dvi gnupg.pdf gnupg.ps gnupg.html -+ gnupg2.dvi gnupg2.pdf gnupg2.ps gnupg2.html - - maintainer-clean-aminfo: - @list='$(INFO_DEPS)'; for i in $$list; do \ ---- gnupg2-2.0.14.orig/tools/Makefile.in -+++ gnupg2-2.0.14/tools/Makefile.in -@@ -52,7 +52,6 @@ - - - VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -211,6 +210,7 @@ DIST_SOURCES = clean-sat.c $(am__gpg_che +@@ -171,6 +170,7 @@ DIST_SOURCES = $(gpg_agent_SOURCES) $(gp ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -3459,55 +3559,55 @@ ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ ACLOCAL = @ACLOCAL@ ADNSLIBS = @ADNSLIBS@ ---- gnupg2-2.0.14.orig/tests/Makefile.in -+++ gnupg2-2.0.14/tests/Makefile.in -@@ -33,7 +33,6 @@ - # along with this program; if not, see . +--- gnupg2-2.0.14.orig/include/Makefile.in ++++ gnupg2-2.0.14/include/Makefile.in +@@ -14,7 +14,6 @@ + @SET_MAKE@ VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -108,6 +107,7 @@ ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = openpgp . pkits +@@ -64,6 +63,7 @@ CONFIG_CLEAN_FILES = + SOURCES = + DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ ACLOCAL = @ACLOCAL@ ADNSLIBS = @ADNSLIBS@ ---- gnupg2-2.0.14.orig/tests/openpgp/Makefile.in -+++ gnupg2-2.0.14/tests/openpgp/Makefile.in -@@ -32,7 +32,6 @@ +--- gnupg2-2.0.14.orig/g10/Makefile.in ++++ gnupg2-2.0.14/g10/Makefile.in +@@ -51,7 +51,6 @@ # along with this program; if not, see . - # Process this file with automake to create Makefile.in + VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -82,6 +81,7 @@ CONFIG_CLEAN_FILES = - SOURCES = - DIST_SOURCES = +@@ -190,6 +189,7 @@ DIST_SOURCES = $(am__gpg2_SOURCES_DIST) + ETAGS = etags + CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ ACLOCAL = @ACLOCAL@ ADNSLIBS = @ADNSLIBS@ ---- gnupg2-2.0.14.orig/tests/pkits/Makefile.in -+++ gnupg2-2.0.14/tests/pkits/Makefile.in -@@ -32,7 +32,6 @@ - # You should have received a copy of the GNU General Public License - # along with this program; if not, see . +--- gnupg2-2.0.14.orig/keyserver/Makefile.in ++++ gnupg2-2.0.14/keyserver/Makefile.in +@@ -53,7 +53,6 @@ + + VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -83,6 +82,7 @@ CONFIG_CLEAN_FILES = - SOURCES = - DIST_SOURCES = +@@ -193,6 +192,7 @@ DIST_SOURCES = $(am__gpg2keys_curl_SOURC + ETAGS = etags + CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ diff -Nru gnupg2-2.0.14/debian/patches/debian-changes-2.0.14-1ubuntu1 gnupg2-2.0.14/debian/patches/debian-changes-2.0.14-1ubuntu1 --- gnupg2-2.0.14/debian/patches/debian-changes-2.0.14-1ubuntu1 2010-02-03 19:03:39.000000000 +0100 +++ gnupg2-2.0.14/debian/patches/debian-changes-2.0.14-1ubuntu1 1970-01-01 01:00:00.000000000 +0100 @@ -1,690 +0,0 @@ ---- gnupg2-2.0.14.orig/config.guess -+++ gnupg2-2.0.14/config.guess -@@ -1,10 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, --# Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -+# Free Software Foundation, Inc. - --timestamp='2006-07-02' -+timestamp='2009-06-10' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -56,8 +56,8 @@ version="\ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -169,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep __ELF__ >/dev/null -+ | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? -@@ -323,14 +324,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; -+ s390x:SunOS:*:*) -+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; -- i86pc:SunOS:5.*:*) -- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) -+ eval $set_cc_for_build -+ SUN_ARCH="i386" -+ # If there is a compiler, see if it is configured for 64-bit objects. -+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. -+ # This test works for both compilers. -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ SUN_ARCH="x86_64" -+ fi -+ fi -+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize -@@ -531,7 +548,7 @@ EOF - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[45]) -+ *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -639,7 +656,7 @@ EOF - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -- grep __LP64__ >/dev/null -+ grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else -@@ -780,7 +797,7 @@ EOF - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -- i*:MINGW*:*) -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) -@@ -790,15 +807,24 @@ EOF - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; -- x86:Interix*:[3456]*) -- echo i586-pc-interix${UNAME_RELEASE} -- exit ;; -- EM64T:Interix*:[3456]*) -- echo x86_64-unknown-interix${UNAME_RELEASE} -- exit ;; -+ *:Interix*:[3456]*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ EM64T | authenticamd | genuineintel) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; -+ 8664:Windows_NT:*) -+ echo x86_64-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we -@@ -829,7 +855,14 @@ EOF - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -852,40 +885,17 @@ EOF - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -- mips:Linux:*:*) -+ mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU -- #undef mips -- #undef mipsel -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mipsel -+ CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips -- #else -- CPU= -- #endif -- #endif --EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -- /^CPU/{ -- s: ::g -- p -- }'`" -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -- ;; -- mips64:Linux:*:*) -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #undef CPU -- #undef mips64 -- #undef mips64el -- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mips64el -- #else -- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips64 -+ CPU=${UNAME_MACHINE} - #else - CPU= - #endif -@@ -917,10 +927,13 @@ EOF - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac -- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -+ objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; -+ padre:Linux:*:*) -+ echo sparc-unknown-linux-gnu -+ exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -@@ -950,6 +963,9 @@ EOF - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent -@@ -965,17 +981,6 @@ EOF - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; -- a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit ;; -- coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit ;; -- "") -- # Either a pre-BFD a.out linker (linux-gnuoldld) or -- # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build -@@ -1041,7 +1046,7 @@ EOF - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) -@@ -1085,8 +1090,11 @@ EOF - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i386. -- echo i386-pc-msdosdjgpp -+ # the processor, so we play safe by assuming i586. -+ # Note: whatever this is, it MUST be the same as what config.sub -+ # prints for the "djgpp" host, or else GDB configury will decide that -+ # this is a cross-build. -+ echo i586-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 -@@ -1124,6 +1132,16 @@ EOF - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; -+ NCR*:*:4.2:* | MPRAS*:*:4.2:*) -+ OS_REL='.3' -+ test -r /etc/.relid \ -+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; -@@ -1136,7 +1154,7 @@ EOF - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; -- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) -@@ -1199,6 +1217,9 @@ EOF - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; -+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1208,6 +1229,15 @@ EOF - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; -@@ -1298,6 +1328,9 @@ EOF - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; -+ i*86:AROS:*:*) -+ echo ${UNAME_MACHINE}-pc-aros -+ exit ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -@@ -1458,9 +1491,9 @@ This script, last modified $timestamp, h - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - and -- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be ---- gnupg2-2.0.14.orig/config.sub -+++ gnupg2-2.0.14/config.sub -@@ -1,10 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, --# Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -+# Free Software Foundation, Inc. - --timestamp='2006-09-20' -+timestamp='2009-06-11' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -72,8 +72,8 @@ Report bugs and patches to