Initial commit
[kopensolaris-gnu/patches.git] / gnupg-1.4.9.diff
1 diff -uraN gnupg-1.4.9.orig/debian/control gnupg-1.4.9/debian/control
2 --- gnupg-1.4.9.orig/debian/control     2008-09-28 02:44:54.000000000 -0400
3 +++ gnupg-1.4.9/debian/control  2008-09-28 02:45:36.566481178 -0400
4 @@ -7,7 +7,7 @@
5   Thijs Kinkhorst <thijs@debian.org>
6  Standards-Version: 3.8.0
7  Build-Depends: libz-dev, libldap2-dev, libbz2-dev,
8 - libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
9 + libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !kopensolaris-i386 !kopensolaris-amd64],
10   libusb-dev [!hurd-i386],
11   libreadline5-dev, file, gettext, dpatch, dpkg-dev (>= 1.13.12)
12  Homepage: http://www.gnupg.org
13 diff -uraN gnupg-1.4.9.orig/debian/patches/00list gnupg-1.4.9/debian/patches/00list
14 --- gnupg-1.4.9.orig/debian/patches/00list      2008-09-28 02:44:54.000000000 -0400
15 +++ gnupg-1.4.9/debian/patches/00list   2008-09-28 02:45:36.566790698 -0400
16 @@ -4,4 +4,5 @@
17  25_de.po_fixes
18  25_it.po_fixes
19  25_fr.po_fixes
20 +30_kopensolaris-gnu
21  99_yat2m_fix_samp_handling
22 diff -uraN gnupg-1.4.9.orig/debian/patches/30_kopensolaris-gnu.dpatch gnupg-1.4.9/debian/patches/30_kopensolaris-gnu.dpatch
23 --- gnupg-1.4.9.orig/debian/patches/30_kopensolaris-gnu.dpatch  1969-12-31 19:00:00.000000000 -0500
24 +++ gnupg-1.4.9/debian/patches/30_kopensolaris-gnu.dpatch       2008-09-28 02:47:56.263386361 -0400
25 @@ -0,0 +1,304 @@
26 +#! /bin/sh /usr/share/dpatch/dpatch-run
27 +## 30_kopensolaris-gnu.dpatch by  <root@maltodextrin.csclub.uwaterloo.ca>
28 +##
29 +## All lines beginning with `## DP:' are a description of the patch.
30 +## DP: No description.
31 +
32 +@DPATCH@
33 +diff -urNad gnupg-1.4.9~/configure gnupg-1.4.9/configure
34 +--- gnupg-1.4.9~/configure     2008-03-26 13:30:49.000000000 -0400
35 ++++ gnupg-1.4.9/configure      2008-09-28 02:45:45.897798567 -0400
36 +@@ -11613,7 +11613,7 @@
37 +                 if test "X$additional_includedir" = "X/usr/local/include"; then
38 +                   if test -n "$GCC"; then
39 +                     case $host_os in
40 +-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
41 ++                      linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
42 +                     esac
43 +                   fi
44 +                 fi
45 +@@ -11657,7 +11657,7 @@
46 +                       if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
47 +                         if test -n "$GCC"; then
48 +                           case $host_os in
49 +-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
50 ++                            linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
51 +                           esac
52 +                         fi
53 +                       fi
54 +@@ -12155,7 +12155,7 @@
55 +                 if test "X$additional_includedir" = "X/usr/local/include"; then
56 +                   if test -n "$GCC"; then
57 +                     case $host_os in
58 +-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
59 ++                      linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
60 +                     esac
61 +                   fi
62 +                 fi
63 +@@ -12199,7 +12199,7 @@
64 +                       if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
65 +                         if test -n "$GCC"; then
66 +                           case $host_os in
67 +-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
68 ++                            linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
69 +                           esac
70 +                         fi
71 +                       fi
72 +@@ -15895,7 +15895,7 @@
73 +                 if test "X$additional_includedir" = "X/usr/local/include"; then
74 +                   if test -n "$GCC"; then
75 +                     case $host_os in
76 +-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
77 ++                      linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
78 +                     esac
79 +                   fi
80 +                 fi
81 +@@ -15939,7 +15939,7 @@
82 +                       if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
83 +                         if test -n "$GCC"; then
84 +                           case $host_os in
85 +-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
86 ++                            linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
87 +                           esac
88 +                         fi
89 +                       fi
90 +diff -urNad gnupg-1.4.9~/m4/lib-link.m4 gnupg-1.4.9/m4/lib-link.m4
91 +--- gnupg-1.4.9~/m4/lib-link.m4        2007-10-23 05:25:02.000000000 -0400
92 ++++ gnupg-1.4.9/m4/lib-link.m4 2008-09-28 02:45:45.898800630 -0400
93 +@@ -367,7 +367,7 @@
94 +                 if test "X$additional_includedir" = "X/usr/local/include"; then
95 +                   if test -n "$GCC"; then
96 +                     case $host_os in
97 +-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
98 ++                      linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
99 +                     esac
100 +                   fi
101 +                 fi
102 +@@ -416,7 +416,7 @@
103 +                       if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
104 +                         if test -n "$GCC"; then
105 +                           case $host_os in
106 +-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
107 ++                            linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
108 +                           esac
109 +                         fi
110 +                       fi
111 +diff -urNad gnupg-1.4.9~/m4/lib-prefix.m4 gnupg-1.4.9/m4/lib-prefix.m4
112 +--- gnupg-1.4.9~/m4/lib-prefix.m4      2007-10-23 05:25:02.000000000 -0400
113 ++++ gnupg-1.4.9/m4/lib-prefix.m4       2008-09-28 02:45:45.899095071 -0400
114 +@@ -70,7 +70,7 @@
115 +         if test "X$additional_includedir" = "X/usr/local/include"; then
116 +           if test -n "$GCC"; then
117 +             case $host_os in
118 +-              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
119 ++              linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
120 +             esac
121 +           fi
122 +         fi
123 +diff -urNad gnupg-1.4.9~/mpi/config.links gnupg-1.4.9/mpi/config.links
124 +--- gnupg-1.4.9~/mpi/config.links      2008-03-25 06:15:47.000000000 -0400
125 ++++ gnupg-1.4.9/mpi/config.links       2008-09-28 02:45:45.899453882 -0400
126 +@@ -43,6 +43,7 @@
127 +     i[3467]86*-*-freebsd[3-9]* | \
128 +     i[3467]86*-*-freebsdelf*   | \
129 +     i[3467]86*-*-netbsd*       | \
130 ++    i[3467]86*-*-k*opensolaris* | \
131 +     i[3467]86*-*-k*bsd*)
132 +        echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
133 +        cat  $srcdir/mpi/i386/syntax.h    >>./mpi/asm-syntax.h
134 +@@ -53,6 +54,7 @@
135 +     i586*-*-freebsd[3-9]*  | \
136 +     i586*-*-freebsdelf*    | \
137 +     i586*-*-netbsd*      | \
138 ++    i586*-*-kopensolaris*  | \
139 +     i586*-*-k*bsd*       | \
140 +     pentium-*-netbsd*    | \
141 +     pentiumpro-*-netbsd*)
142 +diff -urNad gnupg-1.4.9~/scripts/config.guess gnupg-1.4.9/scripts/config.guess
143 +--- gnupg-1.4.9~/scripts/config.guess  2007-12-12 13:08:01.000000000 -0500
144 ++++ gnupg-1.4.9/scripts/config.guess   2008-09-28 02:47:54.755982360 -0400
145 +@@ -1,10 +1,10 @@
146 + #! /bin/sh
147 + # Attempt to guess a canonical system name.
148 + #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
149 +-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
150 +-#   Inc.
151 ++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
152 ++#   Free Software Foundation, Inc.
153
154 +-timestamp='2007-11-19'
155 ++timestamp='2008-01-23'
156
157 + # This file is free software; you can redistribute it and/or modify it
158 + # under the terms of the GNU General Public License as published by
159 +@@ -56,8 +56,8 @@
160 + GNU config.guess ($timestamp)
161
162 + Originally written by Per Bothner.
163 +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
164 +-Free Software Foundation, Inc.
165 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
166 ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
167
168 + This is free software; see the source for copying conditions.  There is NO
169 + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
170 +@@ -532,7 +532,7 @@
171 +               echo rs6000-ibm-aix3.2
172 +       fi
173 +       exit ;;
174 +-    *:AIX:*:[45])
175 ++    *:AIX:*:[456])
176 +       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
177 +       if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
178 +               IBM_ARCH=rs6000
179 +@@ -799,6 +799,9 @@
180 +           EM64T | authenticamd)
181 +               echo x86_64-unknown-interix${UNAME_RELEASE}
182 +               exit ;;
183 ++          IA64)
184 ++              echo ia64-unknown-interix${UNAME_RELEASE}
185 ++              exit ;;
186 +       esac ;;
187 +     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
188 +       echo i${UNAME_MACHINE}-pc-mks
189 +@@ -825,6 +828,10 @@
190 +       # the GNU system
191 +       echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
192 +       exit ;;
193 ++    *:GNU/kOpenSolaris:*:*)
194 ++      # like linux, we don't need to record the version number
195 ++      echo ${UNAME_MACHINE}-unknown-kopensolaris-gnu
196 ++      exit ;;
197 +     *:GNU/*:*:*)
198 +       # other systems with GNU libc and userland
199 +       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
200 +@@ -833,7 +840,14 @@
201 +       echo ${UNAME_MACHINE}-pc-minix
202 +       exit ;;
203 +     arm*:Linux:*:*)
204 +-      echo ${UNAME_MACHINE}-unknown-linux-gnu
205 ++      eval $set_cc_for_build
206 ++      if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
207 ++          | grep -q __ARM_EABI__
208 ++      then
209 ++          echo ${UNAME_MACHINE}-unknown-linux-gnu
210 ++      else
211 ++          echo ${UNAME_MACHINE}-unknown-linux-gnueabi
212 ++      fi
213 +       exit ;;
214 +     avr32*:Linux:*:*)
215 +       echo ${UNAME_MACHINE}-unknown-linux-gnu
216 +@@ -1474,9 +1488,9 @@
217 + the operating system you are using. It is advised that you
218 + download the most up to date version of the config scripts from
219
220 +-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
221 ++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
222 + and
223 +-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
224 ++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
225
226 + If the version you run ($0) is already up to date, please
227 + send the following data and any information you think might be
228 +diff -urNad gnupg-1.4.9~/scripts/config.sub gnupg-1.4.9/scripts/config.sub
229 +--- gnupg-1.4.9~/scripts/config.sub    2007-12-12 13:08:04.000000000 -0500
230 ++++ gnupg-1.4.9/scripts/config.sub     2008-09-28 02:47:54.756158874 -0400
231 +@@ -1,10 +1,10 @@
232 + #! /bin/sh
233 + # Configuration validation subroutine script.
234 + #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
235 +-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
236 +-#   Inc.
237 ++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
238 ++#   Free Software Foundation, Inc.
239
240 +-timestamp='2007-11-19'
241 ++timestamp='2008-01-16'
242
243 + # This file is (in principle) common to ALL GNU software.
244 + # The presence of a machine in this file suggests that SOME GNU software
245 +@@ -72,8 +72,8 @@
246 + version="\
247 + GNU config.sub ($timestamp)
248
249 +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
250 +-Free Software Foundation, Inc.
251 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
252 ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
253
254 + This is free software; see the source for copying conditions.  There is NO
255 + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
256 +@@ -122,7 +122,7 @@
257 + case $maybe_os in
258 +   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
259 +   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
260 +-  storm-chaos* | os2-emx* | rtmk-nova*)
261 ++  storm-chaos* | os2-emx* | rtmk-nova* | kopensolaris*-gnu* )
262 +     os=-$maybe_os
263 +     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
264 +     ;;
265 +@@ -447,6 +447,14 @@
266 +               basic_machine=ns32k-sequent
267 +               os=-dynix
268 +               ;;
269 ++      blackfin)
270 ++              basic_machine=bfin-unknown
271 ++              os=-linux
272 ++              ;;
273 ++      blackfin-*)
274 ++              basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
275 ++              os=-linux
276 ++              ;;
277 +       c90)
278 +               basic_machine=c90-cray
279 +               os=-unicos
280 +@@ -672,6 +680,14 @@
281 +               basic_machine=m68k-isi
282 +               os=-sysv
283 +               ;;
284 ++      m68knommu)
285 ++              basic_machine=m68k-unknown
286 ++              os=-linux
287 ++              ;;
288 ++      m68knommu-*)
289 ++              basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
290 ++              os=-linux
291 ++              ;;
292 +       m88k-omron*)
293 +               basic_machine=m88k-omron
294 +               ;;
295 +@@ -817,6 +833,14 @@
296 +               basic_machine=i860-intel
297 +               os=-osf
298 +               ;;
299 ++      parisc)
300 ++              basic_machine=hppa-unknown
301 ++              os=-linux
302 ++              ;;
303 ++      parisc-*)
304 ++              basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
305 ++              os=-linux
306 ++              ;;
307 +       pbd)
308 +               basic_machine=sparc-tti
309 +               ;;
310 +@@ -1025,6 +1049,10 @@
311 +               basic_machine=tic6x-unknown
312 +               os=-coff
313 +               ;;
314 ++      tile*)
315 ++              basic_machine=tile-unknown
316 ++              os=-linux-gnu
317 ++              ;;
318 +       tx39)
319 +               basic_machine=mipstx39-unknown
320 +               ;;
321 +@@ -1230,7 +1258,7 @@
322 +             | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
323 +             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
324 +             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
325 +-            | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
326 ++            | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -kopensolaris*-gnu* )
327 +       # Remember, each alternative MUST END IN *, to match a version number.
328 +               ;;
329 +       -qnx*)