openpkg/openssl.patch@127559aa0c5e
openpkg/openssl.patch
Wed, 01 Aug 2012 23:24:50 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 01 Aug 2012 23:24:50 +0200
- changeset 431
- 127559aa0c5e
- parent 13
- cb59d6afeb61
- child 432
- aa0488214e35
- permissions
- -rw-r--r--
Renumber patch hunks to avoid almost all patch(1) warnings.
1 Index: Configure
2 --- Configure.orig 2012-03-14 23:20:40.000000000 +0100
3 +++ Configure 2012-06-27 10:10:05.000000000 +0200
4 @@ -6,7 +6,6 @@
5 ##
7 require 5.000;
8 -use strict;
10 # see INSTALL for instructions.
12 @@ -34,6 +33,7 @@
13 # (Default: KRB5_DIR/include)
14 # --with-krb5-flavor Declare what flavor of Kerberos 5 is used. Currently
15 # supported values are "MIT" and "Heimdal". A value is required.
16 +# --with-cc compiler to use for $CC (useful if cc is a disguised gcc)
17 #
18 # --test-sanity Make a number of sanity checks on the data in this file.
19 # This is a debugging tool for OpenSSL developers.
20 @@ -123,6 +123,7 @@
21 #$bits2="THIRTY_TWO_BIT ";
22 my $bits1="THIRTY_TWO_BIT ";
23 my $bits2="SIXTY_FOUR_BIT ";
24 +my $ccarg;
26 my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o x86-gf2m.o:des-586.o crypt586.o:aes-586.o vpaes-x86.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o:cmll-x86.o:ghash-x86.o:";
28 @@ -460,12 +461,12 @@
30 #### IBM's AIX.
31 "aix3-cc", "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
32 -"aix-gcc", "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X32",
33 -"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
34 +"aix-gcc", "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
35 +"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
36 # Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
37 # at build time. $OBJECT_MODE is respected at ./config stage!
38 -"aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
39 -"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",
40 +"aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
41 +"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
43 #
44 # Cray T90 and similar (SDSC)
45 @@ -828,6 +829,10 @@
46 {
47 $strict_warnings = 1;
48 }
49 + elsif (/^--with-cc=(.*)$/)
50 + {
51 + $ccarg=$1
52 + }
53 elsif (/^reconfigure/ || /^reconf/)
54 {
55 if (open(IN,"<$Makefile"))
56 @@ -1143,7 +1148,7 @@
57 print "IsMK1MF=$IsMK1MF\n";
59 my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
60 -my $cc = $fields[$idx_cc];
61 +my $cc = $ccarg ? $ccarg : $fields[$idx_cc];
62 # Allow environment CC to override compiler...
63 if($ENV{CC}) {
64 $cc = $ENV{CC};
65 Index: config
66 --- config.orig 2011-11-14 22:12:53.000000000 +0100
67 +++ config 2012-06-27 10:10:05.000000000 +0200
68 @@ -277,6 +277,9 @@
69 Power*)
70 echo "ppc-apple-darwin${VERSION}"
71 ;;
72 + x86_64 )
73 + echo "x86_64-apple-darwin${VERSION}"
74 + ;;
75 *)
76 echo "i686-apple-darwin${VERSION}"
77 ;;
78 @@ -413,7 +416,7 @@
80 # Only set CC if not supplied already
81 if [ -z "$CROSS_COMPILE$CC" ]; then
82 - GCCVER=`sh -c "gcc -dumpversion" 2>/dev/null`
83 + GCCVER=`sh -c "${CC-gcc} -dumpversion" 2>/dev/null`
84 if [ "$GCCVER" != "" ]; then
85 # then strip off whatever prefix egcs prepends the number with...
86 # Hopefully, this will work for any future prefixes as well.
87 @@ -424,8 +427,14 @@
88 # peak single digit before and after first dot, e.g. 2.95.1 gives 29
89 GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
90 CC=gcc
91 + SUFFIX=gcc
92 else
93 CC=cc
94 + SUFFIX=cc
95 + fi
96 +else
97 + if [ "$GCCVER" != "" ]; then
98 + SUFFIX=gcc
99 fi
100 fi
101 GCCVER=${GCCVER:-0}
102 @@ -435,7 +444,7 @@
103 if [ $GCCVER -ge 30 ]; then
104 # PA64 support only came in with gcc 3.0.x.
105 # We check if the preprocessor symbol __LP64__ is defined...
106 - if echo "__LP64__" | gcc -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
107 + if echo "__LP64__" | $CC -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
108 : # __LP64__ has slipped through, it therefore is not defined
109 else
110 GCC_BITS="64"
111 @@ -446,13 +455,14 @@
112 if [ $GCCVER -ge 30 ]; then
113 # 64-bit ABI isn't officially supported in gcc 3.0, but it appears
114 # to be working, at the very least 'make test' passes...
115 - if gcc -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then
116 + if $CC -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then
117 GCC_ARCH="-m64"
118 else
119 GCC_ARCH="-m32"
120 fi
121 fi
122 # check for WorkShop C, expected output is "cc: blah-blah C x.x"
123 + if [ $GCCVER -eq 0 ]; then
124 CCVER=`(cc -V 2>&1) 2>/dev/null | \
125 egrep -e '^cc: .* C [0-9]\.[0-9]' | \
126 sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
127 @@ -465,6 +475,7 @@
128 sleep 5
129 fi
130 fi
131 + fi
132 fi
134 if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
135 @@ -482,6 +493,7 @@
137 if [ "${SYSTEM}" = "AIX" ]; then # favor vendor cc over gcc
138 (cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc
139 + (gcc) 2>&1 | grep -iv "not found" > /dev/null && CC=gcc
140 fi
142 CCVER=${CCVER:-0}
143 @@ -507,7 +519,7 @@
144 if [ $CPU -ge 4000 ]; then
145 options="$options -mips2"
146 fi
147 - OUT="irix-$CC"
148 + OUT="irix-$SUFFIX"
149 ;;
150 mips3-sgi-irix)
151 #CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
152 @@ -517,11 +529,11 @@
153 #else
154 # options="$options -mips3"
155 #fi
156 - OUT="irix-mips3-$CC"
157 + OUT="irix-mips3-$SUFFIX"
158 ;;
159 mips4-sgi-irix64)
160 echo "WARNING! If you wish to build 64-bit library, then you have to"
161 - echo " invoke './Configure irix64-mips4-$CC' *manually*."
162 + echo " invoke './Configure irix64-mips4-$SUFFIX' *manually*."
163 if [ "$TEST" = "false" -a -t 1 ]; then
164 echo " You have about 5 seconds to press Ctrl-C to abort."
165 (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
166 @@ -533,7 +545,7 @@
167 #else
168 # options="$options -mips3"
169 #fi
170 - OUT="irix-mips3-$CC"
171 + OUT="irix-mips3-$SUFFIX"
172 ;;
173 ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
174 ppc-apple-darwin*)
175 @@ -566,6 +578,9 @@
176 else
177 OUT="darwin-i386-cc"
178 fi ;;
179 + x86_64-apple-darwin*)
180 + OUT="darwin64-x86_64-cc"
181 + ;;
182 armv6+7-*-iphoneos)
183 options="$options -arch%20armv6 -arch%20armv7"
184 OUT="iphoneos-cross" ;;
185 @@ -575,10 +590,10 @@
186 alpha-*-linux2)
187 ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
188 case ${ISA:-generic} in
189 - *[678]) OUT="linux-alpha+bwx-$CC" ;;
190 - *) OUT="linux-alpha-$CC" ;;
191 + *[678]) OUT="linux-alpha+bwx-$SUFFIX" ;;
192 + *) OUT="linux-alpha-$SUFFIX" ;;
193 esac
194 - if [ "$CC" = "gcc" ]; then
195 + if [ $GCCVER -gt 0 ]; then
196 case ${ISA:-generic} in
197 EV5|EV45) options="$options -mcpu=ev5";;
198 EV56|PCA56) options="$options -mcpu=ev56";;
199 @@ -662,7 +677,7 @@
200 ;;
201 x86_64-*-linux?) OUT="linux-x86_64" ;;
202 *86-*-linux2) OUT="linux-elf"
203 - if [ "$GCCVER" -gt 28 ]; then
204 + if [ $GCCVER -gt 28 ]; then
205 if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
206 options="$options -march=pentium"
207 fi
208 @@ -676,17 +691,17 @@
209 *-*-linux1) OUT="linux-aout" ;;
210 *-*-linux2) OUT="linux-generic32" ;;
211 sun4[uv]*-*-solaris2)
212 - OUT="solaris-sparcv9-$CC"
213 + OUT="solaris-sparcv9-$SUFFIX"
214 ISA64=`(isalist) 2>/dev/null | grep sparcv9`
215 if [ "$ISA64" != "" -a "$KERNEL_BITS" = "" ]; then
216 - if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then
217 + if [ $GCCVER -eq 0 -a $CCVER -ge 50 ]; then
218 echo "WARNING! If you wish to build 64-bit library, then you have to"
219 echo " invoke './Configure solaris64-sparcv9-cc' *manually*."
220 if [ "$TEST" = "false" -a -t 1 ]; then
221 echo " You have about 5 seconds to press Ctrl-C to abort."
222 (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
223 fi
224 - elif [ "$CC" = "gcc" -a "$GCC_ARCH" = "-m64" ]; then
225 + elif [ $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then
226 # $GCC_ARCH denotes default ABI chosen by compiler driver
227 # (first one found on the $PATH). I assume that user
228 # expects certain consistency with the rest of his builds
229 @@ -712,21 +727,21 @@
230 OUT="solaris64-sparcv9-$CC"
231 fi
232 ;;
233 - sun4m-*-solaris2) OUT="solaris-sparcv8-$CC" ;;
234 - sun4d-*-solaris2) OUT="solaris-sparcv8-$CC" ;;
235 - sun4*-*-solaris2) OUT="solaris-sparcv7-$CC" ;;
236 + sun4m-*-solaris2) OUT="solaris-sparcv8-$SUFFIX" ;;
237 + sun4d-*-solaris2) OUT="solaris-sparcv8-$SUFFIX" ;;
238 + sun4*-*-solaris2) OUT="solaris-sparcv7-$SUFFIX" ;;
239 *86*-*-solaris2)
240 ISA64=`(isalist) 2>/dev/null | grep amd64`
241 - if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 ]; then
242 - OUT="solaris64-x86_64-$CC"
243 + if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 -a $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then
244 + OUT="solaris64-x86_64-$SUFFIX"
245 else
246 - OUT="solaris-x86-$CC"
247 + OUT="solaris-x86-$SUFFIX"
248 if [ `uname -r | sed -e 's/5\.//'` -lt 10 ]; then
249 options="$options no-sse2"
250 fi
251 fi
252 ;;
253 - *-*-sunos4) OUT="sunos-$CC" ;;
254 + *-*-sunos4) OUT="sunos-$SUFFIX" ;;
256 *86*-*-bsdi4) OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
257 alpha*-*-*bsd*) OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;;
258 @@ -750,7 +765,7 @@
259 *-*-osf) OUT="osf1-alpha-cc" ;;
260 *-*-tru64) OUT="tru64-alpha-cc" ;;
261 *-*-[Uu]nix[Ww]are7)
262 - if [ "$CC" = "gcc" ]; then
263 + if [ $GCCVER -gt 0 ]; then
264 OUT="unixware-7-gcc" ; options="$options no-sse2"
265 else
266 OUT="unixware-7" ; options="$options no-sse2 -D__i386__"
267 @@ -761,12 +776,12 @@
268 *-*-vos)
269 options="$options no-threads no-shared no-asm no-dso"
270 EXE=".pm"
271 - OUT="vos-$CC" ;;
272 + OUT="vos-$SUFFIX" ;;
273 BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;
274 RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
275 *-siemens-sysv4) OUT="SINIX" ;;
276 *-hpux1*)
277 - if [ $CC = "gcc" -a $GCC_BITS = "64" ]; then
278 + if [ $GCCVER -gt 0 -a $GCC_BITS = "64" ]; then
279 OUT="hpux64-parisc2-gcc"
280 fi
281 [ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
282 @@ -781,8 +796,8 @@
283 OUT="hpux-ia64-cc"
284 fi
285 elif [ $CPU_VERSION -ge 532 ]; then # PA-RISC 2.x CPU
286 - OUT=${OUT:-"hpux-parisc2-${CC}"}
287 - if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
288 + OUT=${OUT:-"hpux-parisc2-${SUFFIX}"}
289 + if [ $KERNEL_BITS -eq 64 -a $GCCVER -eq 0 ]; then
290 echo "WARNING! If you wish to build 64-bit library then you have to"
291 echo " invoke './Configure hpux64-parisc2-cc' *manually*."
292 if [ "$TEST" = "false" -a -t 1 ]; then
293 @@ -791,9 +806,9 @@
294 fi
295 fi
296 elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU
297 - OUT="hpux-parisc-${CC}"
298 + OUT="hpux-parisc-${SUFFIX}"
299 elif [ $CPU_VERSION -ge 523 ]; then # PA-RISC 1.0 CPU
300 - OUT="hpux-parisc-${CC}"
301 + OUT="hpux-parisc-${SUFFIX}"
302 else # Motorola(?) CPU
303 OUT="hpux-$CC"
304 fi
305 @@ -803,7 +818,7 @@
306 [ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
307 KERNEL_BITS=${KERNEL_BITS:-32}
308 OBJECT_MODE=${OBJECT_MODE:-32}
309 - if [ "$CC" = "gcc" ]; then
310 + if [ $GCCVER -gt 0 ]; then
311 OUT="aix-gcc"
312 if [ $OBJECT_MODE -eq 64 ]; then
313 echo 'Your $OBJECT_MODE was found to be set to 64'
314 @@ -913,7 +928,7 @@
315 #fi
317 if [ -z "$OUT" ]; then
318 - OUT="$CC"
319 + OUT="$SUFFIX"
320 fi
322 if [ ".$PERL" = . ] ; then
323 @@ -945,9 +960,9 @@
324 # compiler for the platform ... in which case we add it on
325 # the end ... otherwise we leave it off
327 -$PERL ./Configure LIST | grep "$OUT-$CC" > /dev/null
328 +$PERL ./Configure LIST | grep "$OUT-$SUFFIX" > /dev/null
329 if [ $? = "0" ]; then
330 - OUT="$OUT-$CC"
331 + OUT="$OUT-$SUFFIX"
332 fi
334 OUT="$PREFIX$OUT"
335 @@ -957,9 +972,9 @@
336 echo Configuring for $OUT
338 if [ "$TEST" = "true" ]; then
339 - echo $PERL ./Configure $OUT $options
340 + echo $PERL ./Configure $OUT --with-cc=$CC $options
341 else
342 - $PERL ./Configure $OUT $options
343 + $PERL ./Configure $OUT --with-cc=$CC $options
344 fi
345 else
346 echo "This system ($OUT) is not supported. See file INSTALL for details."
347 Index: crypto/aes/asm/aesni-sha1-x86_64.pl
348 --- crypto/aes/asm/aesni-sha1-x86_64.pl.orig 2011-08-23 22:53:31.000000000 +0200
349 +++ crypto/aes/asm/aesni-sha1-x86_64.pl 2012-06-27 10:10:05.000000000 +0200
350 @@ -206,7 +206,7 @@
351 ___
353 my $aesenc=sub {
354 - use integer;
355 +
356 my ($n,$k)=($r/10,$r%10);
357 if ($k==0) {
358 $code.=<<___;
359 @@ -249,7 +249,7 @@
360 };
362 sub Xupdate_ssse3_16_31() # recall that $Xi starts wtih 4
363 -{ use integer;
364 +{
365 my $body = shift;
366 my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
367 my ($a,$b,$c,$d,$e);
368 @@ -330,7 +330,7 @@
369 }
371 sub Xupdate_ssse3_32_79()
372 -{ use integer;
373 +{
374 my $body = shift;
375 my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
376 my ($a,$b,$c,$d,$e);
377 @@ -397,7 +397,7 @@
378 }
380 sub Xuplast_ssse3_80()
381 -{ use integer;
382 +{
383 my $body = shift;
384 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
385 my ($a,$b,$c,$d,$e);
386 @@ -431,7 +431,7 @@
387 }
389 sub Xloop_ssse3()
390 -{ use integer;
391 +{
392 my $body = shift;
393 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
394 my ($a,$b,$c,$d,$e);
395 @@ -456,7 +456,7 @@
396 }
398 sub Xtail_ssse3()
399 -{ use integer;
400 +{
401 my $body = shift;
402 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
403 my ($a,$b,$c,$d,$e);
404 @@ -465,7 +465,7 @@
405 }
407 sub body_00_19 () {
408 - use integer;
409 +
410 my ($k,$n);
411 my @r=(
412 '($a,$b,$c,$d,$e)=@V;'.
413 @@ -488,7 +488,7 @@
414 }
416 sub body_20_39 () {
417 - use integer;
418 +
419 my ($k,$n);
420 my @r=(
421 '($a,$b,$c,$d,$e)=@V;'.
422 @@ -509,7 +509,7 @@
423 }
425 sub body_40_59 () {
426 - use integer;
427 +
428 my ($k,$n);
429 my @r=(
430 '($a,$b,$c,$d,$e)=@V;'.
431 @@ -723,7 +723,7 @@
432 ___
434 my $aesenc=sub {
435 - use integer;
436 +
437 my ($n,$k)=($r/10,$r%10);
438 if ($k==0) {
439 $code.=<<___;
440 @@ -766,7 +766,7 @@
441 };
443 sub Xupdate_avx_16_31() # recall that $Xi starts wtih 4
444 -{ use integer;
445 +{
446 my $body = shift;
447 my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
448 my ($a,$b,$c,$d,$e);
449 @@ -842,7 +842,7 @@
450 }
452 sub Xupdate_avx_32_79()
453 -{ use integer;
454 +{
455 my $body = shift;
456 my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
457 my ($a,$b,$c,$d,$e);
458 @@ -907,7 +907,7 @@
459 }
461 sub Xuplast_avx_80()
462 -{ use integer;
463 +{
464 my $body = shift;
465 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
466 my ($a,$b,$c,$d,$e);
467 @@ -941,7 +941,7 @@
468 }
470 sub Xloop_avx()
471 -{ use integer;
472 +{
473 my $body = shift;
474 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
475 my ($a,$b,$c,$d,$e);
476 @@ -965,7 +965,7 @@
477 }
479 sub Xtail_avx()
480 -{ use integer;
481 +{
482 my $body = shift;
483 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
484 my ($a,$b,$c,$d,$e);
485 Index: crypto/asn1/charmap.pl
486 --- crypto/asn1/charmap.pl.orig 2000-07-28 03:58:11.000000000 +0200
487 +++ crypto/asn1/charmap.pl 2012-06-27 10:10:05.000000000 +0200
488 @@ -1,7 +1,5 @@
489 #!/usr/local/bin/perl -w
491 -use strict;
492 -
493 my ($i, @arr);
495 # Set up an array with the type of ASCII characters
496 Index: crypto/bn/asm/modexp512-x86_64.pl
497 --- crypto/bn/asm/modexp512-x86_64.pl.orig 2011-12-12 16:12:09.000000000 +0100
498 +++ crypto/bn/asm/modexp512-x86_64.pl 2012-06-27 10:10:05.000000000 +0200
499 @@ -70,7 +70,6 @@
501 open STDOUT,"| $^X $xlate $flavour $output";
503 -use strict;
504 my $code=".text\n\n";
505 my $m=0;
507 Index: crypto/md5/asm/md5-x86_64.pl
508 --- crypto/md5/asm/md5-x86_64.pl.orig 2008-12-19 12:17:27.000000000 +0100
509 +++ crypto/md5/asm/md5-x86_64.pl 2012-06-27 10:10:05.000000000 +0200
510 @@ -7,8 +7,6 @@
511 # in the public domain.
512 #
514 -use strict;
515 -
516 my $code;
518 # round1_step() does:
519 Index: crypto/objects/obj_dat.pl
520 --- crypto/objects/obj_dat.pl.orig 2007-09-18 23:05:21.000000000 +0200
521 +++ crypto/objects/obj_dat.pl 2012-06-27 10:10:05.000000000 +0200
522 @@ -2,7 +2,6 @@
524 # fixes bug in floating point emulation on sparc64 when
525 # this script produces off-by-one output on sparc64
526 -use integer;
528 sub obj_cmp
529 {
530 Index: crypto/objects/objxref.pl
531 --- crypto/objects/objxref.pl.orig 2009-04-06 18:16:23.000000000 +0200
532 +++ crypto/objects/objxref.pl 2012-06-27 10:10:05.000000000 +0200
533 @@ -1,7 +1,5 @@
534 #!/usr/local/bin/perl
536 -use strict;
537 -
538 my %xref_tbl;
539 my %oid_tbl;
541 Index: crypto/perlasm/x86_64-xlate.pl
542 --- crypto/perlasm/x86_64-xlate.pl.orig 2012-03-13 20:19:31.000000000 +0100
543 +++ crypto/perlasm/x86_64-xlate.pl 2012-06-27 10:10:05.000000000 +0200
544 @@ -248,7 +248,6 @@
546 # Solaris /usr/ccs/bin/as can't handle multiplications
547 # in $self->{label}, new gas requires sign extension...
548 - use integer;
549 $self->{label} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
550 $self->{label} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
551 $self->{label} =~ s/([0-9]+)/$1<<32>>32/eg;
552 Index: crypto/sha/asm/sha1-586.pl
553 --- crypto/sha/asm/sha1-586.pl.orig 2011-06-28 15:53:49.000000000 +0200
554 +++ crypto/sha/asm/sha1-586.pl 2012-06-27 10:10:05.000000000 +0200
555 @@ -523,7 +523,7 @@
556 # round]...
557 #
558 sub Xupdate_ssse3_16_31() # recall that $Xi starts wtih 4
559 -{ use integer;
560 +{
561 my $body = shift;
562 my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
563 my ($a,$b,$c,$d,$e);
564 @@ -607,7 +607,7 @@
565 }
567 sub Xupdate_ssse3_32_79()
568 -{ use integer;
569 +{
570 my $body = shift;
571 my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
572 my ($a,$b,$c,$d,$e);
573 @@ -675,7 +675,7 @@
574 }
576 sub Xuplast_ssse3_80()
577 -{ use integer;
578 +{
579 my $body = shift;
580 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
581 my ($a,$b,$c,$d,$e);
582 @@ -710,7 +710,7 @@
583 }
585 sub Xloop_ssse3()
586 -{ use integer;
587 +{
588 my $body = shift;
589 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
590 my ($a,$b,$c,$d,$e);
591 @@ -735,7 +735,7 @@
592 }
594 sub Xtail_ssse3()
595 -{ use integer;
596 +{
597 my $body = shift;
598 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
599 my ($a,$b,$c,$d,$e);
600 @@ -945,7 +945,7 @@
601 &jmp (&label("loop"));
603 sub Xupdate_avx_16_31() # recall that $Xi starts wtih 4
604 -{ use integer;
605 +{
606 my $body = shift;
607 my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
608 my ($a,$b,$c,$d,$e);
609 @@ -1023,7 +1023,7 @@
610 }
612 sub Xupdate_avx_32_79()
613 -{ use integer;
614 +{
615 my $body = shift;
616 my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
617 my ($a,$b,$c,$d,$e);
618 @@ -1088,7 +1088,7 @@
619 }
621 sub Xuplast_avx_80()
622 -{ use integer;
623 +{
624 my $body = shift;
625 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
626 my ($a,$b,$c,$d,$e);
627 @@ -1123,7 +1123,7 @@
628 }
630 sub Xloop_avx()
631 -{ use integer;
632 +{
633 my $body = shift;
634 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
635 my ($a,$b,$c,$d,$e);
636 @@ -1147,7 +1147,7 @@
637 }
639 sub Xtail_avx()
640 -{ use integer;
641 +{
642 my $body = shift;
643 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
644 my ($a,$b,$c,$d,$e);
645 Index: crypto/sha/asm/sha1-x86_64.pl
646 --- crypto/sha/asm/sha1-x86_64.pl.orig 2011-07-04 15:01:42.000000000 +0200
647 +++ crypto/sha/asm/sha1-x86_64.pl 2012-06-27 10:10:05.000000000 +0200
648 @@ -367,7 +367,7 @@
649 }
651 sub Xupdate_ssse3_16_31() # recall that $Xi starts wtih 4
652 -{ use integer;
653 +{
654 my $body = shift;
655 my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
656 my ($a,$b,$c,$d,$e);
657 @@ -448,7 +448,7 @@
658 }
660 sub Xupdate_ssse3_32_79()
661 -{ use integer;
662 +{
663 my $body = shift;
664 my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
665 my ($a,$b,$c,$d,$e);
666 @@ -515,7 +515,7 @@
667 }
669 sub Xuplast_ssse3_80()
670 -{ use integer;
671 +{
672 my $body = shift;
673 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
674 my ($a,$b,$c,$d,$e);
675 @@ -549,7 +549,7 @@
676 }
678 sub Xloop_ssse3()
679 -{ use integer;
680 +{
681 my $body = shift;
682 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
683 my ($a,$b,$c,$d,$e);
684 @@ -574,7 +574,7 @@
685 }
687 sub Xtail_ssse3()
688 -{ use integer;
689 +{
690 my $body = shift;
691 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
692 my ($a,$b,$c,$d,$e);
693 @@ -778,7 +778,7 @@
694 ___
696 sub Xupdate_avx_16_31() # recall that $Xi starts wtih 4
697 -{ use integer;
698 +{
699 my $body = shift;
700 my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
701 my ($a,$b,$c,$d,$e);
702 @@ -854,7 +854,7 @@
703 }
705 sub Xupdate_avx_32_79()
706 -{ use integer;
707 +{
708 my $body = shift;
709 my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
710 my ($a,$b,$c,$d,$e);
711 @@ -919,7 +919,7 @@
712 }
714 sub Xuplast_avx_80()
715 -{ use integer;
716 +{
717 my $body = shift;
718 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
719 my ($a,$b,$c,$d,$e);
720 @@ -953,7 +953,7 @@
721 }
723 sub Xloop_avx()
724 -{ use integer;
725 +{
726 my $body = shift;
727 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
728 my ($a,$b,$c,$d,$e);
729 @@ -977,7 +977,7 @@
730 }
732 sub Xtail_avx()
733 -{ use integer;
734 +{
735 my $body = shift;
736 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
737 my ($a,$b,$c,$d,$e);
738 Index: util/clean-depend.pl
739 --- util/clean-depend.pl.orig 2007-09-19 16:53:18.000000000 +0200
740 +++ util/clean-depend.pl 2012-06-27 10:10:05.000000000 +0200
741 @@ -2,8 +2,6 @@
742 # Clean the dependency list in a makefile of standard includes...
743 # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
745 -use strict;
746 -
747 while(<STDIN>) {
748 print;
749 last if /^# DO NOT DELETE THIS LINE/;
750 Index: util/mklink.pl
751 --- util/mklink.pl.orig 2008-12-19 14:35:09.000000000 +0100
752 +++ util/mklink.pl 2012-06-27 10:10:05.000000000 +0200
753 @@ -15,13 +15,12 @@
754 # Apart from this, this script should be able to handle even the most
755 # pathological cases.
757 -use Cwd;
758 -
759 my $from = shift;
760 my @files = @ARGV;
762 my @from_path = split(/[\\\/]/, $from);
763 -my $pwd = getcwd();
764 +my $pwd = `pwd`;
765 +$pwd =~ s/\r?\n$//s;
766 chomp($pwd);
767 my @pwd_path = split(/[\\\/]/, $pwd);
