1.1 --- a/openpkg/openssl.patch Tue Jul 31 12:12:54 2012 +0200
1.2 +++ b/openpkg/openssl.patch Tue Jul 31 12:23:42 2012 +0200
1.3 @@ -1,6 +1,6 @@
1.4 Index: Configure
1.5 ---- Configure.orig 2007-09-16 14:24:17 +0200
1.6 -+++ Configure 2007-10-17 12:14:14 +0200
1.7 +--- Configure.orig 2012-03-14 23:20:40.000000000 +0100
1.8 ++++ Configure 2012-06-27 10:10:05.000000000 +0200
1.9 @@ -6,7 +6,6 @@
1.10 ##
1.11
1.12 @@ -17,28 +17,34 @@
1.13 #
1.14 # --test-sanity Make a number of sanity checks on the data in this file.
1.15 # This is a debugging tool for OpenSSL developers.
1.16 -@@ -113,6 +113,7 @@
1.17 +@@ -123,6 +123,7 @@
1.18 #$bits2="THIRTY_TWO_BIT ";
1.19 my $bits1="THIRTY_TWO_BIT ";
1.20 my $bits2="SIXTY_FOUR_BIT ";
1.21 +my $ccarg;
1.22
1.23 - my $x86_elf_asm="x86cpuid-elf.o:bn86-elf.o co86-elf.o:dx86-elf.o yx86-elf.o:ax86-elf.o:bx86-elf.o:mx86-elf.o:sx86-elf.o s512sse2-elf.o:cx86-elf.o:rx86-elf.o:rm86-elf.o:r586-elf.o";
1.24 - my $x86_coff_asm="x86cpuid-cof.o:bn86-cof.o co86-cof.o:dx86-cof.o yx86-cof.o:ax86-cof.o:bx86-cof.o:mx86-cof.o:sx86-cof.o s512sse2-cof.o:cx86-cof.o:rx86-cof.o:rm86-cof.o:r586-cof.o";
1.25 -@@ -402,8 +403,8 @@
1.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:";
1.27 +
1.28 +@@ -460,12 +461,12 @@
1.29
1.30 #### IBM's AIX.
1.31 "aix3-cc", "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
1.32 --"aix-gcc", "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
1.33 --"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
1.34 -+"aix-gcc", "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
1.35 -+"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
1.36 +-"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",
1.37 +-"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",
1.38 ++"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)::",
1.39 ++"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)::",
1.40 # Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
1.41 # at build time. $OBJECT_MODE is respected at ./config stage!
1.42 - "aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
1.43 -@@ -697,6 +698,10 @@
1.44 +-"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",
1.45 +-"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",
1.46 ++"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)::",
1.47 ++"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)::",
1.48 +
1.49 + #
1.50 + # Cray T90 and similar (SDSC)
1.51 +@@ -828,6 +829,10 @@
1.52 {
1.53 - exit(&test_sanity());
1.54 + $strict_warnings = 1;
1.55 }
1.56 + elsif (/^--with-cc=(.*)$/)
1.57 + {
1.58 @@ -47,42 +53,53 @@
1.59 elsif (/^reconfigure/ || /^reconf/)
1.60 {
1.61 if (open(IN,"<$Makefile"))
1.62 -@@ -949,7 +954,7 @@
1.63 +@@ -1143,7 +1148,7 @@
1.64 print "IsMK1MF=$IsMK1MF\n";
1.65
1.66 my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
1.67 -my $cc = $fields[$idx_cc];
1.68 +my $cc = $ccarg ? $ccarg : $fields[$idx_cc];
1.69 - my $cflags = $fields[$idx_cflags];
1.70 - my $unistd = $fields[$idx_unistd];
1.71 - my $thread_cflag = $fields[$idx_thread_cflag];
1.72 + # Allow environment CC to override compiler...
1.73 + if($ENV{CC}) {
1.74 + $cc = $ENV{CC};
1.75 Index: config
1.76 ---- config.orig 2007-08-01 13:21:35 +0200
1.77 -+++ config 2007-10-17 12:13:48 +0200
1.78 -@@ -401,9 +401,9 @@
1.79 +--- config.orig 2011-11-14 22:12:53.000000000 +0100
1.80 ++++ config 2012-06-27 10:10:05.000000000 +0200
1.81 +@@ -277,6 +277,9 @@
1.82 + Power*)
1.83 + echo "ppc-apple-darwin${VERSION}"
1.84 + ;;
1.85 ++ x86_64 )
1.86 ++ echo "x86_64-apple-darwin${VERSION}"
1.87 ++ ;;
1.88 + *)
1.89 + echo "i686-apple-darwin${VERSION}"
1.90 + ;;
1.91 +@@ -413,7 +416,7 @@
1.92
1.93 - # figure out if gcc is available and if so we use it otherwise
1.94 - # we fallback to whatever cc does on the system
1.95 --GCCVER=`(gcc -dumpversion) 2>/dev/null`
1.96 -+GCCVER=`(gcc -dumpversion 2>/dev/null && exit; cc --version 2>/dev/null | grep GCC >/dev/null && cc -dumpversion )`
1.97 - if [ "$GCCVER" != "" ]; then
1.98 -- CC=gcc
1.99 -+ CC=cc; gcc -dumpversion >/dev/null 2>&1 && CC=gcc
1.100 - # then strip off whatever prefix egcs prepends the number with...
1.101 - # Hopefully, this will work for any future prefixes as well.
1.102 - GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
1.103 -@@ -412,8 +412,10 @@
1.104 - # major and minor version numbers.
1.105 - # peak single digit before and after first dot, e.g. 2.95.1 gives 29
1.106 - GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
1.107 -+ SUFFIX=gcc
1.108 - else
1.109 - CC=cc
1.110 -+ SUFFIX=cc
1.111 + # Only set CC if not supplied already
1.112 + if [ -z "$CROSS_COMPILE$CC" ]; then
1.113 +- GCCVER=`sh -c "gcc -dumpversion" 2>/dev/null`
1.114 ++ GCCVER=`sh -c "${CC-gcc} -dumpversion" 2>/dev/null`
1.115 + if [ "$GCCVER" != "" ]; then
1.116 + # then strip off whatever prefix egcs prepends the number with...
1.117 + # Hopefully, this will work for any future prefixes as well.
1.118 +@@ -424,8 +427,14 @@
1.119 + # peak single digit before and after first dot, e.g. 2.95.1 gives 29
1.120 + GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
1.121 + CC=gcc
1.122 ++ SUFFIX=gcc
1.123 + else
1.124 + CC=cc
1.125 ++ SUFFIX=cc
1.126 ++ fi
1.127 ++else
1.128 ++ if [ "$GCCVER" != "" ]; then
1.129 ++ SUFFIX=gcc
1.130 + fi
1.131 fi
1.132 GCCVER=${GCCVER:-0}
1.133 - if [ "$SYSTEM" = "HP-UX" ];then
1.134 -@@ -422,7 +424,7 @@
1.135 +@@ -435,7 +444,7 @@
1.136 if [ $GCCVER -ge 30 ]; then
1.137 # PA64 support only came in with gcc 3.0.x.
1.138 # We check if the preprocessor symbol __LP64__ is defined...
1.139 @@ -91,7 +108,7 @@
1.140 : # __LP64__ has slipped through, it therefore is not defined
1.141 else
1.142 GCC_BITS="64"
1.143 -@@ -433,13 +435,14 @@
1.144 +@@ -446,13 +455,14 @@
1.145 if [ $GCCVER -ge 30 ]; then
1.146 # 64-bit ABI isn't officially supported in gcc 3.0, but it appears
1.147 # to be working, at the very least 'make test' passes...
1.148 @@ -107,7 +124,7 @@
1.149 CCVER=`(cc -V 2>&1) 2>/dev/null | \
1.150 egrep -e '^cc: .* C [0-9]\.[0-9]' | \
1.151 sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
1.152 -@@ -452,6 +455,7 @@
1.153 +@@ -465,6 +475,7 @@
1.154 sleep 5
1.155 fi
1.156 fi
1.157 @@ -115,7 +132,7 @@
1.158 fi
1.159
1.160 if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
1.161 -@@ -469,6 +473,7 @@
1.162 +@@ -482,6 +493,7 @@
1.163
1.164 if [ "${SYSTEM}" = "AIX" ]; then # favor vendor cc over gcc
1.165 (cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc
1.166 @@ -123,7 +140,7 @@
1.167 fi
1.168
1.169 CCVER=${CCVER:-0}
1.170 -@@ -488,7 +493,7 @@
1.171 +@@ -507,7 +519,7 @@
1.172 if [ $CPU -ge 4000 ]; then
1.173 options="$options -mips2"
1.174 fi
1.175 @@ -132,7 +149,7 @@
1.176 ;;
1.177 mips3-sgi-irix)
1.178 #CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
1.179 -@@ -498,11 +503,11 @@
1.180 +@@ -517,11 +529,11 @@
1.181 #else
1.182 # options="$options -mips3"
1.183 #fi
1.184 @@ -146,7 +163,7 @@
1.185 if [ "$TEST" = "false" -a -t 1 ]; then
1.186 echo " You have about 5 seconds to press Ctrl-C to abort."
1.187 (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
1.188 -@@ -514,7 +519,7 @@
1.189 +@@ -533,7 +545,7 @@
1.190 #else
1.191 # options="$options -mips3"
1.192 #fi
1.193 @@ -154,8 +171,18 @@
1.194 + OUT="irix-mips3-$SUFFIX"
1.195 ;;
1.196 ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
1.197 - ppc-apple-darwin*) OUT="darwin-ppc-cc" ;;
1.198 -@@ -522,10 +527,10 @@
1.199 + ppc-apple-darwin*)
1.200 +@@ -566,6 +578,9 @@
1.201 + else
1.202 + OUT="darwin-i386-cc"
1.203 + fi ;;
1.204 ++ x86_64-apple-darwin*)
1.205 ++ OUT="darwin64-x86_64-cc"
1.206 ++ ;;
1.207 + armv6+7-*-iphoneos)
1.208 + options="$options -arch%20armv6 -arch%20armv7"
1.209 + OUT="iphoneos-cross" ;;
1.210 +@@ -575,10 +590,10 @@
1.211 alpha-*-linux2)
1.212 ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
1.213 case ${ISA:-generic} in
1.214 @@ -169,8 +196,8 @@
1.215 case ${ISA:-generic} in
1.216 EV5|EV45) options="$options -mcpu=ev5";;
1.217 EV56|PCA56) options="$options -mcpu=ev56";;
1.218 -@@ -592,7 +597,7 @@
1.219 - s390x-*-linux2) OUT="linux-generic64"; options="$options -DB_ENDIAN" ;;
1.220 +@@ -662,7 +677,7 @@
1.221 + ;;
1.222 x86_64-*-linux?) OUT="linux-x86_64" ;;
1.223 *86-*-linux2) OUT="linux-elf"
1.224 - if [ "$GCCVER" -gt 28 ]; then
1.225 @@ -178,14 +205,14 @@
1.226 if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
1.227 options="$options -march=pentium"
1.228 fi
1.229 -@@ -606,17 +611,17 @@
1.230 +@@ -676,17 +691,17 @@
1.231 *-*-linux1) OUT="linux-aout" ;;
1.232 *-*-linux2) OUT="linux-generic32" ;;
1.233 sun4[uv]*-*-solaris2)
1.234 - OUT="solaris-sparcv9-$CC"
1.235 + OUT="solaris-sparcv9-$SUFFIX"
1.236 ISA64=`(isalist) 2>/dev/null | grep sparcv9`
1.237 - if [ "$ISA64" != "" ]; then
1.238 + if [ "$ISA64" != "" -a "$KERNEL_BITS" = "" ]; then
1.239 - if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then
1.240 + if [ $GCCVER -eq 0 -a $CCVER -ge 50 ]; then
1.241 echo "WARNING! If you wish to build 64-bit library, then you have to"
1.242 @@ -199,8 +226,8 @@
1.243 # $GCC_ARCH denotes default ABI chosen by compiler driver
1.244 # (first one found on the $PATH). I assume that user
1.245 # expects certain consistency with the rest of his builds
1.246 -@@ -639,21 +644,21 @@
1.247 - fi
1.248 +@@ -712,21 +727,21 @@
1.249 + OUT="solaris64-sparcv9-$CC"
1.250 fi
1.251 ;;
1.252 - sun4m-*-solaris2) OUT="solaris-sparcv8-$CC" ;;
1.253 @@ -211,9 +238,9 @@
1.254 + sun4*-*-solaris2) OUT="solaris-sparcv7-$SUFFIX" ;;
1.255 *86*-*-solaris2)
1.256 ISA64=`(isalist) 2>/dev/null | grep amd64`
1.257 -- if [ "$ISA64" != "" ]; then
1.258 +- if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 ]; then
1.259 - OUT="solaris64-x86_64-$CC"
1.260 -+ if [ "$ISA64" != "" -a $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then
1.261 ++ if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 -a $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then
1.262 + OUT="solaris64-x86_64-$SUFFIX"
1.263 else
1.264 - OUT="solaris-x86-$CC"
1.265 @@ -228,7 +255,7 @@
1.266
1.267 *86*-*-bsdi4) OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
1.268 alpha*-*-*bsd*) OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;;
1.269 -@@ -677,7 +682,7 @@
1.270 +@@ -750,7 +765,7 @@
1.271 *-*-osf) OUT="osf1-alpha-cc" ;;
1.272 *-*-tru64) OUT="tru64-alpha-cc" ;;
1.273 *-*-[Uu]nix[Ww]are7)
1.274 @@ -237,7 +264,7 @@
1.275 OUT="unixware-7-gcc" ; options="$options no-sse2"
1.276 else
1.277 OUT="unixware-7" ; options="$options no-sse2 -D__i386__"
1.278 -@@ -688,12 +693,12 @@
1.279 +@@ -761,12 +776,12 @@
1.280 *-*-vos)
1.281 options="$options no-threads no-shared no-asm no-dso"
1.282 EXE=".pm"
1.283 @@ -251,10 +278,10 @@
1.284 + if [ $GCCVER -gt 0 -a $GCC_BITS = "64" ]; then
1.285 OUT="hpux64-parisc2-gcc"
1.286 fi
1.287 - KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
1.288 -@@ -711,8 +716,8 @@
1.289 - fi
1.290 - OUT="hpux64-ia64-cc"
1.291 + [ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
1.292 +@@ -781,8 +796,8 @@
1.293 + OUT="hpux-ia64-cc"
1.294 + fi
1.295 elif [ $CPU_VERSION -ge 532 ]; then # PA-RISC 2.x CPU
1.296 - OUT=${OUT:-"hpux-parisc2-${CC}"}
1.297 - if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
1.298 @@ -263,7 +290,7 @@
1.299 echo "WARNING! If you wish to build 64-bit library then you have to"
1.300 echo " invoke './Configure hpux64-parisc2-cc' *manually*."
1.301 if [ "$TEST" = "false" -a -t 1 ]; then
1.302 -@@ -721,19 +726,19 @@
1.303 +@@ -791,9 +806,9 @@
1.304 fi
1.305 fi
1.306 elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU
1.307 @@ -273,22 +300,18 @@
1.308 - OUT="hpux-parisc-${CC}"
1.309 + OUT="hpux-parisc-${SUFFIX}"
1.310 else # Motorola(?) CPU
1.311 -- OUT="hpux-$CC"
1.312 -+ OUT="hpux-$SUFFIX"
1.313 + OUT="hpux-$CC"
1.314 fi
1.315 - options="$options -D_REENTRANT" ;;
1.316 -- *-hpux) OUT="hpux-parisc-$CC" ;;
1.317 -+ *-hpux) OUT="hpux-parisc-$SUFFIX" ;;
1.318 - *-aix)
1.319 - KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
1.320 +@@ -803,7 +818,7 @@
1.321 + [ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
1.322 KERNEL_BITS=${KERNEL_BITS:-32}
1.323 OBJECT_MODE=${OBJECT_MODE:-32}
1.324 - if [ "$CC" = "gcc" ]; then
1.325 + if [ $GCCVER -gt 0 ]; then
1.326 OUT="aix-gcc"
1.327 - elif [ $OBJECT_MODE -eq 64 ]; then
1.328 - echo 'Your $OBJECT_MODE was found to be set to 64'
1.329 -@@ -828,7 +833,7 @@
1.330 + if [ $OBJECT_MODE -eq 64 ]; then
1.331 + echo 'Your $OBJECT_MODE was found to be set to 64'
1.332 +@@ -913,7 +928,7 @@
1.333 #fi
1.334
1.335 if [ -z "$OUT" ]; then
1.336 @@ -297,7 +320,7 @@
1.337 fi
1.338
1.339 if [ ".$PERL" = . ] ; then
1.340 -@@ -860,9 +865,9 @@
1.341 +@@ -945,9 +960,9 @@
1.342 # compiler for the platform ... in which case we add it on
1.343 # the end ... otherwise we leave it off
1.344
1.345 @@ -309,7 +332,7 @@
1.346 fi
1.347
1.348 OUT="$PREFIX$OUT"
1.349 -@@ -872,9 +877,9 @@
1.350 +@@ -957,9 +972,9 @@
1.351 echo Configuring for $OUT
1.352
1.353 if [ "$TEST" = "true" ]; then
1.354 @@ -321,22 +344,412 @@
1.355 fi
1.356 else
1.357 echo "This system ($OUT) is not supported. See file INSTALL for details."
1.358 +Index: crypto/aes/asm/aesni-sha1-x86_64.pl
1.359 +--- crypto/aes/asm/aesni-sha1-x86_64.pl.orig 2011-08-23 22:53:31.000000000 +0200
1.360 ++++ crypto/aes/asm/aesni-sha1-x86_64.pl 2012-06-27 10:10:05.000000000 +0200
1.361 +@@ -206,7 +206,7 @@
1.362 + ___
1.363 +
1.364 + my $aesenc=sub {
1.365 +- use integer;
1.366 ++
1.367 + my ($n,$k)=($r/10,$r%10);
1.368 + if ($k==0) {
1.369 + $code.=<<___;
1.370 +@@ -249,7 +249,7 @@
1.371 + };
1.372 +
1.373 + sub Xupdate_ssse3_16_31() # recall that $Xi starts wtih 4
1.374 +-{ use integer;
1.375 ++{
1.376 + my $body = shift;
1.377 + my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
1.378 + my ($a,$b,$c,$d,$e);
1.379 +@@ -330,7 +330,7 @@
1.380 + }
1.381 +
1.382 + sub Xupdate_ssse3_32_79()
1.383 +-{ use integer;
1.384 ++{
1.385 + my $body = shift;
1.386 + my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
1.387 + my ($a,$b,$c,$d,$e);
1.388 +@@ -397,7 +397,7 @@
1.389 + }
1.390 +
1.391 + sub Xuplast_ssse3_80()
1.392 +-{ use integer;
1.393 ++{
1.394 + my $body = shift;
1.395 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.396 + my ($a,$b,$c,$d,$e);
1.397 +@@ -431,7 +431,7 @@
1.398 + }
1.399 +
1.400 + sub Xloop_ssse3()
1.401 +-{ use integer;
1.402 ++{
1.403 + my $body = shift;
1.404 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.405 + my ($a,$b,$c,$d,$e);
1.406 +@@ -456,7 +456,7 @@
1.407 + }
1.408 +
1.409 + sub Xtail_ssse3()
1.410 +-{ use integer;
1.411 ++{
1.412 + my $body = shift;
1.413 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.414 + my ($a,$b,$c,$d,$e);
1.415 +@@ -465,7 +465,7 @@
1.416 + }
1.417 +
1.418 + sub body_00_19 () {
1.419 +- use integer;
1.420 ++
1.421 + my ($k,$n);
1.422 + my @r=(
1.423 + '($a,$b,$c,$d,$e)=@V;'.
1.424 +@@ -488,7 +488,7 @@
1.425 + }
1.426 +
1.427 + sub body_20_39 () {
1.428 +- use integer;
1.429 ++
1.430 + my ($k,$n);
1.431 + my @r=(
1.432 + '($a,$b,$c,$d,$e)=@V;'.
1.433 +@@ -509,7 +509,7 @@
1.434 + }
1.435 +
1.436 + sub body_40_59 () {
1.437 +- use integer;
1.438 ++
1.439 + my ($k,$n);
1.440 + my @r=(
1.441 + '($a,$b,$c,$d,$e)=@V;'.
1.442 +@@ -723,7 +723,7 @@
1.443 + ___
1.444 +
1.445 + my $aesenc=sub {
1.446 +- use integer;
1.447 ++
1.448 + my ($n,$k)=($r/10,$r%10);
1.449 + if ($k==0) {
1.450 + $code.=<<___;
1.451 +@@ -766,7 +766,7 @@
1.452 + };
1.453 +
1.454 + sub Xupdate_avx_16_31() # recall that $Xi starts wtih 4
1.455 +-{ use integer;
1.456 ++{
1.457 + my $body = shift;
1.458 + my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
1.459 + my ($a,$b,$c,$d,$e);
1.460 +@@ -842,7 +842,7 @@
1.461 + }
1.462 +
1.463 + sub Xupdate_avx_32_79()
1.464 +-{ use integer;
1.465 ++{
1.466 + my $body = shift;
1.467 + my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
1.468 + my ($a,$b,$c,$d,$e);
1.469 +@@ -907,7 +907,7 @@
1.470 + }
1.471 +
1.472 + sub Xuplast_avx_80()
1.473 +-{ use integer;
1.474 ++{
1.475 + my $body = shift;
1.476 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.477 + my ($a,$b,$c,$d,$e);
1.478 +@@ -941,7 +941,7 @@
1.479 + }
1.480 +
1.481 + sub Xloop_avx()
1.482 +-{ use integer;
1.483 ++{
1.484 + my $body = shift;
1.485 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.486 + my ($a,$b,$c,$d,$e);
1.487 +@@ -965,7 +965,7 @@
1.488 + }
1.489 +
1.490 + sub Xtail_avx()
1.491 +-{ use integer;
1.492 ++{
1.493 + my $body = shift;
1.494 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.495 + my ($a,$b,$c,$d,$e);
1.496 +Index: crypto/asn1/charmap.pl
1.497 +--- crypto/asn1/charmap.pl.orig 2000-07-28 03:58:11.000000000 +0200
1.498 ++++ crypto/asn1/charmap.pl 2012-06-27 10:10:05.000000000 +0200
1.499 +@@ -1,7 +1,5 @@
1.500 + #!/usr/local/bin/perl -w
1.501 +
1.502 +-use strict;
1.503 +-
1.504 + my ($i, @arr);
1.505 +
1.506 + # Set up an array with the type of ASCII characters
1.507 +Index: crypto/bn/asm/modexp512-x86_64.pl
1.508 +--- crypto/bn/asm/modexp512-x86_64.pl.orig 2011-12-12 16:12:09.000000000 +0100
1.509 ++++ crypto/bn/asm/modexp512-x86_64.pl 2012-06-27 10:10:05.000000000 +0200
1.510 +@@ -70,7 +70,6 @@
1.511 +
1.512 + open STDOUT,"| $^X $xlate $flavour $output";
1.513 +
1.514 +-use strict;
1.515 + my $code=".text\n\n";
1.516 + my $m=0;
1.517 +
1.518 +Index: crypto/md5/asm/md5-x86_64.pl
1.519 +--- crypto/md5/asm/md5-x86_64.pl.orig 2008-12-19 12:17:27.000000000 +0100
1.520 ++++ crypto/md5/asm/md5-x86_64.pl 2012-06-27 10:10:05.000000000 +0200
1.521 +@@ -7,8 +7,6 @@
1.522 + # in the public domain.
1.523 + #
1.524 +
1.525 +-use strict;
1.526 +-
1.527 + my $code;
1.528 +
1.529 + # round1_step() does:
1.530 Index: crypto/objects/obj_dat.pl
1.531 ---- crypto/objects/obj_dat.pl.orig 2005-08-29 01:20:47 +0200
1.532 -+++ crypto/objects/obj_dat.pl 2007-10-17 12:13:48 +0200
1.533 -@@ -1,9 +1,5 @@
1.534 +--- crypto/objects/obj_dat.pl.orig 2007-09-18 23:05:21.000000000 +0200
1.535 ++++ crypto/objects/obj_dat.pl 2012-06-27 10:10:05.000000000 +0200
1.536 +@@ -2,7 +2,6 @@
1.537 +
1.538 + # fixes bug in floating point emulation on sparc64 when
1.539 + # this script produces off-by-one output on sparc64
1.540 +-use integer;
1.541 +
1.542 + sub obj_cmp
1.543 + {
1.544 +Index: crypto/objects/objxref.pl
1.545 +--- crypto/objects/objxref.pl.orig 2009-04-06 18:16:23.000000000 +0200
1.546 ++++ crypto/objects/objxref.pl 2012-06-27 10:10:05.000000000 +0200
1.547 +@@ -1,7 +1,5 @@
1.548 #!/usr/local/bin/perl
1.549
1.550 --# fixes bug in floating point emulation on sparc64 when
1.551 --# this script produces off-by-one output on sparc64
1.552 --use integer;
1.553 +-use strict;
1.554 -
1.555 - sub obj_cmp
1.556 - {
1.557 - local(@a,@b,$_,$r);
1.558 + my %xref_tbl;
1.559 + my %oid_tbl;
1.560 +
1.561 +Index: crypto/perlasm/x86_64-xlate.pl
1.562 +--- crypto/perlasm/x86_64-xlate.pl.orig 2012-03-13 20:19:31.000000000 +0100
1.563 ++++ crypto/perlasm/x86_64-xlate.pl 2012-06-27 10:10:05.000000000 +0200
1.564 +@@ -248,7 +248,6 @@
1.565 +
1.566 + # Solaris /usr/ccs/bin/as can't handle multiplications
1.567 + # in $self->{label}, new gas requires sign extension...
1.568 +- use integer;
1.569 + $self->{label} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
1.570 + $self->{label} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
1.571 + $self->{label} =~ s/([0-9]+)/$1<<32>>32/eg;
1.572 +Index: crypto/sha/asm/sha1-586.pl
1.573 +--- crypto/sha/asm/sha1-586.pl.orig 2011-06-28 15:53:49.000000000 +0200
1.574 ++++ crypto/sha/asm/sha1-586.pl 2012-06-27 10:10:05.000000000 +0200
1.575 +@@ -523,7 +523,7 @@
1.576 + # round]...
1.577 + #
1.578 + sub Xupdate_ssse3_16_31() # recall that $Xi starts wtih 4
1.579 +-{ use integer;
1.580 ++{
1.581 + my $body = shift;
1.582 + my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
1.583 + my ($a,$b,$c,$d,$e);
1.584 +@@ -607,7 +607,7 @@
1.585 + }
1.586 +
1.587 + sub Xupdate_ssse3_32_79()
1.588 +-{ use integer;
1.589 ++{
1.590 + my $body = shift;
1.591 + my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
1.592 + my ($a,$b,$c,$d,$e);
1.593 +@@ -675,7 +675,7 @@
1.594 + }
1.595 +
1.596 + sub Xuplast_ssse3_80()
1.597 +-{ use integer;
1.598 ++{
1.599 + my $body = shift;
1.600 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.601 + my ($a,$b,$c,$d,$e);
1.602 +@@ -710,7 +710,7 @@
1.603 + }
1.604 +
1.605 + sub Xloop_ssse3()
1.606 +-{ use integer;
1.607 ++{
1.608 + my $body = shift;
1.609 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.610 + my ($a,$b,$c,$d,$e);
1.611 +@@ -735,7 +735,7 @@
1.612 + }
1.613 +
1.614 + sub Xtail_ssse3()
1.615 +-{ use integer;
1.616 ++{
1.617 + my $body = shift;
1.618 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.619 + my ($a,$b,$c,$d,$e);
1.620 +@@ -945,7 +945,7 @@
1.621 + &jmp (&label("loop"));
1.622 +
1.623 + sub Xupdate_avx_16_31() # recall that $Xi starts wtih 4
1.624 +-{ use integer;
1.625 ++{
1.626 + my $body = shift;
1.627 + my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
1.628 + my ($a,$b,$c,$d,$e);
1.629 +@@ -1023,7 +1023,7 @@
1.630 + }
1.631 +
1.632 + sub Xupdate_avx_32_79()
1.633 +-{ use integer;
1.634 ++{
1.635 + my $body = shift;
1.636 + my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
1.637 + my ($a,$b,$c,$d,$e);
1.638 +@@ -1088,7 +1088,7 @@
1.639 + }
1.640 +
1.641 + sub Xuplast_avx_80()
1.642 +-{ use integer;
1.643 ++{
1.644 + my $body = shift;
1.645 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.646 + my ($a,$b,$c,$d,$e);
1.647 +@@ -1123,7 +1123,7 @@
1.648 + }
1.649 +
1.650 + sub Xloop_avx()
1.651 +-{ use integer;
1.652 ++{
1.653 + my $body = shift;
1.654 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.655 + my ($a,$b,$c,$d,$e);
1.656 +@@ -1147,7 +1147,7 @@
1.657 + }
1.658 +
1.659 + sub Xtail_avx()
1.660 +-{ use integer;
1.661 ++{
1.662 + my $body = shift;
1.663 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.664 + my ($a,$b,$c,$d,$e);
1.665 +Index: crypto/sha/asm/sha1-x86_64.pl
1.666 +--- crypto/sha/asm/sha1-x86_64.pl.orig 2011-07-04 15:01:42.000000000 +0200
1.667 ++++ crypto/sha/asm/sha1-x86_64.pl 2012-06-27 10:10:05.000000000 +0200
1.668 +@@ -367,7 +367,7 @@
1.669 + }
1.670 +
1.671 + sub Xupdate_ssse3_16_31() # recall that $Xi starts wtih 4
1.672 +-{ use integer;
1.673 ++{
1.674 + my $body = shift;
1.675 + my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
1.676 + my ($a,$b,$c,$d,$e);
1.677 +@@ -448,7 +448,7 @@
1.678 + }
1.679 +
1.680 + sub Xupdate_ssse3_32_79()
1.681 +-{ use integer;
1.682 ++{
1.683 + my $body = shift;
1.684 + my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
1.685 + my ($a,$b,$c,$d,$e);
1.686 +@@ -515,7 +515,7 @@
1.687 + }
1.688 +
1.689 + sub Xuplast_ssse3_80()
1.690 +-{ use integer;
1.691 ++{
1.692 + my $body = shift;
1.693 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.694 + my ($a,$b,$c,$d,$e);
1.695 +@@ -549,7 +549,7 @@
1.696 + }
1.697 +
1.698 + sub Xloop_ssse3()
1.699 +-{ use integer;
1.700 ++{
1.701 + my $body = shift;
1.702 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.703 + my ($a,$b,$c,$d,$e);
1.704 +@@ -574,7 +574,7 @@
1.705 + }
1.706 +
1.707 + sub Xtail_ssse3()
1.708 +-{ use integer;
1.709 ++{
1.710 + my $body = shift;
1.711 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.712 + my ($a,$b,$c,$d,$e);
1.713 +@@ -778,7 +778,7 @@
1.714 + ___
1.715 +
1.716 + sub Xupdate_avx_16_31() # recall that $Xi starts wtih 4
1.717 +-{ use integer;
1.718 ++{
1.719 + my $body = shift;
1.720 + my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
1.721 + my ($a,$b,$c,$d,$e);
1.722 +@@ -854,7 +854,7 @@
1.723 + }
1.724 +
1.725 + sub Xupdate_avx_32_79()
1.726 +-{ use integer;
1.727 ++{
1.728 + my $body = shift;
1.729 + my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
1.730 + my ($a,$b,$c,$d,$e);
1.731 +@@ -919,7 +919,7 @@
1.732 + }
1.733 +
1.734 + sub Xuplast_avx_80()
1.735 +-{ use integer;
1.736 ++{
1.737 + my $body = shift;
1.738 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.739 + my ($a,$b,$c,$d,$e);
1.740 +@@ -953,7 +953,7 @@
1.741 + }
1.742 +
1.743 + sub Xloop_avx()
1.744 +-{ use integer;
1.745 ++{
1.746 + my $body = shift;
1.747 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.748 + my ($a,$b,$c,$d,$e);
1.749 +@@ -977,7 +977,7 @@
1.750 + }
1.751 +
1.752 + sub Xtail_avx()
1.753 +-{ use integer;
1.754 ++{
1.755 + my $body = shift;
1.756 + my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
1.757 + my ($a,$b,$c,$d,$e);
1.758 +Index: util/clean-depend.pl
1.759 +--- util/clean-depend.pl.orig 2007-09-19 16:53:18.000000000 +0200
1.760 ++++ util/clean-depend.pl 2012-06-27 10:10:05.000000000 +0200
1.761 +@@ -2,8 +2,6 @@
1.762 + # Clean the dependency list in a makefile of standard includes...
1.763 + # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
1.764 +
1.765 +-use strict;
1.766 +-
1.767 + while(<STDIN>) {
1.768 + print;
1.769 + last if /^# DO NOT DELETE THIS LINE/;
1.770 Index: util/mklink.pl
1.771 ---- util/mklink.pl.orig 2006-02-09 13:28:30 +0100
1.772 -+++ util/mklink.pl 2007-10-17 12:13:48 +0200
1.773 +--- util/mklink.pl.orig 2008-12-19 14:35:09.000000000 +0100
1.774 ++++ util/mklink.pl 2012-06-27 10:10:05.000000000 +0200
1.775 @@ -15,13 +15,12 @@
1.776 # Apart from this, this script should be able to handle even the most
1.777 # pathological cases.
1.778 @@ -349,7 +762,7 @@
1.779 my @from_path = split(/[\\\/]/, $from);
1.780 -my $pwd = getcwd();
1.781 +my $pwd = `pwd`;
1.782 -+$pwd =~ s/\n$//s;
1.783 ++$pwd =~ s/\r?\n$//s;
1.784 chomp($pwd);
1.785 my @pwd_path = split(/[\\\/]/, $pwd);
1.786
