← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gnupg2/quantal-security

« back to all changes in this revision

Viewing changes to debian/patches/debian-changes-2.0.17-2ubuntu1

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-05-25 14:27:35 UTC
  • mfrom: (1.1.15 upstream) (7.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20110525142735-jccyw0fopnyv728q
Tags: 2.0.17-2ubuntu1
* Merge from debian unstable. Remaining changes:
  - Add udev rules to give gpg access to some smartcard readers;
    Debian #543217.
    . debian/gnupg2.dev: udev rules to set ACLs on SCM smartcard readers.
    . debian/rules: Call dh_installudev.
  - debian/control: Rename Vcs-* to XS-Debian-Vcs-*.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/debian-changes-2.0.17-2ubuntu1
 
1
Description: Upstream changes introduced in version 2.0.17-2ubuntu1
 
2
 This patch has been created by dpkg-source during the package build.
 
3
 Here's the last changelog entry, hopefully it gives details on why
 
4
 those changes were made:
 
5
 .
 
6
 gnupg2 (2.0.17-2ubuntu1) oneiric; urgency=low
 
7
 .
 
8
   * Merge from debian unstable. Remaining changes:
 
9
     - Add udev rules to give gpg access to some smartcard readers;
 
10
       Debian #543217.
 
11
       . debian/gnupg2.dev: udev rules to set ACLs on SCM smartcard readers.
 
12
       . debian/rules: Call dh_installudev.
 
13
     - debian/control: Rename Vcs-* to XS-Debian-Vcs-*.
 
14
 .
 
15
 The person named in the Author field signed this changelog entry.
 
16
Author: Marc Deslauriers <marc.deslauriers@ubuntu.com>
 
17
 
 
18
---
 
19
The information above should follow the Patch Tagging Guidelines, please
 
20
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
 
21
are templates for supplementary fields that you might want to add:
 
22
 
 
23
Origin: <vendor|upstream|other>, <url of original patch>
 
24
Bug: <url in upstream bugtracker>
 
25
Bug-Debian: http://bugs.debian.org/<bugnumber>
 
26
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
 
27
Forwarded: <no|not-needed|url proving that it has been forwarded>
 
28
Reviewed-By: <name and email of someone who approved the patch>
 
29
Last-Update: <YYYY-MM-DD>
 
30
 
 
31
--- gnupg2-2.0.17.orig/config.guess
 
32
+++ gnupg2-2.0.17/config.guess
 
33
@@ -1,10 +1,10 @@
 
34
 #! /bin/sh
 
35
 # Attempt to guess a canonical system name.
 
36
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 
37
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 
38
-#   Free Software Foundation, Inc.
 
39
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 
40
+#   2011 Free Software Foundation, Inc.
 
41
 
 
42
-timestamp='2009-12-30'
 
43
+timestamp='2011-05-11'
 
44
 
 
45
 # This file is free software; you can redistribute it and/or modify it
 
46
 # under the terms of the GNU General Public License as published by
 
47
@@ -57,7 +57,7 @@ GNU config.guess ($timestamp)
 
48
 
 
49
 Originally written by Per Bothner.
 
50
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
 
51
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
 
52
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 
53
 Software Foundation, Inc.
 
54
 
 
55
 This is free software; see the source for copying conditions.  There is NO
 
56
@@ -181,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 
57
                fi
 
58
                ;;
 
59
            *)
 
60
-               os=netbsd
 
61
+               os=netbsd
 
62
                ;;
 
63
        esac
 
64
        # The OS release
 
65
@@ -224,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 
66
                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 
67
                ;;
 
68
        *5.*)
 
69
-               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 
70
+               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 
71
                ;;
 
72
        esac
 
73
        # According to Compaq, /usr/sbin/psrinfo has been available on
 
74
@@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 
75
        # A Xn.n version is an unreleased experimental baselevel.
 
76
        # 1.2 uses "1.2" for uname -r.
 
77
        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 
78
-       exit ;;
 
79
+       # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 
80
+       exitcode=$?
 
81
+       trap '' 0
 
82
+       exit $exitcode ;;
 
83
     Alpha\ *:Windows_NT*:*)
 
84
        # How do we know it's Interix rather than the generic POSIX subsystem?
 
85
        # Should we change UNAME_MACHINE based on the output of uname instead
 
86
@@ -296,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 
87
        echo s390-ibm-zvmoe
 
88
        exit ;;
 
89
     *:OS400:*:*)
 
90
-        echo powerpc-ibm-os400
 
91
+       echo powerpc-ibm-os400
 
92
        exit ;;
 
93
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 
94
        echo arm-acorn-riscix${UNAME_RELEASE}
 
95
@@ -395,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 
96
     # MiNT.  But MiNT is downward compatible to TOS, so this should
 
97
     # be no problem.
 
98
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
 
99
-        echo m68k-atari-mint${UNAME_RELEASE}
 
100
+       echo m68k-atari-mint${UNAME_RELEASE}
 
101
        exit ;;
 
102
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 
103
        echo m68k-atari-mint${UNAME_RELEASE}
 
104
-        exit ;;
 
105
+       exit ;;
 
106
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
 
107
-        echo m68k-atari-mint${UNAME_RELEASE}
 
108
+       echo m68k-atari-mint${UNAME_RELEASE}
 
109
        exit ;;
 
110
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
 
111
-        echo m68k-milan-mint${UNAME_RELEASE}
 
112
-        exit ;;
 
113
+       echo m68k-milan-mint${UNAME_RELEASE}
 
114
+       exit ;;
 
115
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
 
116
-        echo m68k-hades-mint${UNAME_RELEASE}
 
117
-        exit ;;
 
118
+       echo m68k-hades-mint${UNAME_RELEASE}
 
119
+       exit ;;
 
120
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
 
121
-        echo m68k-unknown-mint${UNAME_RELEASE}
 
122
-        exit ;;
 
123
+       echo m68k-unknown-mint${UNAME_RELEASE}
 
124
+       exit ;;
 
125
     m68k:machten:*:*)
 
126
        echo m68k-apple-machten${UNAME_RELEASE}
 
127
        exit ;;
 
128
@@ -481,8 +484,8 @@ EOF
 
129
        echo m88k-motorola-sysv3
 
130
        exit ;;
 
131
     AViiON:dgux:*:*)
 
132
-        # DG/UX returns AViiON for all architectures
 
133
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
 
134
+       # DG/UX returns AViiON for all architectures
 
135
+       UNAME_PROCESSOR=`/usr/bin/uname -p`
 
136
        if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 
137
        then
 
138
            if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
 
139
@@ -495,7 +498,7 @@ EOF
 
140
        else
 
141
            echo i586-dg-dgux${UNAME_RELEASE}
 
142
        fi
 
143
-       exit ;;
 
144
+       exit ;;
 
145
     M88*:DolphinOS:*:*)        # DolphinOS (SVR3)
 
146
        echo m88k-dolphin-sysv3
 
147
        exit ;;
 
148
@@ -552,7 +555,7 @@ EOF
 
149
                echo rs6000-ibm-aix3.2
 
150
        fi
 
151
        exit ;;
 
152
-    *:AIX:*:[456])
 
153
+    *:AIX:*:[4567])
 
154
        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 
155
        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 
156
                IBM_ARCH=rs6000
 
157
@@ -595,52 +598,52 @@ EOF
 
158
            9000/[678][0-9][0-9])
 
159
                if [ -x /usr/bin/getconf ]; then
 
160
                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 
161
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 
162
-                    case "${sc_cpu_version}" in
 
163
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
 
164
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
 
165
-                      532)                      # CPU_PA_RISC2_0
 
166
-                        case "${sc_kernel_bits}" in
 
167
-                          32) HP_ARCH="hppa2.0n" ;;
 
168
-                          64) HP_ARCH="hppa2.0w" ;;
 
169
+                   sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 
170
+                   case "${sc_cpu_version}" in
 
171
+                     523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
 
172
+                     528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
 
173
+                     532)                      # CPU_PA_RISC2_0
 
174
+                       case "${sc_kernel_bits}" in
 
175
+                         32) HP_ARCH="hppa2.0n" ;;
 
176
+                         64) HP_ARCH="hppa2.0w" ;;
 
177
                          '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
 
178
-                        esac ;;
 
179
-                    esac
 
180
+                       esac ;;
 
181
+                   esac
 
182
                fi
 
183
                if [ "${HP_ARCH}" = "" ]; then
 
184
                    eval $set_cc_for_build
 
185
-                   sed 's/^              //' << EOF >$dummy.c
 
186
+                   sed 's/^            //' << EOF >$dummy.c
 
187
+
 
188
+               #define _HPUX_SOURCE
 
189
+               #include <stdlib.h>
 
190
+               #include <unistd.h>
 
191
 
 
192
-              #define _HPUX_SOURCE
 
193
-              #include <stdlib.h>
 
194
-              #include <unistd.h>
 
195
-
 
196
-              int main ()
 
197
-              {
 
198
-              #if defined(_SC_KERNEL_BITS)
 
199
-                  long bits = sysconf(_SC_KERNEL_BITS);
 
200
-              #endif
 
201
-                  long cpu  = sysconf (_SC_CPU_VERSION);
 
202
-
 
203
-                  switch (cpu)
 
204
-               {
 
205
-               case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
 
206
-               case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
 
207
-               case CPU_PA_RISC2_0:
 
208
-              #if defined(_SC_KERNEL_BITS)
 
209
-                   switch (bits)
 
210
-                       {
 
211
-                       case 64: puts ("hppa2.0w"); break;
 
212
-                       case 32: puts ("hppa2.0n"); break;
 
213
-                       default: puts ("hppa2.0"); break;
 
214
-                       } break;
 
215
-              #else  /* !defined(_SC_KERNEL_BITS) */
 
216
-                   puts ("hppa2.0"); break;
 
217
-              #endif
 
218
-               default: puts ("hppa1.0"); break;
 
219
-               }
 
220
-                  exit (0);
 
221
-              }
 
222
+               int main ()
 
223
+               {
 
224
+               #if defined(_SC_KERNEL_BITS)
 
225
+                   long bits = sysconf(_SC_KERNEL_BITS);
 
226
+               #endif
 
227
+                   long cpu  = sysconf (_SC_CPU_VERSION);
 
228
+
 
229
+                   switch (cpu)
 
230
+                       {
 
231
+                       case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
 
232
+                       case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
 
233
+                       case CPU_PA_RISC2_0:
 
234
+               #if defined(_SC_KERNEL_BITS)
 
235
+                           switch (bits)
 
236
+                               {
 
237
+                               case 64: puts ("hppa2.0w"); break;
 
238
+                               case 32: puts ("hppa2.0n"); break;
 
239
+                               default: puts ("hppa2.0"); break;
 
240
+                               } break;
 
241
+               #else  /* !defined(_SC_KERNEL_BITS) */
 
242
+                           puts ("hppa2.0"); break;
 
243
+               #endif
 
244
+                       default: puts ("hppa1.0"); break;
 
245
+                       }
 
246
+                   exit (0);
 
247
+               }
 
248
 EOF
 
249
                    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 
250
                    test -z "$HP_ARCH" && HP_ARCH=hppa
 
251
@@ -731,22 +734,22 @@ EOF
 
252
        exit ;;
 
253
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 
254
        echo c1-convex-bsd
 
255
-        exit ;;
 
256
+       exit ;;
 
257
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 
258
        if getsysinfo -f scalar_acc
 
259
        then echo c32-convex-bsd
 
260
        else echo c2-convex-bsd
 
261
        fi
 
262
-        exit ;;
 
263
+       exit ;;
 
264
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 
265
        echo c34-convex-bsd
 
266
-        exit ;;
 
267
+       exit ;;
 
268
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 
269
        echo c38-convex-bsd
 
270
-        exit ;;
 
271
+       exit ;;
 
272
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 
273
        echo c4-convex-bsd
 
274
-        exit ;;
 
275
+       exit ;;
 
276
     CRAY*Y-MP:*:*:*)
 
277
        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 
278
        exit ;;
 
279
@@ -770,14 +773,14 @@ EOF
 
280
        exit ;;
 
281
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 
282
        FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 
283
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 
284
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 
285
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 
286
-        exit ;;
 
287
+       FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 
288
+       FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 
289
+       echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 
290
+       exit ;;
 
291
     5000:UNIX_System_V:4.*:*)
 
292
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 
293
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
 
294
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 
295
+       FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 
296
+       FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
 
297
+       echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 
298
        exit ;;
 
299
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 
300
        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 
301
@@ -805,14 +808,14 @@ EOF
 
302
        echo ${UNAME_MACHINE}-pc-mingw32
 
303
        exit ;;
 
304
     i*:windows32*:*)
 
305
-       # uname -m includes "-pc" on this system.
 
306
-       echo ${UNAME_MACHINE}-mingw32
 
307
+       # uname -m includes "-pc" on this system.
 
308
+       echo ${UNAME_MACHINE}-mingw32
 
309
        exit ;;
 
310
     i*:PW*:*)
 
311
        echo ${UNAME_MACHINE}-pc-pw32
 
312
        exit ;;
 
313
     *:Interix*:*)
 
314
-       case ${UNAME_MACHINE} in
 
315
+       case ${UNAME_MACHINE} in
 
316
            x86)
 
317
                echo i586-pc-interix${UNAME_RELEASE}
 
318
                exit ;;
 
319
@@ -867,7 +870,7 @@ EOF
 
320
          EV6)   UNAME_MACHINE=alphaev6 ;;
 
321
          EV67)  UNAME_MACHINE=alphaev67 ;;
 
322
          EV68*) UNAME_MACHINE=alphaev68 ;;
 
323
-        esac
 
324
+       esac
 
325
        objdump --private-headers /bin/sh | grep -q ld.so.1
 
326
        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 
327
        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 
328
@@ -879,7 +882,13 @@ EOF
 
329
        then
 
330
            echo ${UNAME_MACHINE}-unknown-linux-gnu
 
331
        else
 
332
-           echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 
333
+           if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 
334
+               | grep -q __ARM_PCS_VFP
 
335
+           then
 
336
+               echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 
337
+           else
 
338
+               echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
 
339
+           fi
 
340
        fi
 
341
        exit ;;
 
342
     avr32*:Linux:*:*)
 
343
@@ -892,7 +901,7 @@ EOF
 
344
        echo crisv32-axis-linux-gnu
 
345
        exit ;;
 
346
     frv:Linux:*:*)
 
347
-       echo frv-unknown-linux-gnu
 
348
+       echo frv-unknown-linux-gnu
 
349
        exit ;;
 
350
     i*86:Linux:*:*)
 
351
        LIBC=gnu
 
352
@@ -960,7 +969,7 @@ EOF
 
353
        echo ${UNAME_MACHINE}-ibm-linux
 
354
        exit ;;
 
355
     sh64*:Linux:*:*)
 
356
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
 
357
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
 
358
        exit ;;
 
359
     sh*:Linux:*:*)
 
360
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
361
@@ -968,6 +977,9 @@ EOF
 
362
     sparc:Linux:*:* | sparc64:Linux:*:*)
 
363
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
364
        exit ;;
 
365
+    tile*:Linux:*:*)
 
366
+       echo ${UNAME_MACHINE}-tilera-linux-gnu
 
367
+       exit ;;
 
368
     vax:Linux:*:*)
 
369
        echo ${UNAME_MACHINE}-dec-linux-gnu
 
370
        exit ;;
 
371
@@ -975,7 +987,7 @@ EOF
 
372
        echo x86_64-unknown-linux-gnu
 
373
        exit ;;
 
374
     xtensa*:Linux:*:*)
 
375
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
 
376
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
 
377
        exit ;;
 
378
     i*86:DYNIX/ptx:4*:*)
 
379
        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 
380
@@ -984,11 +996,11 @@ EOF
 
381
        echo i386-sequent-sysv4
 
382
        exit ;;
 
383
     i*86:UNIX_SV:4.2MP:2.*)
 
384
-        # Unixware is an offshoot of SVR4, but it has its own version
 
385
-        # number series starting with 2...
 
386
-        # I am not positive that other SVR4 systems won't match this,
 
387
+       # Unixware is an offshoot of SVR4, but it has its own version
 
388
+       # number series starting with 2...
 
389
+       # I am not positive that other SVR4 systems won't match this,
 
390
        # I just have to hope.  -- rms.
 
391
-        # Use sysv4.2uw... so that sysv4* matches it.
 
392
+       # Use sysv4.2uw... so that sysv4* matches it.
 
393
        echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 
394
        exit ;;
 
395
     i*86:OS/2:*:*)
 
396
@@ -1020,7 +1032,7 @@ EOF
 
397
        fi
 
398
        exit ;;
 
399
     i*86:*:5:[678]*)
 
400
-       # UnixWare 7.x, OpenUNIX and OpenServer 6.
 
401
+       # UnixWare 7.x, OpenUNIX and OpenServer 6.
 
402
        case `/bin/uname -X | grep "^Machine"` in
 
403
            *486*)           UNAME_MACHINE=i486 ;;
 
404
            *Pentium)        UNAME_MACHINE=i586 ;;
 
405
@@ -1048,13 +1060,13 @@ EOF
 
406
        exit ;;
 
407
     pc:*:*:*)
 
408
        # Left here for compatibility:
 
409
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
 
410
-        # the processor, so we play safe by assuming i586.
 
411
+       # uname -m prints for DJGPP always 'pc', but it prints nothing about
 
412
+       # the processor, so we play safe by assuming i586.
 
413
        # Note: whatever this is, it MUST be the same as what config.sub
 
414
        # prints for the "djgpp" host, or else GDB configury will decide that
 
415
        # this is a cross-build.
 
416
        echo i586-pc-msdosdjgpp
 
417
-        exit ;;
 
418
+       exit ;;
 
419
     Intel:Mach:3*:*)
 
420
        echo i386-pc-mach3
 
421
        exit ;;
 
422
@@ -1089,8 +1101,8 @@ EOF
 
423
        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 
424
          && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
 
425
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
 
426
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 
427
-          && { echo i486-ncr-sysv4; exit; } ;;
 
428
+       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 
429
+         && { echo i486-ncr-sysv4; exit; } ;;
 
430
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 
431
        OS_REL='.3'
 
432
        test -r /etc/.relid \
 
433
@@ -1133,10 +1145,10 @@ EOF
 
434
                echo ns32k-sni-sysv
 
435
        fi
 
436
        exit ;;
 
437
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 
438
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
 
439
-        echo i586-unisys-sysv4
 
440
-        exit ;;
 
441
+    PENTIUM:*:4.0*:*)  # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 
442
+                       # says <Richard.M.Bartel@ccMail.Census.GOV>
 
443
+       echo i586-unisys-sysv4
 
444
+       exit ;;
 
445
     *:UNIX_System_V:4*:FTX*)
 
446
        # From Gerald Hewes <hewes@openmarket.com>.
 
447
        # How about differentiating between stratus architectures? -djm
 
448
@@ -1162,11 +1174,11 @@ EOF
 
449
        exit ;;
 
450
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 
451
        if [ -d /usr/nec ]; then
 
452
-               echo mips-nec-sysv${UNAME_RELEASE}
 
453
+               echo mips-nec-sysv${UNAME_RELEASE}
 
454
        else
 
455
-               echo mips-unknown-sysv${UNAME_RELEASE}
 
456
+               echo mips-unknown-sysv${UNAME_RELEASE}
 
457
        fi
 
458
-        exit ;;
 
459
+       exit ;;
 
460
     BeBox:BeOS:*:*)    # BeOS running on hardware made by Be, PPC only.
 
461
        echo powerpc-be-beos
 
462
        exit ;;
 
463
@@ -1231,6 +1243,9 @@ EOF
 
464
     *:QNX:*:4*)
 
465
        echo i386-pc-qnx
 
466
        exit ;;
 
467
+    NEO-?:NONSTOP_KERNEL:*:*)
 
468
+       echo neo-tandem-nsk${UNAME_RELEASE}
 
469
+       exit ;;
 
470
     NSE-?:NONSTOP_KERNEL:*:*)
 
471
        echo nse-tandem-nsk${UNAME_RELEASE}
 
472
        exit ;;
 
473
@@ -1276,13 +1291,13 @@ EOF
 
474
        echo pdp10-unknown-its
 
475
        exit ;;
 
476
     SEI:*:*:SEIUX)
 
477
-        echo mips-sei-seiux${UNAME_RELEASE}
 
478
+       echo mips-sei-seiux${UNAME_RELEASE}
 
479
        exit ;;
 
480
     *:DragonFly:*:*)
 
481
        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 
482
        exit ;;
 
483
     *:*VMS:*:*)
 
484
-       UNAME_MACHINE=`(uname -p) 2>/dev/null`
 
485
+       UNAME_MACHINE=`(uname -p) 2>/dev/null`
 
486
        case "${UNAME_MACHINE}" in
 
487
            A*) echo alpha-dec-vms ; exit ;;
 
488
            I*) echo ia64-dec-vms ; exit ;;
 
489
@@ -1322,11 +1337,11 @@ main ()
 
490
 #include <sys/param.h>
 
491
   printf ("m68k-sony-newsos%s\n",
 
492
 #ifdef NEWSOS4
 
493
-          "4"
 
494
+       "4"
 
495
 #else
 
496
-         ""
 
497
+       ""
 
498
 #endif
 
499
-         ); exit (0);
 
500
+       ); exit (0);
 
501
 #endif
 
502
 #endif
 
503
 
 
504
--- gnupg2-2.0.17.orig/config.sub
 
505
+++ gnupg2-2.0.17/config.sub
 
506
@@ -1,10 +1,10 @@
 
507
 #! /bin/sh
 
508
 # Configuration validation subroutine script.
 
509
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 
510
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 
511
-#   Free Software Foundation, Inc.
 
512
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 
513
+#   2011 Free Software Foundation, Inc.
 
514
 
 
515
-timestamp='2010-01-22'
 
516
+timestamp='2011-03-23'
 
517
 
 
518
 # This file is (in principle) common to ALL GNU software.
 
519
 # The presence of a machine in this file suggests that SOME GNU software
 
520
@@ -76,7 +76,7 @@ version="\
 
521
 GNU config.sub ($timestamp)
 
522
 
 
523
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
 
524
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
 
525
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 
526
 Software Foundation, Inc.
 
527
 
 
528
 This is free software; see the source for copying conditions.  There is NO
 
529
@@ -124,8 +124,9 @@ esac
 
530
 # Here we must recognize all the valid KERNEL-OS combinations.
 
531
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 
532
 case $maybe_os in
 
533
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
 
534
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
 
535
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
 
536
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
 
537
+  knetbsd*-gnu* | netbsd*-gnu* | \
 
538
   kopensolaris*-gnu* | \
 
539
   storm-chaos* | os2-emx* | rtmk-nova*)
 
540
     os=-$maybe_os
 
541
@@ -157,8 +158,8 @@ case $os in
 
542
                os=
 
543
                basic_machine=$1
 
544
                ;;
 
545
-        -bluegene*)
 
546
-               os=-cnk
 
547
+       -bluegene*)
 
548
+               os=-cnk
 
549
                ;;
 
550
        -sim | -cisco | -oki | -wec | -winbond)
 
551
                os=
 
552
@@ -174,10 +175,10 @@ case $os in
 
553
                os=-chorusos
 
554
                basic_machine=$1
 
555
                ;;
 
556
-       -chorusrdb)
 
557
-               os=-chorusrdb
 
558
+       -chorusrdb)
 
559
+               os=-chorusrdb
 
560
                basic_machine=$1
 
561
-               ;;
 
562
+               ;;
 
563
        -hiux*)
 
564
                os=-hiuxwe2
 
565
                ;;
 
566
@@ -282,11 +283,13 @@ case $basic_machine in
 
567
        | moxie \
 
568
        | mt \
 
569
        | msp430 \
 
570
+       | nds32 | nds32le | nds32be \
 
571
        | nios | nios2 \
 
572
        | ns16k | ns32k \
 
573
+       | open8 \
 
574
        | or32 \
 
575
        | pdp10 | pdp11 | pj | pjl \
 
576
-       | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 
577
+       | powerpc | powerpc64 | powerpc64le | powerpcle \
 
578
        | pyramid \
 
579
        | rx \
 
580
        | score \
 
581
@@ -294,15 +297,24 @@ case $basic_machine in
 
582
        | sh64 | sh64le \
 
583
        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 
584
        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 
585
-       | spu | strongarm \
 
586
-       | tahoe | thumb | tic4x | tic80 | tron \
 
587
+       | spu \
 
588
+       | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 
589
        | ubicom32 \
 
590
        | v850 | v850e \
 
591
        | we32k \
 
592
-       | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 
593
+       | x86 | xc16x | xstormy16 | xtensa \
 
594
        | z8k | z80)
 
595
                basic_machine=$basic_machine-unknown
 
596
                ;;
 
597
+       c54x)
 
598
+               basic_machine=tic54x-unknown
 
599
+               ;;
 
600
+       c55x)
 
601
+               basic_machine=tic55x-unknown
 
602
+               ;;
 
603
+       c6x)
 
604
+               basic_machine=tic6x-unknown
 
605
+               ;;
 
606
        m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 
607
                # Motorola 68HC11/12.
 
608
                basic_machine=$basic_machine-unknown
 
609
@@ -314,6 +326,18 @@ case $basic_machine in
 
610
                basic_machine=mt-unknown
 
611
                ;;
 
612
 
 
613
+       strongarm | thumb | xscale)
 
614
+               basic_machine=arm-unknown
 
615
+               ;;
 
616
+
 
617
+       xscaleeb)
 
618
+               basic_machine=armeb-unknown
 
619
+               ;;
 
620
+
 
621
+       xscaleel)
 
622
+               basic_machine=armel-unknown
 
623
+               ;;
 
624
+
 
625
        # We use `pc' rather than `unknown'
 
626
        # because (1) that's what they normally are, and
 
627
        # (2) the word "unknown" tends to confuse beginning users.
 
628
@@ -334,7 +358,7 @@ case $basic_machine in
 
629
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 
630
        | avr-* | avr32-* \
 
631
        | bfin-* | bs2000-* \
 
632
-       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 
633
+       | c[123]* | c30-* | [cjt]90-* | c4x-* \
 
634
        | clipper-* | craynv-* | cydra-* \
 
635
        | d10v-* | d30v-* | dlx-* \
 
636
        | elxsi-* \
 
637
@@ -368,26 +392,28 @@ case $basic_machine in
 
638
        | mmix-* \
 
639
        | mt-* \
 
640
        | msp430-* \
 
641
+       | nds32-* | nds32le-* | nds32be-* \
 
642
        | nios-* | nios2-* \
 
643
        | none-* | np1-* | ns16k-* | ns32k-* \
 
644
+       | open8-* \
 
645
        | orion-* \
 
646
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 
647
-       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 
648
+       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 
649
        | pyramid-* \
 
650
        | romp-* | rs6000-* | rx-* \
 
651
        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 
652
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 
653
        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 
654
        | sparclite-* \
 
655
-       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 
656
-       | tahoe-* | thumb-* \
 
657
+       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 
658
+       | tahoe-* \
 
659
        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 
660
        | tile-* | tilegx-* \
 
661
        | tron-* \
 
662
        | ubicom32-* \
 
663
        | v850-* | v850e-* | vax-* \
 
664
        | we32k-* \
 
665
-       | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 
666
+       | x86-* | x86_64-* | xc16x-* | xps100-* \
 
667
        | xstormy16-* | xtensa*-* \
 
668
        | ymp-* \
 
669
        | z8k-* | z80-*)
 
670
@@ -412,7 +438,7 @@ case $basic_machine in
 
671
                basic_machine=a29k-amd
 
672
                os=-udi
 
673
                ;;
 
674
-       abacus)
 
675
+       abacus)
 
676
                basic_machine=abacus-unknown
 
677
                ;;
 
678
        adobe68k)
 
679
@@ -482,11 +508,20 @@ case $basic_machine in
 
680
                basic_machine=powerpc-ibm
 
681
                os=-cnk
 
682
                ;;
 
683
+       c54x-*)
 
684
+               basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
 
685
+               ;;
 
686
+       c55x-*)
 
687
+               basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
 
688
+               ;;
 
689
+       c6x-*)
 
690
+               basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
 
691
+               ;;
 
692
        c90)
 
693
                basic_machine=c90-cray
 
694
                os=-unicos
 
695
                ;;
 
696
-        cegcc)
 
697
+       cegcc)
 
698
                basic_machine=arm-unknown
 
699
                os=-cegcc
 
700
                ;;
 
701
@@ -518,7 +553,7 @@ case $basic_machine in
 
702
                basic_machine=craynv-cray
 
703
                os=-unicosmp
 
704
                ;;
 
705
-       cr16)
 
706
+       cr16 | cr16-*)
 
707
                basic_machine=cr16-unknown
 
708
                os=-elf
 
709
                ;;
 
710
@@ -734,7 +769,7 @@ case $basic_machine in
 
711
                basic_machine=ns32k-utek
 
712
                os=-sysv
 
713
                ;;
 
714
-        microblaze)
 
715
+       microblaze)
 
716
                basic_machine=microblaze-xilinx
 
717
                ;;
 
718
        mingw32)
 
719
@@ -841,6 +876,12 @@ case $basic_machine in
 
720
        np1)
 
721
                basic_machine=np1-gould
 
722
                ;;
 
723
+       neo-tandem)
 
724
+               basic_machine=neo-tandem
 
725
+               ;;
 
726
+       nse-tandem)
 
727
+               basic_machine=nse-tandem
 
728
+               ;;
 
729
        nsr-tandem)
 
730
                basic_machine=nsr-tandem
 
731
                ;;
 
732
@@ -923,9 +964,10 @@ case $basic_machine in
 
733
                ;;
 
734
        power)  basic_machine=power-ibm
 
735
                ;;
 
736
-       ppc)    basic_machine=powerpc-unknown
 
737
+       ppc | ppcbe)    basic_machine=powerpc-unknown
 
738
                ;;
 
739
-       ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 
740
+       ppc-* | ppcbe-*)
 
741
+               basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 
742
                ;;
 
743
        ppcle | powerpclittle | ppc-le | powerpc-little)
 
744
                basic_machine=powerpcle-unknown
 
745
@@ -1019,6 +1061,9 @@ case $basic_machine in
 
746
                basic_machine=i860-stratus
 
747
                os=-sysv4
 
748
                ;;
 
749
+       strongarm-* | thumb-*)
 
750
+               basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
 
751
+               ;;
 
752
        sun2)
 
753
                basic_machine=m68000-sun
 
754
                ;;
 
755
@@ -1075,20 +1120,8 @@ case $basic_machine in
 
756
                basic_machine=t90-cray
 
757
                os=-unicos
 
758
                ;;
 
759
-       tic54x | c54x*)
 
760
-               basic_machine=tic54x-unknown
 
761
-               os=-coff
 
762
-               ;;
 
763
-       tic55x | c55x*)
 
764
-               basic_machine=tic55x-unknown
 
765
-               os=-coff
 
766
-               ;;
 
767
-       tic6x | c6x*)
 
768
-               basic_machine=tic6x-unknown
 
769
-               os=-coff
 
770
-               ;;
 
771
-        # This must be matched before tile*.
 
772
-        tilegx*)
 
773
+       # This must be matched before tile*.
 
774
+       tilegx*)
 
775
                basic_machine=tilegx-unknown
 
776
                os=-linux-gnu
 
777
                ;;
 
778
@@ -1163,6 +1196,9 @@ case $basic_machine in
 
779
        xps | xps100)
 
780
                basic_machine=xps100-honeywell
 
781
                ;;
 
782
+       xscale-* | xscalee[bl]-*)
 
783
+               basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
 
784
+               ;;
 
785
        ymp)
 
786
                basic_machine=ymp-cray
 
787
                os=-unicos
 
788
@@ -1260,11 +1296,11 @@ esac
 
789
 if [ x"$os" != x"" ]
 
790
 then
 
791
 case $os in
 
792
-        # First match some system type aliases
 
793
-        # that might get confused with valid system types.
 
794
+       # First match some system type aliases
 
795
+       # that might get confused with valid system types.
 
796
        # -solaris* is a basic system type, with this one exception.
 
797
-        -auroraux)
 
798
-               os=-auroraux
 
799
+       -auroraux)
 
800
+               os=-auroraux
 
801
                ;;
 
802
        -solaris1 | -solaris1.*)
 
803
                os=`echo $os | sed -e 's|solaris1|sunos4|'`
 
804
@@ -1301,7 +1337,8 @@ case $os in
 
805
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 
806
              | -chorusos* | -chorusrdb* | -cegcc* \
 
807
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 
808
-             | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 
809
+             | -mingw32* | -linux-gnu* | -linux-android* \
 
810
+             | -linux-newlib* | -linux-uclibc* \
 
811
              | -uxpv* | -beos* | -mpeix* | -udk* \
 
812
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 
813
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 
814
@@ -1348,7 +1385,7 @@ case $os in
 
815
        -opened*)
 
816
                os=-openedition
 
817
                ;;
 
818
-        -os400*)
 
819
+       -os400*)
 
820
                os=-os400
 
821
                ;;
 
822
        -wince*)
 
823
@@ -1397,7 +1434,7 @@ case $os in
 
824
        -sinix*)
 
825
                os=-sysv4
 
826
                ;;
 
827
-        -tpf*)
 
828
+       -tpf*)
 
829
                os=-tpf
 
830
                ;;
 
831
        -triton*)
 
832
@@ -1442,8 +1479,8 @@ case $os in
 
833
        -dicos*)
 
834
                os=-dicos
 
835
                ;;
 
836
-        -nacl*)
 
837
-               ;;
 
838
+       -nacl*)
 
839
+               ;;
 
840
        -none)
 
841
                ;;
 
842
        *)
 
843
@@ -1466,10 +1503,10 @@ else
 
844
 # system, and we'll never get to this point.
 
845
 
 
846
 case $basic_machine in
 
847
-        score-*)
 
848
+       score-*)
 
849
                os=-elf
 
850
                ;;
 
851
-        spu-*)
 
852
+       spu-*)
 
853
                os=-elf
 
854
                ;;
 
855
        *-acorn)
 
856
@@ -1481,8 +1518,17 @@ case $basic_machine in
 
857
        arm*-semi)
 
858
                os=-aout
 
859
                ;;
 
860
-        c4x-* | tic4x-*)
 
861
-               os=-coff
 
862
+       c4x-* | tic4x-*)
 
863
+               os=-coff
 
864
+               ;;
 
865
+       tic54x-*)
 
866
+               os=-coff
 
867
+               ;;
 
868
+       tic55x-*)
 
869
+               os=-coff
 
870
+               ;;
 
871
+       tic6x-*)
 
872
+               os=-coff
 
873
                ;;
 
874
        # This must come before the *-dec entry.
 
875
        pdp10-*)
 
876
@@ -1509,7 +1555,7 @@ case $basic_machine in
 
877
        m68*-cisco)
 
878
                os=-aout
 
879
                ;;
 
880
-        mep-*)
 
881
+       mep-*)
 
882
                os=-elf
 
883
                ;;
 
884
        mips*-cisco)
 
885
@@ -1536,7 +1582,7 @@ case $basic_machine in
 
886
        *-ibm)
 
887
                os=-aix
 
888
                ;;
 
889
-       *-knuth)
 
890
+       *-knuth)
 
891
                os=-mmixware
 
892
                ;;
 
893
        *-wec)