summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-02-06 16:35:27 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-08 00:50:22 (GMT)
commitc54070c0b1fb4de00b4543c498c7c7079b526dcb (patch)
tree1cb44b6ca574f65d8329751afd1c70a1d998ed65 /meta/recipes-connectivity/openssl
parent4825e2af65560482217cdfd9f391c34040d4db85 (diff)
downloadpoky-c54070c0b1fb4de00b4543c498c7c7079b526dcb.tar.gz
openssl-0.9.8: Remove in favor or 1.0.0
Now that Openssl 1.0.0 has been out for a while, there is no need to keep multiple versions. (From OE-Core rev: 6017251a1de93ff3d509a040a220e30d0ee9cd5e) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/configure-targets.patch25
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/ca.patch22
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/config-hurd.patch17
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/debian-targets.patch56
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/engines-path.patch49
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/kfreebsd-pipe.patch15
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/make-targets.patch15
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-dir.patch15
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-section.patch34
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-rpath.patch15
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-symbolic.patch15
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/perl-path.diff762
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pic.patch303
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pkg-config.patch36
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rc4-amd64.patch16
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash-crt.patch35
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash_pod.patch62
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/series20
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/shared-lib-ext.patch16
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/stddef.patch14
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/version-script.patch35
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/parallel-make-fix.patch20
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/shared-libs.patch50
-rw-r--r--meta/recipes-connectivity/openssl/openssl_0.9.8t.bb31
24 files changed, 0 insertions, 1678 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/configure-targets.patch
deleted file mode 100644
index 2317949..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/configure-targets.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3The number of colons are important :)
4
5Index: openssl-0.9.8g/Configure
6===================================================================
7--- openssl-0.9.8g.orig/Configure 2008-04-12 04:27:22.000000000 +0200
8+++ openssl-0.9.8g/Configure 2008-04-12 04:38:56.000000000 +0200
9@@ -395,6 +395,16 @@
10 "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
11 "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
12
13+ # Linux on ARM
14+"linux-elf-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
15+"linux-elf-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
16+"linux-gnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
17+"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
18+"linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
19+"linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
20+
21+"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
22+
23 #### *BSD [do see comment about ${BSDthreads} above!]
24 "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
25 "BSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/ca.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/ca.patch
deleted file mode 100644
index aba4d42..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/ca.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8m/apps/CA.pl.in
4===================================================================
5--- openssl-0.9.8m.orig/apps/CA.pl.in 2006-04-28 00:28:51.000000000 +0000
6+++ openssl-0.9.8m/apps/CA.pl.in 2010-02-27 00:36:51.000000000 +0000
7@@ -65,6 +65,7 @@
8 foreach (@ARGV) {
9 if ( /^(-\?|-h|-help)$/ ) {
10 print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
11+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
12 exit 0;
13 } elsif (/^-newcert$/) {
14 # create a certificate
15@@ -165,6 +166,7 @@
16 } else {
17 print STDERR "Unknown arg $_\n";
18 print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
19+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
20 exit 1;
21 }
22 }
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/config-hurd.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/config-hurd.patch
deleted file mode 100644
index 2359d15..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/config-hurd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/config
4===================================================================
5--- openssl-0.9.8k.orig/config 2009-02-16 09:43:41.000000000 +0100
6+++ openssl-0.9.8k/config 2009-07-19 11:32:41.000000000 +0200
7@@ -162,8 +162,8 @@
8 echo "${MACHINE}-whatever-linux1"; exit 0
9 ;;
10
11- GNU*)
12- echo "hurd-x86"; exit 0;
13+ GNU:*|GNU/*:*)
14+ echo "${MACHINE}-gnuish"; exit 0;
15 ;;
16
17 LynxOS:*)
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/debian-targets.patch
deleted file mode 100644
index 5720988..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/debian-targets.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/Configure
4===================================================================
5--- openssl-0.9.8k.orig/Configure 2009-12-09 16:09:41.000000000 +0000
6+++ openssl-0.9.8k/Configure 2009-12-09 16:09:55.000000000 +0000
7@@ -320,6 +320,49 @@
8 "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared:::.so",
9 "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
10
11+# Debian GNU/* (various architectures)
12+"debian-alpha","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
13+"debian-alpha-ev4","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev4 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
14+"debian-alpha-ev5","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev5 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
15+"debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
16+"debian-armeb","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
17+"debian-armel","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
18+#"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
19+"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm_linux}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
20+"debian-avr32", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG_BF_PTR::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
21+"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
22+#"debian-freebsd-alpha","gcc:-DTERMIOS -O -Wa,--noexecstack -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
23+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
24+"debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
25+"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
26+"debian-ia64","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
27+#"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC",
28+"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
29+"debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
30+"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
31+"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
32+"debian-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
33+"debian-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
34+"debian-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
35+"debian-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
36+"debian-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
37+"debian-netbsd-sparc", "gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
38+"debian-openbsd-alpha","gcc:-DTERMIOS -O3 -Wa,--noexecstack -g::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
39+"debian-openbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
40+"debian-openbsd-mips","gcc:-O2 -Wa,--noexecstack -g -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
41+"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::linux_ppc32.o::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
42+"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
43+"debian-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
44+"debian-sh3", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
45+"debian-sh4", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
46+"debian-sh3eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
47+"debian-sh4eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
48+"debian-m32r","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
49+"debian-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
50+"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -mcpu=v8 -g -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
51+"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,--noexecstack -Wa,-Av8plus -g -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
52+"debian-sparc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
53+
54 ####
55 #### Variety of LINUX:-)
56 ####
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/engines-path.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/engines-path.patch
deleted file mode 100644
index 5b4c7d5..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/engines-path.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8m/Makefile.org
4===================================================================
5--- openssl-0.9.8m.orig/Makefile.org 2010-01-27 16:06:36.000000000 +0000
6+++ openssl-0.9.8m/Makefile.org 2010-02-27 00:43:04.000000000 +0000
7@@ -620,7 +620,7 @@
8 install_sw:
9 @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
10 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
11- $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
12+ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines \
13 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
14 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
15 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
16Index: openssl-0.9.8m/engines/Makefile
17===================================================================
18--- openssl-0.9.8m.orig/engines/Makefile 2009-11-10 01:53:02.000000000 +0000
19+++ openssl-0.9.8m/engines/Makefile 2010-02-27 00:45:03.000000000 +0000
20@@ -101,13 +101,13 @@
21 *DSO_DL*) sfx="sl";; \
22 *) sfx="bad";; \
23 esac; \
24- cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
25+ cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \
26 else \
27 sfx="so"; \
28 cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
29 fi; \
30- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
31- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \
32+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \
33+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \
34 done; \
35 fi
36
37Index: openssl-0.9.8m/Configure
38===================================================================
39--- openssl-0.9.8m.orig/Configure 2010-02-27 00:40:42.000000000 +0000
40+++ openssl-0.9.8m/Configure 2010-02-27 00:46:47.000000000 +0000
41@@ -1738,7 +1738,7 @@
42 # $foo is to become "$prefix/lib$multilib/engines";
43 # as Makefile.org and engines/Makefile are adapted for
44 # $multilib suffix.
45- my $foo = "$prefix/lib/engines";
46+ my $foo = "$prefix/lib/ssl/engines";
47 $foo =~ s/\\/\\\\/g;
48 print OUT "#define ENGINESDIR \"$foo\"\n";
49 }
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/kfreebsd-pipe.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/kfreebsd-pipe.patch
deleted file mode 100644
index b0312f3..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/kfreebsd-pipe.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/crypto/perlasm/x86_64-xlate.pl
4===================================================================
5--- openssl-0.9.8k.orig/crypto/perlasm/x86_64-xlate.pl 2008-02-13 21:01:48.000000000 +0100
6+++ openssl-0.9.8k/crypto/perlasm/x86_64-xlate.pl 2009-07-19 11:37:23.000000000 +0200
7@@ -62,7 +62,7 @@
8 my ($outdev,$outino,@junk)=stat($output);
9
10 open STDOUT,">$output" || die "can't open $output: $!"
11- if ($stddev!=$outdev || $stdino!=$outino);
12+# if ($stddev!=$outdev || $stdino!=$outino);
13 }
14
15 my $masmref=8 + 50727*2**-32; # 8.00.50727 shipped with VS2005
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/make-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/make-targets.patch
deleted file mode 100644
index 91207d8..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/make-targets.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/Makefile.org
4===================================================================
5--- openssl-0.9.8k.orig/Makefile.org 2009-07-19 11:32:41.000000000 +0200
6+++ openssl-0.9.8k/Makefile.org 2009-07-19 11:37:31.000000000 +0200
7@@ -131,7 +131,7 @@
8
9 BASEADDR=
10
11-DIRS= crypto fips ssl engines apps test tools
12+DIRS= crypto fips ssl engines apps tools
13 SHLIBDIRS= crypto ssl fips
14
15 # dirs in crypto to build
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-dir.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-dir.patch
deleted file mode 100644
index 358f8cd..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-dir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/Makefile.org
4===================================================================
5--- openssl-0.9.8k.orig/Makefile.org 2009-07-19 11:32:41.000000000 +0200
6+++ openssl-0.9.8k/Makefile.org 2009-07-19 11:37:29.000000000 +0200
7@@ -152,7 +152,7 @@
8
9 MAKEFILE= Makefile
10
11-MANDIR=$(OPENSSLDIR)/man
12+MANDIR=/usr/share/man
13 MAN1=1
14 MAN3=3
15 MANSUFFIX=
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-section.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-section.patch
deleted file mode 100644
index b74b12e..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-section.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/Makefile.org
4===================================================================
5--- openssl-0.9.8k.orig/Makefile.org 2009-07-19 11:34:06.000000000 +0200
6+++ openssl-0.9.8k/Makefile.org 2009-07-19 11:37:21.000000000 +0200
7@@ -155,7 +155,8 @@
8 MANDIR=/usr/share/man
9 MAN1=1
10 MAN3=3
11-MANSUFFIX=
12+MANSUFFIX=ssl
13+MANSECTION=SSL
14 SHELL=/bin/sh
15
16 TOP= .
17@@ -694,7 +695,7 @@
18 echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
19 (cd `$(PERL) util/dirname.pl $$i`; \
20 sh -c "$$pod2man \
21- --section=$$sec --center=OpenSSL \
22+ --section=$${sec}$(MANSECTION) --center=OpenSSL \
23 --release=$(VERSION) `basename $$i`") \
24 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
25 $(PERL) util/extract-names.pl < $$i | \
26@@ -711,7 +712,7 @@
27 echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
28 (cd `$(PERL) util/dirname.pl $$i`; \
29 sh -c "$$pod2man \
30- --section=$$sec --center=OpenSSL \
31+ --section=$${sec}$(MANSECTION) --center=OpenSSL \
32 --release=$(VERSION) `basename $$i`") \
33 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
34 $(PERL) util/extract-names.pl < $$i | \
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-rpath.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-rpath.patch
deleted file mode 100644
index 53b7614..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-rpath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/Makefile.shared
4===================================================================
5--- openssl-0.9.8k.orig/Makefile.shared 2008-09-17 17:56:40.000000000 +0200
6+++ openssl-0.9.8k/Makefile.shared 2009-07-19 11:37:25.000000000 +0200
7@@ -151,7 +151,7 @@
8 NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
9 SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
10
11-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
12+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
13
14 #This is rather special. It's a special target with which one can link
15 #applications without bothering with any features that have anything to
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-symbolic.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-symbolic.patch
deleted file mode 100644
index 87eadac..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-symbolic.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/Makefile.shared
4===================================================================
5--- openssl-0.9.8k.orig/Makefile.shared 2009-07-19 11:35:02.000000000 +0200
6+++ openssl-0.9.8k/Makefile.shared 2009-07-19 11:35:48.000000000 +0200
7@@ -149,7 +149,7 @@
8 SHLIB_SUFFIX=; \
9 ALLSYMSFLAGS='-Wl,--whole-archive'; \
10 NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
11- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
12+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
13
14 DO_GNU_APP=LDFLAGS="$(CFLAGS)"
15
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/perl-path.diff b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/perl-path.diff
deleted file mode 100644
index ced45a3..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/perl-path.diff
+++ /dev/null
@@ -1,762 +0,0 @@
1Upstream-Status: Backport [debian]
2
3From: Kurt Roeckx <kurt@roeckx.be>
4Subject: Change the perl path's to /usr/bin/perl
5
6This is the result of running:
7perl util/perlpath.pl /usr/bin
8
9The upstream sources have this set to various different paths.
10
11--- openssl-0.9.8m.orig/Configure
12+++ openssl-0.9.8m/Configure
13@@ -1,4 +1,4 @@
14-:
15+#!/usr/bin/perl
16 eval 'exec perl -S $0 ${1+"$@"}'
17 if $running_under_some_shell;
18 ##
19--- openssl-0.9.8m.orig/VMS/VMSify-conf.pl
20+++ openssl-0.9.8m/VMS/VMSify-conf.pl
21@@ -1,4 +1,4 @@
22-#! /usr/bin/perl
23+#!/usr/bin/perl
24
25 use strict;
26 use warnings;
27--- openssl-0.9.8m.orig/Netware/do_tests.pl
28+++ openssl-0.9.8m/Netware/do_tests.pl
29@@ -1,4 +1,4 @@
30-# perl script to run OpenSSL tests
31+#!/usr/bin/perl
32
33
34 my $base_path = "\\openssl";
35--- openssl-0.9.8m.orig/apps/progs.pl
36+++ openssl-0.9.8m/apps/progs.pl
37@@ -1,4 +1,4 @@
38-#!/usr/local/bin/perl
39+#!/usr/bin/perl
40
41 print "/* apps/progs.h */\n";
42 print "/* automatically generated by progs.pl for openssl.c */\n\n";
43--- openssl-0.9.8m.orig/os2/backwardify.pl
44+++ openssl-0.9.8m/os2/backwardify.pl
45@@ -1,4 +1,4 @@
46-#!/usr/bin/perl -w
47+#!/usr/bin/perl
48 use strict;
49
50 # Use as $0
51--- openssl-0.9.8m.orig/times/091/mips-rel.pl
52+++ openssl-0.9.8m/times/091/mips-rel.pl
53@@ -1,4 +1,4 @@
54-#!/usr/local/bin/perl
55+#!/usr/bin/perl
56
57 &doit(100,"Pentium 100 32",0.0195,0.1000,0.6406,4.6100); # pentium-100
58 &doit(200,"PPro 200 32",0.0070,0.0340,0.2087,1.4700); # pentium-100
59--- openssl-0.9.8m.orig/fips/mkfipsscr.pl
60+++ openssl-0.9.8m/fips/mkfipsscr.pl
61@@ -1,4 +1,4 @@
62-#!/usr/local/bin/perl -w
63+#!/usr/bin/perl
64 # Quick & dirty utility to generate a script for executing the
65 # FIPS 140-2 CMVP algorithm tests based on the pathnames of
66 # input algorithm test files actually present (the unqualified
67--- openssl-0.9.8m.orig/fips/fipsalgtest.pl
68+++ openssl-0.9.8m/fips/fipsalgtest.pl
69@@ -1,4 +1,4 @@
70-#!/usr/bin/perl -w
71+#!/usr/bin/perl
72 # Perl utility to run or verify FIPS 140-2 CMVP algorithm tests based on the
73 # pathnames of input algorithm test files actually present (the unqualified
74 # file names are consistent but the pathnames are not).
75--- openssl-0.9.8m.orig/ms/uplink.pl
76+++ openssl-0.9.8m/ms/uplink.pl
77@@ -1,4 +1,4 @@
78-#!/usr/bin/env perl
79+#!/usr/bin/perl
80 #
81 # For Microsoft CL this is implemented as inline assembler. So that
82 # even though this script can generate even Win32 code, we'll be
83--- openssl-0.9.8m.orig/ms/segrenam.pl
84+++ openssl-0.9.8m/ms/segrenam.pl
85@@ -1,4 +1,4 @@
86-#!/usr/bin/env perl
87+#!/usr/bin/perl
88
89 my $quiet = 1;
90
91--- openssl-0.9.8m.orig/ms/cmp.pl
92+++ openssl-0.9.8m/ms/cmp.pl
93@@ -1,4 +1,4 @@
94-#!/usr/local/bin/perl
95+#!/usr/bin/perl
96
97 ($#ARGV == 1) || die "usage: cmp.pl <file1> <file2>\n";
98
99--- openssl-0.9.8m.orig/test/cms-test.pl
100+++ openssl-0.9.8m/test/cms-test.pl
101@@ -1,4 +1,4 @@
102-# test/cms-test.pl
103+#!/usr/bin/perl
104 # Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
105 # project.
106 #
107--- openssl-0.9.8m.orig/test/cms-examples.pl
108+++ openssl-0.9.8m/test/cms-examples.pl
109@@ -1,4 +1,4 @@
110-# test/cms-examples.pl
111+#!/usr/bin/perl
112 # Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
113 # project.
114 #
115--- openssl-0.9.8m.orig/demos/b64.pl
116+++ openssl-0.9.8m/demos/b64.pl
117@@ -1,4 +1,4 @@
118-#!/usr/local/bin/perl
119+#!/usr/bin/perl
120
121 #
122 # Make PEM encoded data have lines of 64 bytes of data
123--- openssl-0.9.8m.orig/demos/tunala/configure.in
124+++ openssl-0.9.8m/demos/tunala/configure.in
125@@ -1,4 +1,4 @@
126-dnl Process this file with autoconf to produce a configure script.
127+#!/usr/bin/perl
128 AC_INIT(tunala.c)
129 AM_CONFIG_HEADER(config.h)
130 AM_INIT_AUTOMAKE(tunala, 0.0.1-dev)
131--- openssl-0.9.8m.orig/crypto/x86cpuid.pl
132+++ openssl-0.9.8m/crypto/x86cpuid.pl
133@@ -1,4 +1,4 @@
134-#!/usr/bin/env perl
135+#!/usr/bin/perl
136
137 push(@INC,"perlasm");
138 require "x86asm.pl";
139--- openssl-0.9.8m.orig/crypto/x86_64cpuid.pl
140+++ openssl-0.9.8m/crypto/x86_64cpuid.pl
141@@ -1,4 +1,4 @@
142-#!/usr/bin/env perl
143+#!/usr/bin/perl
144
145 $output=shift;
146 $masm=1 if ($output =~ /\.asm/);
147--- openssl-0.9.8m.orig/crypto/md5/asm/md5-586.pl
148+++ openssl-0.9.8m/crypto/md5/asm/md5-586.pl
149@@ -1,4 +1,4 @@
150-#!/usr/local/bin/perl
151+#!/usr/bin/perl
152
153 # Normal is the
154 # md5_block_x86(MD5_CTX *c, ULONG *X);
155--- openssl-0.9.8m.orig/crypto/md5/asm/md5-x86_64.pl
156+++ openssl-0.9.8m/crypto/md5/asm/md5-x86_64.pl
157@@ -1,4 +1,4 @@
158-#!/usr/bin/perl -w
159+#!/usr/bin/perl
160 #
161 # MD5 optimized for AMD64.
162 #
163--- openssl-0.9.8m.orig/crypto/sha/asm/sha1-ia64.pl
164+++ openssl-0.9.8m/crypto/sha/asm/sha1-ia64.pl
165@@ -1,4 +1,4 @@
166-#!/usr/bin/env perl
167+#!/usr/bin/perl
168 #
169 # ====================================================================
170 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
171--- openssl-0.9.8m.orig/crypto/sha/asm/sha1-x86_64.pl
172+++ openssl-0.9.8m/crypto/sha/asm/sha1-x86_64.pl
173@@ -1,4 +1,4 @@
174-#!/usr/bin/env perl
175+#!/usr/bin/perl
176 #
177 # ====================================================================
178 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
179--- openssl-0.9.8m.orig/crypto/sha/asm/sha512-sse2.pl
180+++ openssl-0.9.8m/crypto/sha/asm/sha512-sse2.pl
181@@ -1,4 +1,4 @@
182-#!/usr/bin/env perl
183+#!/usr/bin/perl
184 #
185 # ====================================================================
186 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
187--- openssl-0.9.8m.orig/crypto/sha/asm/sha512-ia64.pl
188+++ openssl-0.9.8m/crypto/sha/asm/sha512-ia64.pl
189@@ -1,4 +1,4 @@
190-#!/usr/bin/env perl
191+#!/usr/bin/perl
192 #
193 # ====================================================================
194 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
195--- openssl-0.9.8m.orig/crypto/sha/asm/sha512-x86_64.pl
196+++ openssl-0.9.8m/crypto/sha/asm/sha512-x86_64.pl
197@@ -1,4 +1,4 @@
198-#!/usr/bin/env perl
199+#!/usr/bin/perl
200 #
201 # ====================================================================
202 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
203--- openssl-0.9.8m.orig/crypto/sha/asm/sha1-586.pl
204+++ openssl-0.9.8m/crypto/sha/asm/sha1-586.pl
205@@ -1,4 +1,4 @@
206-#!/usr/bin/env perl
207+#!/usr/bin/perl
208
209 # ====================================================================
210 # [Re]written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
211--- openssl-0.9.8m.orig/crypto/des/asm/des-586.pl
212+++ openssl-0.9.8m/crypto/des/asm/des-586.pl
213@@ -1,4 +1,4 @@
214-#!/usr/local/bin/perl
215+#!/usr/bin/perl
216 #
217 # The inner loop instruction sequence and the IP/FP modifications are from
218 # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
219--- openssl-0.9.8m.orig/crypto/des/asm/desboth.pl
220+++ openssl-0.9.8m/crypto/des/asm/desboth.pl
221@@ -1,4 +1,4 @@
222-#!/usr/local/bin/perl
223+#!/usr/bin/perl
224
225 $L="edi";
226 $R="esi";
227--- openssl-0.9.8m.orig/crypto/des/asm/des686.pl
228+++ openssl-0.9.8m/crypto/des/asm/des686.pl
229@@ -1,4 +1,4 @@
230-#!/usr/local/bin/perl
231+#!/usr/bin/perl
232
233 $prog="des686.pl";
234
235--- openssl-0.9.8m.orig/crypto/des/asm/crypt586.pl
236+++ openssl-0.9.8m/crypto/des/asm/crypt586.pl
237@@ -1,4 +1,4 @@
238-#!/usr/local/bin/perl
239+#!/usr/bin/perl
240 #
241 # The inner loop instruction sequence and the IP/FP modifications are from
242 # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
243--- openssl-0.9.8m.orig/crypto/lhash/num.pl
244+++ openssl-0.9.8m/crypto/lhash/num.pl
245@@ -1,4 +1,4 @@
246-#!/usr/local/bin/perl
247+#!/usr/bin/perl
248
249 #node 10 -> 4
250
251--- openssl-0.9.8m.orig/crypto/ripemd/asm/rmd-586.pl
252+++ openssl-0.9.8m/crypto/ripemd/asm/rmd-586.pl
253@@ -1,4 +1,4 @@
254-#!/usr/local/bin/perl
255+#!/usr/bin/perl
256
257 # Normal is the
258 # ripemd160_block_asm_data_order(RIPEMD160_CTX *c, ULONG *X,int blocks);
259--- openssl-0.9.8m.orig/crypto/rc4/asm/rc4-586.pl
260+++ openssl-0.9.8m/crypto/rc4/asm/rc4-586.pl
261@@ -1,4 +1,4 @@
262-#!/usr/local/bin/perl
263+#!/usr/bin/perl
264
265 # At some point it became apparent that the original SSLeay RC4
266 # assembler implementation performs suboptimaly on latest IA-32
267--- openssl-0.9.8m.orig/crypto/rc4/asm/rc4-x86_64.pl
268+++ openssl-0.9.8m/crypto/rc4/asm/rc4-x86_64.pl
269@@ -1,4 +1,4 @@
270-#!/usr/bin/env perl
271+#!/usr/bin/perl
272 #
273 # ====================================================================
274 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
275--- openssl-0.9.8m.orig/crypto/cast/asm/cast-586.pl
276+++ openssl-0.9.8m/crypto/cast/asm/cast-586.pl
277@@ -1,4 +1,4 @@
278-#!/usr/local/bin/perl
279+#!/usr/bin/perl
280
281 # define for pentium pro friendly version
282 $ppro=1;
283--- openssl-0.9.8m.orig/crypto/rc5/asm/rc5-586.pl
284+++ openssl-0.9.8m/crypto/rc5/asm/rc5-586.pl
285@@ -1,4 +1,4 @@
286-#!/usr/local/bin/perl
287+#!/usr/bin/perl
288
289 push(@INC,"perlasm","../../perlasm");
290 require "x86asm.pl";
291--- openssl-0.9.8m.orig/crypto/perlasm/x86ms.pl
292+++ openssl-0.9.8m/crypto/perlasm/x86ms.pl
293@@ -1,4 +1,4 @@
294-#!/usr/local/bin/perl
295+#!/usr/bin/perl
296
297 package x86ms;
298
299--- openssl-0.9.8m.orig/crypto/perlasm/x86asm.pl
300+++ openssl-0.9.8m/crypto/perlasm/x86asm.pl
301@@ -1,4 +1,4 @@
302-#!/usr/local/bin/perl
303+#!/usr/bin/perl
304
305 # require 'x86asm.pl';
306 # &asm_init("cpp","des-586.pl");
307--- openssl-0.9.8m.orig/crypto/perlasm/x86nasm.pl
308+++ openssl-0.9.8m/crypto/perlasm/x86nasm.pl
309@@ -1,4 +1,4 @@
310-#!/usr/local/bin/perl
311+#!/usr/bin/perl
312
313 package x86nasm;
314
315--- openssl-0.9.8m.orig/crypto/perlasm/x86unix.pl
316+++ openssl-0.9.8m/crypto/perlasm/x86unix.pl
317@@ -1,4 +1,4 @@
318-#!/usr/local/bin/perl
319+#!/usr/bin/perl
320
321 package x86unix; # GAS actually...
322
323--- openssl-0.9.8m.orig/crypto/perlasm/cbc.pl
324+++ openssl-0.9.8m/crypto/perlasm/cbc.pl
325@@ -1,4 +1,4 @@
326-#!/usr/local/bin/perl
327+#!/usr/bin/perl
328
329 # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc)
330 # des_cblock (*input);
331--- openssl-0.9.8m.orig/crypto/perlasm/x86_64-xlate.pl
332+++ openssl-0.9.8m/crypto/perlasm/x86_64-xlate.pl
333@@ -1,4 +1,4 @@
334-#!/usr/bin/env perl
335+#!/usr/bin/perl
336
337 # Ascetic x86_64 AT&T to MASM assembler translator by <appro>.
338 #
339--- openssl-0.9.8m.orig/crypto/bf/asm/bf-686.pl
340+++ openssl-0.9.8m/crypto/bf/asm/bf-686.pl
341@@ -1,4 +1,4 @@
342-#!/usr/local/bin/perl
343+#!/usr/bin/perl
344
345 push(@INC,"perlasm","../../perlasm");
346 require "x86asm.pl";
347--- openssl-0.9.8m.orig/crypto/bf/asm/bf-586.pl
348+++ openssl-0.9.8m/crypto/bf/asm/bf-586.pl
349@@ -1,4 +1,4 @@
350-#!/usr/local/bin/perl
351+#!/usr/bin/perl
352
353 push(@INC,"perlasm","../../perlasm");
354 require "x86asm.pl";
355--- openssl-0.9.8m.orig/crypto/objects/objects.pl
356+++ openssl-0.9.8m/crypto/objects/objects.pl
357@@ -1,4 +1,4 @@
358-#!/usr/local/bin/perl
359+#!/usr/bin/perl
360
361 open (NUMIN,"$ARGV[1]") || die "Can't open number file $ARGV[1]";
362 $max_nid=0;
363--- openssl-0.9.8m.orig/crypto/objects/obj_dat.pl
364+++ openssl-0.9.8m/crypto/objects/obj_dat.pl
365@@ -1,4 +1,4 @@
366-#!/usr/local/bin/perl
367+#!/usr/bin/perl
368
369 # fixes bug in floating point emulation on sparc64 when
370 # this script produces off-by-one output on sparc64
371--- openssl-0.9.8m.orig/crypto/conf/keysets.pl
372+++ openssl-0.9.8m/crypto/conf/keysets.pl
373@@ -1,4 +1,4 @@
374-#!/usr/local/bin/perl
375+#!/usr/bin/perl
376
377 $NUMBER=0x01;
378 $UPPER=0x02;
379--- openssl-0.9.8m.orig/crypto/bn/bn_prime.pl
380+++ openssl-0.9.8m/crypto/bn/bn_prime.pl
381@@ -1,4 +1,4 @@
382-#!/usr/local/bin/perl
383+#!/usr/bin/perl
384 # bn_prime.pl
385
386 $num=2048;
387--- openssl-0.9.8m.orig/crypto/bn/asm/x86.pl
388+++ openssl-0.9.8m/crypto/bn/asm/x86.pl
389@@ -1,4 +1,4 @@
390-#!/usr/local/bin/perl
391+#!/usr/bin/perl
392
393 push(@INC,"perlasm","../../perlasm");
394 require "x86asm.pl";
395--- openssl-0.9.8m.orig/crypto/bn/asm/ppc.pl
396+++ openssl-0.9.8m/crypto/bn/asm/ppc.pl
397@@ -1,4 +1,4 @@
398-#!/usr/bin/env perl
399+#!/usr/bin/perl
400 #
401 # Implemented as a Perl wrapper as we want to support several different
402 # architectures with single file. We pick up the target based on the
403--- openssl-0.9.8m.orig/crypto/bn/asm/co-586.pl
404+++ openssl-0.9.8m/crypto/bn/asm/co-586.pl
405@@ -1,4 +1,4 @@
406-#!/usr/local/bin/perl
407+#!/usr/bin/perl
408
409 push(@INC,"perlasm","../../perlasm");
410 require "x86asm.pl";
411--- openssl-0.9.8m.orig/crypto/bn/asm/bn-586.pl
412+++ openssl-0.9.8m/crypto/bn/asm/bn-586.pl
413@@ -1,4 +1,4 @@
414-#!/usr/local/bin/perl
415+#!/usr/bin/perl
416
417 push(@INC,"perlasm","../../perlasm");
418 require "x86asm.pl";
419--- openssl-0.9.8m.orig/crypto/bn/asm/mo-586.pl
420+++ openssl-0.9.8m/crypto/bn/asm/mo-586.pl
421@@ -1,4 +1,4 @@
422-#!/usr/bin/env perl
423+#!/usr/bin/perl
424
425 # This is crypto/bn/asm/x86-mont.pl (with asciz from crypto/perlasm/x86asm.pl)
426 # from OpenSSL 0.9.9-dev
427--- openssl-0.9.8m.orig/crypto/bn/asm/x86_64-mont.pl
428+++ openssl-0.9.8m/crypto/bn/asm/x86_64-mont.pl
429@@ -1,4 +1,4 @@
430-#!/usr/bin/env perl
431+#!/usr/bin/perl
432
433 # ====================================================================
434 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
435--- openssl-0.9.8m.orig/crypto/bn/asm/x86/comba.pl
436+++ openssl-0.9.8m/crypto/bn/asm/x86/comba.pl
437@@ -1,4 +1,4 @@
438-#!/usr/local/bin/perl
439+#!/usr/bin/perl
440 # x86 assember
441
442 sub mul_add_c
443--- openssl-0.9.8m.orig/crypto/bn/asm/x86/add.pl
444+++ openssl-0.9.8m/crypto/bn/asm/x86/add.pl
445@@ -1,4 +1,4 @@
446-#!/usr/local/bin/perl
447+#!/usr/bin/perl
448 # x86 assember
449
450 sub bn_add_words
451--- openssl-0.9.8m.orig/crypto/bn/asm/x86/mul.pl
452+++ openssl-0.9.8m/crypto/bn/asm/x86/mul.pl
453@@ -1,4 +1,4 @@
454-#!/usr/local/bin/perl
455+#!/usr/bin/perl
456 # x86 assember
457
458 sub bn_mul_words
459--- openssl-0.9.8m.orig/crypto/bn/asm/x86/mul_add.pl
460+++ openssl-0.9.8m/crypto/bn/asm/x86/mul_add.pl
461@@ -1,4 +1,4 @@
462-#!/usr/local/bin/perl
463+#!/usr/bin/perl
464 # x86 assember
465
466 sub bn_mul_add_words
467--- openssl-0.9.8m.orig/crypto/bn/asm/x86/sqr.pl
468+++ openssl-0.9.8m/crypto/bn/asm/x86/sqr.pl
469@@ -1,4 +1,4 @@
470-#!/usr/local/bin/perl
471+#!/usr/bin/perl
472 # x86 assember
473
474 sub bn_sqr_words
475--- openssl-0.9.8m.orig/crypto/bn/asm/x86/sub.pl
476+++ openssl-0.9.8m/crypto/bn/asm/x86/sub.pl
477@@ -1,4 +1,4 @@
478-#!/usr/local/bin/perl
479+#!/usr/bin/perl
480 # x86 assember
481
482 sub bn_sub_words
483--- openssl-0.9.8m.orig/crypto/bn/asm/x86/div.pl
484+++ openssl-0.9.8m/crypto/bn/asm/x86/div.pl
485@@ -1,4 +1,4 @@
486-#!/usr/local/bin/perl
487+#!/usr/bin/perl
488 # x86 assember
489
490 sub bn_div_words
491--- openssl-0.9.8m.orig/crypto/aes/asm/aes-586.pl
492+++ openssl-0.9.8m/crypto/aes/asm/aes-586.pl
493@@ -1,4 +1,4 @@
494-#!/usr/bin/env perl
495+#!/usr/bin/perl
496 #
497 # ====================================================================
498 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
499--- openssl-0.9.8m.orig/crypto/aes/asm/aes-x86_64.pl
500+++ openssl-0.9.8m/crypto/aes/asm/aes-x86_64.pl
501@@ -1,4 +1,4 @@
502-#!/usr/bin/env perl
503+#!/usr/bin/perl
504 #
505 # ====================================================================
506 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
507--- openssl-0.9.8m.orig/crypto/asn1/charmap.pl
508+++ openssl-0.9.8m/crypto/asn1/charmap.pl
509@@ -1,4 +1,4 @@
510-#!/usr/local/bin/perl -w
511+#!/usr/bin/perl
512
513 use strict;
514
515--- openssl-0.9.8m.orig/util/mksdef.pl
516+++ openssl-0.9.8m/util/mksdef.pl
517@@ -1,4 +1,4 @@
518-
519+#!/usr/bin/perl
520 # Perl script to split libeay32.def into two distinct DEF files for use in
521 # fipdso mode. It works out symbols in each case by running "link" command and
522 # parsing the output to find the list of missing symbols then splitting
523--- openssl-0.9.8m.orig/util/dirname.pl
524+++ openssl-0.9.8m/util/dirname.pl
525@@ -1,4 +1,4 @@
526-#!/usr/local/bin/perl
527+#!/usr/bin/perl
528
529 if ($#ARGV < 0) {
530 die "dirname.pl: too few arguments\n";
531--- openssl-0.9.8m.orig/util/tab_num.pl
532+++ openssl-0.9.8m/util/tab_num.pl
533@@ -1,4 +1,4 @@
534-#!/usr/local/bin/perl
535+#!/usr/bin/perl
536
537 $num=1;
538 $width=40;
539--- openssl-0.9.8m.orig/util/sp-diff.pl
540+++ openssl-0.9.8m/util/sp-diff.pl
541@@ -1,4 +1,4 @@
542-#!/usr/local/bin/perl
543+#!/usr/bin/perl
544 #
545 # This file takes as input, the files that have been output from
546 # ssleay speed.
547--- openssl-0.9.8m.orig/util/mkerr.pl
548+++ openssl-0.9.8m/util/mkerr.pl
549@@ -1,4 +1,4 @@
550-#!/usr/local/bin/perl -w
551+#!/usr/bin/perl
552
553 my $config = "crypto/err/openssl.ec";
554 my $debug = 0;
555--- openssl-0.9.8m.orig/util/clean-depend.pl
556+++ openssl-0.9.8m/util/clean-depend.pl
557@@ -1,4 +1,4 @@
558-#!/usr/local/bin/perl -w
559+#!/usr/bin/perl
560 # Clean the dependency list in a makefile of standard includes...
561 # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
562
563--- openssl-0.9.8m.orig/util/add_cr.pl
564+++ openssl-0.9.8m/util/add_cr.pl
565@@ -1,4 +1,4 @@
566-#!/usr/local/bin/perl
567+#!/usr/bin/perl
568 #
569 # This adds a copyright message to a souce code file.
570 # It also gets the file name correct.
571--- openssl-0.9.8m.orig/util/pod2man.pl
572+++ openssl-0.9.8m/util/pod2man.pl
573@@ -1,4 +1,4 @@
574-: #!/usr/bin/perl-5.005
575+#!/usr/bin/perl
576 eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
577 if $running_under_some_shell;
578
579--- openssl-0.9.8m.orig/util/mkstack.pl
580+++ openssl-0.9.8m/util/mkstack.pl
581@@ -1,4 +1,4 @@
582-#!/usr/local/bin/perl -w
583+#!/usr/bin/perl
584
585 # This is a utility that searches out "DECLARE_STACK_OF()"
586 # declarations in .h and .c files, and updates/creates/replaces
587--- openssl-0.9.8m.orig/util/selftest.pl
588+++ openssl-0.9.8m/util/selftest.pl
589@@ -1,4 +1,4 @@
590-#!/usr/local/bin/perl -w
591+#!/usr/bin/perl
592 #
593 # Run the test suite and generate a report
594 #
595--- openssl-0.9.8m.orig/util/ck_errf.pl
596+++ openssl-0.9.8m/util/ck_errf.pl
597@@ -1,4 +1,4 @@
598-#!/usr/local/bin/perl
599+#!/usr/bin/perl
600 #
601 # This is just a quick script to scan for cases where the 'error'
602 # function name in a XXXerr() macro is wrong.
603--- openssl-0.9.8m.orig/util/mklink.pl
604+++ openssl-0.9.8m/util/mklink.pl
605@@ -1,4 +1,4 @@
606-#!/usr/local/bin/perl
607+#!/usr/bin/perl
608
609 # mklink.pl
610
611--- openssl-0.9.8m.orig/util/src-dep.pl
612+++ openssl-0.9.8m/util/src-dep.pl
613@@ -1,4 +1,4 @@
614-#!/usr/local/bin/perl
615+#!/usr/bin/perl
616
617 # we make up an array of
618 # $file{function_name}=filename;
619--- openssl-0.9.8m.orig/util/deleof.pl
620+++ openssl-0.9.8m/util/deleof.pl
621@@ -1,4 +1,4 @@
622-#!/usr/local/bin/perl
623+#!/usr/bin/perl
624
625 while (<>)
626 {
627--- openssl-0.9.8m.orig/util/arx.pl
628+++ openssl-0.9.8m/util/arx.pl
629@@ -1,4 +1,4 @@
630-#!/bin/perl
631+#!/usr/bin/perl
632
633 # Simple perl script to wrap round "ar" program and exclude any
634 # object files in the environment variable EXCL_OBJ
635--- openssl-0.9.8m.orig/util/copy.pl
636+++ openssl-0.9.8m/util/copy.pl
637@@ -1,4 +1,4 @@
638-#!/usr/local/bin/perl
639+#!/usr/bin/perl
640
641 use Fcntl;
642
643--- openssl-0.9.8m.orig/util/mkdir-p.pl
644+++ openssl-0.9.8m/util/mkdir-p.pl
645@@ -1,4 +1,4 @@
646-#!/usr/local/bin/perl
647+#!/usr/bin/perl
648
649 # mkdir-p.pl
650
651--- openssl-0.9.8m.orig/util/mkdef.pl
652+++ openssl-0.9.8m/util/mkdef.pl
653@@ -1,4 +1,4 @@
654-#!/usr/local/bin/perl -w
655+#!/usr/bin/perl
656 #
657 # generate a .def file
658 #
659--- openssl-0.9.8m.orig/util/files.pl
660+++ openssl-0.9.8m/util/files.pl
661@@ -1,4 +1,4 @@
662-#!/usr/local/bin/perl
663+#!/usr/bin/perl
664 #
665 # used to generate the file MINFO for use by util/mk1mf.pl
666 # It is basically a list of all variables from the passed makefile
667--- openssl-0.9.8m.orig/util/mkfiles.pl
668+++ openssl-0.9.8m/util/mkfiles.pl
669@@ -1,4 +1,4 @@
670-#!/usr/local/bin/perl
671+#!/usr/bin/perl
672 #
673 # This is a hacked version of files.pl for systems that can't do a 'make files'.
674 # Do a perl util/mkminfo.pl >MINFO to build MINFO
675--- openssl-0.9.8m.orig/util/perlpath.pl
676+++ openssl-0.9.8m/util/perlpath.pl
677@@ -1,4 +1,4 @@
678-#!/usr/local/bin/perl
679+#!/usr/bin/perl
680 #
681 # modify the '#!/usr/local/bin/perl'
682 # line in all scripts that rely on perl.
683--- openssl-0.9.8m.orig/util/mk1mf.pl
684+++ openssl-0.9.8m/util/mk1mf.pl
685@@ -1,4 +1,4 @@
686-#!/usr/local/bin/perl
687+#!/usr/bin/perl
688 # A bit of an evil hack but it post processes the file ../MINFO which
689 # is generated by `make files` in the top directory.
690 # This script outputs one mega makefile that has no shell stuff or any
691--- openssl-0.9.8m.orig/util/err-ins.pl
692+++ openssl-0.9.8m/util/err-ins.pl
693@@ -1,4 +1,4 @@
694-#!/usr/local/bin/perl
695+#!/usr/bin/perl
696 #
697 # tack error codes onto the end of a file
698 #
699--- openssl-0.9.8m.orig/util/pl/Mingw32.pl
700+++ openssl-0.9.8m/util/pl/Mingw32.pl
701@@ -1,4 +1,4 @@
702-#!/usr/local/bin/perl
703+#!/usr/bin/perl
704 #
705 # Mingw32.pl -- Mingw
706 #
707--- openssl-0.9.8m.orig/util/pl/unix.pl
708+++ openssl-0.9.8m/util/pl/unix.pl
709@@ -1,4 +1,4 @@
710-#!/usr/local/bin/perl
711+#!/usr/bin/perl
712 #
713 # unix.pl - the standard unix makefile stuff.
714 #
715--- openssl-0.9.8m.orig/util/pl/netware.pl
716+++ openssl-0.9.8m/util/pl/netware.pl
717@@ -1,4 +1,4 @@
718-# Metrowerks Codewarrior or gcc / nlmconv for NetWare
719+#!/usr/bin/perl
720 #
721
722 $version_header = "crypto/opensslv.h";
723--- openssl-0.9.8m.orig/util/pl/VC-32.pl
724+++ openssl-0.9.8m/util/pl/VC-32.pl
725@@ -1,4 +1,4 @@
726-#!/usr/local/bin/perl
727+#!/usr/bin/perl
728 # VC-32.pl - unified script for Microsoft Visual C++, covering Win32,
729 # Win64 and WinCE [follow $FLAVOR variable to trace the differences].
730 #
731--- openssl-0.9.8m.orig/util/pl/OS2-EMX.pl
732+++ openssl-0.9.8m/util/pl/OS2-EMX.pl
733@@ -1,4 +1,4 @@
734-#!/usr/local/bin/perl
735+#!/usr/bin/perl
736 #
737 # OS2-EMX.pl - for EMX GCC on OS/2
738 #
739--- openssl-0.9.8m.orig/util/pl/ultrix.pl
740+++ openssl-0.9.8m/util/pl/ultrix.pl
741@@ -1,4 +1,4 @@
742-#!/usr/local/bin/perl
743+#!/usr/bin/perl
744 #
745 # linux.pl - the standard unix makefile stuff.
746 #
747--- openssl-0.9.8m.orig/util/pl/linux.pl
748+++ openssl-0.9.8m/util/pl/linux.pl
749@@ -1,4 +1,4 @@
750-#!/usr/local/bin/perl
751+#!/usr/bin/perl
752 #
753 # linux.pl - the standard unix makefile stuff.
754 #
755--- openssl-0.9.8m.orig/util/pl/BC-32.pl
756+++ openssl-0.9.8m/util/pl/BC-32.pl
757@@ -1,4 +1,4 @@
758-#!/usr/local/bin/perl
759+#!/usr/bin/perl
760 # Borland C++ builder 3 and 4 -- Janez Jere <jj@void.si>
761 #
762
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pic.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pic.patch
deleted file mode 100644
index 5fc8f65..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pic.patch
+++ /dev/null
@@ -1,303 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8o/crypto/Makefile
4===================================================================
5--- openssl-0.9.8o.orig/crypto/Makefile 2008-09-17 17:10:55.000000000 +0000
6+++ openssl-0.9.8o/crypto/Makefile 2010-06-06 13:09:28.000000000 +0000
7@@ -57,7 +57,7 @@
8 echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
9 echo '#endif' ) >buildinf.h
10
11-x86cpuid-elf.s: x86cpuid.pl perlasm/x86asm.pl
12+x86cpuid-elf.S: x86cpuid.pl perlasm/x86asm.pl
13 $(PERL) x86cpuid.pl elf $(CFLAGS) $(PROCESSOR) > $@
14 x86cpuid-cof.s: x86cpuid.pl perlasm/x86asm.pl
15 $(PERL) x86cpuid.pl coff $(CFLAGS) $(PROCESSOR) > $@
16@@ -70,7 +70,7 @@
17 uplink-cof.s: ../ms/uplink.pl
18 $(PERL) ../ms/uplink.pl coff > $@
19
20-x86_64cpuid.s: x86_64cpuid.pl
21+x86_64cpuid.S: x86_64cpuid.pl
22 $(PERL) x86_64cpuid.pl $@
23 ia64cpuid.s: ia64cpuid.S
24 $(CC) $(CFLAGS) -E ia64cpuid.S > $@
25Index: openssl-0.9.8o/crypto/x86_64cpuid.pl
26===================================================================
27--- openssl-0.9.8o.orig/crypto/x86_64cpuid.pl 2007-11-11 16:25:00.000000000 +0000
28+++ openssl-0.9.8o/crypto/x86_64cpuid.pl 2010-06-06 13:09:28.000000000 +0000
29@@ -95,7 +95,11 @@
30 .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
31
32 .section .init
33+#ifdef OPENSSL_PIC
34+ call OPENSSL_cpuid_setup\@PLT
35+#else
36 call OPENSSL_cpuid_setup
37+#endif
38
39 ___
40
41Index: openssl-0.9.8o/crypto/md5/Makefile
42===================================================================
43--- openssl-0.9.8o.orig/crypto/md5/Makefile 2008-09-17 17:11:02.000000000 +0000
44+++ openssl-0.9.8o/crypto/md5/Makefile 2010-06-06 13:09:28.000000000 +0000
45@@ -52,7 +52,8 @@
46 mx86-out.s: asm/md5-586.pl ../perlasm/x86asm.pl
47 (cd asm; $(PERL) md5-586.pl a.out $(CFLAGS) > ../$@)
48
49-md5-x86_64.s: asm/md5-x86_64.pl; $(PERL) asm/md5-x86_64.pl $@
50+md5-x86_64.s: asm/md5-x86_64.pl
51+ $(PERL) asm/md5-x86_64.pl $@
52
53 files:
54 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
55Index: openssl-0.9.8o/crypto/des/asm/desboth.pl
56===================================================================
57--- openssl-0.9.8o.orig/crypto/des/asm/desboth.pl 2001-10-24 21:20:56.000000000 +0000
58+++ openssl-0.9.8o/crypto/des/asm/desboth.pl 2010-06-06 13:09:28.000000000 +0000
59@@ -16,6 +16,11 @@
60
61 &push("edi");
62
63+ &call (&label("pic_point0"));
64+ &set_label("pic_point0");
65+ &blindpop("ebp");
66+ &add ("ebp", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
67+
68 &comment("");
69 &comment("Load the data words");
70 &mov($L,&DWP(0,"ebx","",0));
71@@ -47,15 +52,21 @@
72 &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
73 &mov(&swtmp(1), "eax");
74 &mov(&swtmp(0), "ebx");
75- &call("DES_encrypt2");
76+ &exch("ebx", "ebp");
77+ &call("DES_encrypt2\@PLT");
78+ &exch("ebx", "ebp");
79 &mov(&swtmp(2), (DWC(($enc)?"0":"1")));
80 &mov(&swtmp(1), "edi");
81 &mov(&swtmp(0), "ebx");
82- &call("DES_encrypt2");
83+ &exch("ebx", "ebp");
84+ &call("DES_encrypt2\@PLT");
85+ &exch("ebx", "ebp");
86 &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
87 &mov(&swtmp(1), "esi");
88 &mov(&swtmp(0), "ebx");
89- &call("DES_encrypt2");
90+ &exch("ebx", "ebp");
91+ &call("DES_encrypt2\@PLT");
92+ &exch("ebx", "ebp");
93
94 &stack_pop(3);
95 &mov($L,&DWP(0,"ebx","",0));
96Index: openssl-0.9.8o/crypto/rc4/Makefile
97===================================================================
98--- openssl-0.9.8o.orig/crypto/rc4/Makefile 2008-11-19 16:03:50.000000000 +0000
99+++ openssl-0.9.8o/crypto/rc4/Makefile 2010-06-06 13:09:28.000000000 +0000
100@@ -51,7 +51,7 @@
101 rx86-out.s: asm/rc4-586.pl ../perlasm/x86asm.pl
102 (cd asm; $(PERL) rc4-586.pl a.out $(CFLAGS) > ../$@)
103
104-rc4-x86_64.s: asm/rc4-x86_64.pl; $(PERL) asm/rc4-x86_64.pl $@
105+rc4-x86_64.S: asm/rc4-x86_64.pl; $(PERL) asm/rc4-x86_64.pl $@
106
107 rc4-ia64.s: asm/rc4-ia64.S
108 @case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \
109Index: openssl-0.9.8o/crypto/rc4/asm/rc4-x86_64.pl
110===================================================================
111--- openssl-0.9.8o.orig/crypto/rc4/asm/rc4-x86_64.pl 2008-09-16 10:47:27.000000000 +0000
112+++ openssl-0.9.8o/crypto/rc4/asm/rc4-x86_64.pl 2010-06-06 13:09:28.000000000 +0000
113@@ -270,7 +270,11 @@
114 xor %r10,%r10
115 xor %r11,%r11
116
117+#ifdef OPENSSL_PIC
118+ mov OPENSSL_ia32cap_P\@GOTPCREL(%rip),$idx#d
119+#else
120 mov OPENSSL_ia32cap_P(%rip),$idx#d
121+#endif
122 bt \$20,$idx#d
123 jnc .Lw1stloop
124 bt \$30,$idx#d
125@@ -338,7 +342,11 @@
126 RC4_options:
127 .picmeup %rax
128 lea .Lopts-.(%rax),%rax
129+#ifdef OPENSSL_PIC
130+ mov OPENSSL_ia32cap_P\@GOTPCREL(%rip),%edx
131+#else
132 mov OPENSSL_ia32cap_P(%rip),%edx
133+#endif
134 bt \$20,%edx
135 jnc .Ldone
136 add \$12,%rax
137Index: openssl-0.9.8o/crypto/perlasm/x86unix.pl
138===================================================================
139--- openssl-0.9.8o.orig/crypto/perlasm/x86unix.pl 2008-05-01 23:11:32.000000000 +0000
140+++ openssl-0.9.8o/crypto/perlasm/x86unix.pl 2010-06-06 13:09:28.000000000 +0000
141@@ -400,6 +400,29 @@
142 $stack=4;
143 }
144
145+sub main'function_begin_B_static
146+ {
147+ local($func,$extra)=@_;
148+
149+ &main'external_label($func);
150+ $func=$under.$func;
151+
152+ local($tmp)=<<"EOF";
153+.text
154+EOF
155+ push(@out,$tmp);
156+ if ($main'cpp)
157+ { push(@out,"TYPE($func,\@function)\n"); }
158+ elsif ($main'coff)
159+ { $tmp=push(@out,".def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
160+ elsif ($main'aout and !$main'pic)
161+ { }
162+ else { push(@out,".type $func,\@function\n"); }
163+ push(@out,".align\t$align\n");
164+ push(@out,"$func:\n");
165+ $stack=4;
166+ }
167+
168 sub main'function_end
169 {
170 local($func)=@_;
171@@ -694,7 +717,17 @@
172 {
173 $tmp=<<___;
174 .section .init
175+#ifdef OPENSSL_PIC
176+ pushl %ebx
177+ call .pic_point0
178+.pic_point0:
179+ popl %ebx
180+ addl \$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx
181+ call $under$f\@PLT
182+ popl %ebx
183+#else
184 call $under$f
185+#endif
186 jmp .Linitalign
187 .align $align
188 .Linitalign:
189Index: openssl-0.9.8o/crypto/perlasm/cbc.pl
190===================================================================
191--- openssl-0.9.8o.orig/crypto/perlasm/cbc.pl 2005-05-09 21:48:00.000000000 +0000
192+++ openssl-0.9.8o/crypto/perlasm/cbc.pl 2010-06-06 13:09:28.000000000 +0000
193@@ -122,7 +122,11 @@
194 &mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call
195 &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
196
197- &call($enc_func);
198+ &call (&label("pic_point0"));
199+ &set_label("pic_point0");
200+ &blindpop("ebx");
201+ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
202+ &call("$enc_func\@PLT");
203
204 &mov("eax", &DWP($data_off,"esp","",0));
205 &mov("ebx", &DWP($data_off+4,"esp","",0));
206@@ -187,7 +191,11 @@
207 &mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call
208 &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
209
210- &call($enc_func);
211+ &call (&label("pic_point1"));
212+ &set_label("pic_point1");
213+ &blindpop("ebx");
214+ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point1") . "]");
215+ &call("$enc_func\@PLT");
216
217 &mov("eax", &DWP($data_off,"esp","",0));
218 &mov("ebx", &DWP($data_off+4,"esp","",0));
219@@ -220,7 +228,11 @@
220 &mov(&DWP($data_off,"esp","",0), "eax"); # put back
221 &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
222
223- &call($dec_func);
224+ &call (&label("pic_point2"));
225+ &set_label("pic_point2");
226+ &blindpop("ebx");
227+ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point2") . "]");
228+ &call("$dec_func\@PLT");
229
230 &mov("eax", &DWP($data_off,"esp","",0)); # get return
231 &mov("ebx", &DWP($data_off+4,"esp","",0)); #
232@@ -263,7 +275,11 @@
233 &mov(&DWP($data_off,"esp","",0), "eax"); # put back
234 &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
235
236- &call($dec_func);
237+ &call (&label("pic_point3"));
238+ &set_label("pic_point3");
239+ &blindpop("ebx");
240+ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point3") . "]");
241+ &call("$dec_func\@PLT");
242
243 &mov("eax", &DWP($data_off,"esp","",0)); # get return
244 &mov("ebx", &DWP($data_off+4,"esp","",0)); #
245Index: openssl-0.9.8o/crypto/perlasm/x86_64-xlate.pl
246===================================================================
247--- openssl-0.9.8o.orig/crypto/perlasm/x86_64-xlate.pl 2010-06-06 13:09:00.000000000 +0000
248+++ openssl-0.9.8o/crypto/perlasm/x86_64-xlate.pl 2010-06-06 13:09:28.000000000 +0000
249@@ -435,7 +435,7 @@
250
251 chomp($line);
252
253- $line =~ s|[#!].*$||; # get rid of asm-style comments...
254+# $line =~ s|[#!].*$||; # get rid of asm-style comments...
255 $line =~ s|/\*.*\*/||; # ... and C-style comments...
256 $line =~ s|^\s+||; # ... and skip white spaces in beginning
257
258Index: openssl-0.9.8o/crypto/aes/asm/aes-586.pl
259===================================================================
260--- openssl-0.9.8o.orig/crypto/aes/asm/aes-586.pl 2008-12-17 14:14:51.000000000 +0000
261+++ openssl-0.9.8o/crypto/aes/asm/aes-586.pl 2010-06-06 13:09:28.000000000 +0000
262@@ -250,7 +250,7 @@
263 sub _data_word() { my $i; while(defined($i=shift)) { &data_word($i,$i); } }
264
265 &public_label("AES_Te");
266-&function_begin_B("_x86_AES_encrypt");
267+&function_begin_B_static("_x86_AES_encrypt");
268 if ($vertical_spin) {
269 # I need high parts of volatile registers to be accessible...
270 &exch ($s1="edi",$key="ebx");
271@@ -539,7 +539,7 @@
272 }
273
274 &public_label("AES_Td");
275-&function_begin_B("_x86_AES_decrypt");
276+&function_begin_B_static("_x86_AES_decrypt");
277 # note that caller is expected to allocate stack frame for me!
278 &mov (&DWP(12,"esp"),$key); # save key
279
280@@ -1461,15 +1461,22 @@
281 &public_label("AES_Td");
282 &public_label("AES_Te");
283 &function_begin_B("AES_set_decrypt_key");
284+ &push ("ebx");
285 &mov ("eax",&wparam(0));
286 &mov ("ecx",&wparam(1));
287 &mov ("edx",&wparam(2));
288 &sub ("esp",12);
289+
290+ &call (&label("pic_point0"));
291+ &set_label("pic_point0");
292+ &blindpop("ebx");
293+ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
294 &mov (&DWP(0,"esp"),"eax");
295 &mov (&DWP(4,"esp"),"ecx");
296 &mov (&DWP(8,"esp"),"edx");
297- &call ("AES_set_encrypt_key");
298+ &call ("AES_set_encrypt_key\@PLT");
299 &add ("esp",12);
300+ &pop ("ebx");
301 &cmp ("eax",0);
302 &je (&label("proceed"));
303 &ret ();
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pkg-config.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pkg-config.patch
deleted file mode 100644
index 46c6f03..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pkg-config.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/Makefile.org
4===================================================================
5--- openssl-0.9.8k.orig/Makefile.org 2009-07-19 11:34:56.000000000 +0200
6+++ openssl-0.9.8k/Makefile.org 2009-07-19 11:36:02.000000000 +0200
7@@ -444,7 +444,8 @@
8 echo 'Description: OpenSSL cryptography library'; \
9 echo 'Version: '$(VERSION); \
10 echo 'Requires: '; \
11- echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
12+ echo 'Libs: -L$${libdir} -lcrypto'; \
13+ echo 'Libs.private: $(EX_LIBS)'; \
14 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
15
16 libssl.pc: Makefile
17@@ -457,7 +458,8 @@
18 echo 'Description: Secure Sockets Layer and cryptography libraries'; \
19 echo 'Version: '$(VERSION); \
20 echo 'Requires: '; \
21- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
22+ echo 'Libs: -L$${libdir} -lssl'; \
23+ echo 'Libs.private: -lcrypto $(EX_LIBS)'; \
24 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
25
26 openssl.pc: Makefile
27@@ -470,7 +472,8 @@
28 echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
29 echo 'Version: '$(VERSION); \
30 echo 'Requires: '; \
31- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
32+ echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
33+ echo 'Libs.private: $(EX_LIBS)'; \
34 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
35
36 Makefile: Makefile.org Configure config
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rc4-amd64.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rc4-amd64.patch
deleted file mode 100644
index f57fbc9..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rc4-amd64.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/Configure
4===================================================================
5--- openssl-0.9.8k.orig/Configure 2009-07-19 11:32:41.000000000 +0200
6+++ openssl-0.9.8k/Configure 2009-07-19 11:37:10.000000000 +0200
7@@ -128,6 +128,9 @@
8 my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o MAYBE-MO86-out.o:dx86-out.o yx86-out.o:ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o rc4_skey.o:rm86-out.o:r586-out.o";
9
10 my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o::";
11+# rc4 asm is disabled on amd64 because we configured it with RC4_CHAR while
12+# the assembler only works with int
13+my $x86_64_asm_linux="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::::";
14 my $ia64_asm=":bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o:::sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o::";
15
16 my $no_asm="::::::::::";
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash-crt.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash-crt.patch
deleted file mode 100644
index d9d6b70..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash-crt.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/tools/c_rehash.in
4===================================================================
5--- openssl-0.9.8k.orig/tools/c_rehash.in 2002-10-11 22:31:27.000000000 +0200
6+++ openssl-0.9.8k/tools/c_rehash.in 2009-07-19 11:36:26.000000000 +0200
7@@ -59,12 +59,15 @@
8 }
9 }
10 closedir DIR;
11- FILE: foreach $fname (grep {/\.pem$/} @flist) {
12+ FILE: foreach $fname (grep {/\.pem$|\.crt$/} @flist) {
13 # Check to see if certificates and/or CRLs present.
14 my ($cert, $crl) = check_file($fname);
15 if(!$cert && !$crl) {
16- print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
17- next;
18+ ($cert, $crl) = check_file("$openssl x509 -in \"$fname\" -inform der -outform pem | ");
19+ if(!$cert && !$crl) {
20+ print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
21+ next;
22+ }
23 }
24 link_hash_cert($fname) if($cert);
25 link_hash_crl($fname) if($crl);
26@@ -102,6 +105,9 @@
27 my $fname = $_[0];
28 $fname =~ s/'/'\\''/g;
29 my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname'`;
30+ if(!$hash || !fprint) {
31+ ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname' -inform der`;
32+ }
33 chomp $hash;
34 chomp $fprint;
35 $fprint =~ s/^.*=//;
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash_pod.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash_pod.patch
deleted file mode 100644
index 3426ba8..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash_pod.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/doc/apps/c_rehash.pod
4===================================================================
5--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6+++ openssl-0.9.8k/doc/apps/c_rehash.pod 2009-07-19 11:36:27.000000000 +0200
7@@ -0,0 +1,55 @@
8+
9+=pod
10+
11+=head1 NAME
12+
13+c_rehash - Create symbolic links to files named by the hash values
14+
15+=head1 SYNOPSIS
16+
17+B<c_rehash>
18+[directory] ...
19+
20+=head1 DESCRIPTION
21+
22+c_rehash scans directories and takes a hash value of each .pem and .crt file in the directory. It then creates symbolic links for each of the files named by the hash value. This is useful as many programs require directories to be set up like this in order to find the certificates they require.
23+
24+If any directories are named on the command line then these directories are processed in turn. If not then and the environment variable SSL_CERT_DIR is defined then that is consulted. This variable should be a colon (:) separated list of directories, all of which will be processed. If neither of these conditions are true then /usr/lib/ssl/certs is processed.
25+
26+For each directory that is to be processed he user must have write permissions on the directory, if they do not then nothing will be printed for that directory.
27+
28+Note that this program deletes all the symbolic links that look like ones that it creates before processing a directory. Beware that if you run the program on a directory that contains symbolic links for other purposes that are named in the same format as those created by this program they will be lost.
29+
30+The hashes for certificate files are of the form <hash>.<n> where n is an integer. If the hash value already exists then n will be incremented, unless the file is a duplicate. Duplicates are detected using the fingerprint of the certificate. A warning will be printed if a duplicate is detected. The hashes for CRL files are of the form <hash>.r<n> and have the same behavior.
31+
32+The program will also warn if there are files with extension .pem which are not certificate or CRL files.
33+
34+The program uses the openssl program to compute the hashes and fingerprints. It expects the executable to be named openssl and be on the PATH, or in the /usr/lib/ssl/bin directory. If the OPENSSL environment variable is defined then this is used instead as the executable that provides the hashes and fingerprints. When called as $OPENSSL x509 -hash -fingerprint -noout -in $file it must output the hash of $file on the first line followed by the fingerprint on the second line, optionally prefixed with some text and an equals sign (=).
35+
36+=head1 OPTIONS
37+
38+None
39+
40+=head1 ENVIRONMENT
41+
42+=over 4
43+
44+=item B<OPENSSL>
45+
46+The name (and path) of an executable to use to generate hashes and fingerprints (see above).
47+
48+=item B<SSL_CERT_DIR>
49+
50+Colon separated list of directories to operate on. Ignored if directories are listed on the command line.
51+
52+=head1 SEE ALSO
53+
54+L<openssl(1)|openssl(1)>, L<x509(1)|x509(1)>
55+
56+=back
57+
58+=head1 BUGS
59+
60+No known bugs
61+
62+=cut
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/series b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/series
deleted file mode 100644
index b764c04..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/series
+++ /dev/null
@@ -1,20 +0,0 @@
1ca.patch
2config-hurd.patch
3debian-targets.patch
4engines-path.patch
5kfreebsd-pipe.patch
6make-targets.patch
7man-dir.patch
8man-section.patch
9no-rpath.patch
10no-symbolic.patch
11pic.patch
12pkg-config.patch
13valgrind.patch
14rc4-amd64.patch
15rehash-crt.patch
16rehash_pod.patch
17shared-lib-ext.patch
18stddef.patch
19version-script.patch
20perl-path.diff
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/shared-lib-ext.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/shared-lib-ext.patch
deleted file mode 100644
index 79eb39f..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/shared-lib-ext.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/Configure
4===================================================================
5--- openssl-0.9.8k.orig/Configure 2009-07-19 11:36:24.000000000 +0200
6+++ openssl-0.9.8k/Configure 2009-07-19 11:37:03.000000000 +0200
7@@ -1568,7 +1568,8 @@
8 elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
9 {
10 my $sotmp = $1;
11- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
12+# s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
13+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
14 }
15 elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
16 {
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/stddef.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/stddef.patch
deleted file mode 100644
index 3436b29..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/stddef.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/crypto/sha/sha.h
4===================================================================
5--- openssl-0.9.8k.orig/crypto/sha/sha.h 2008-09-16 12:47:28.000000000 +0200
6+++ openssl-0.9.8k/crypto/sha/sha.h 2009-07-19 11:36:28.000000000 +0200
7@@ -59,6 +59,7 @@
8 #ifndef HEADER_SHA_H
9 #define HEADER_SHA_H
10
11+#include <stddef.h>
12 #include <openssl/e_os2.h>
13 #include <stddef.h>
14
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/version-script.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/version-script.patch
deleted file mode 100644
index 6fa3d75..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/version-script.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8m/Configure
4===================================================================
5--- openssl-0.9.8m.orig/Configure 2010-02-27 12:28:32.000000000 +0100
6+++ openssl-0.9.8m/Configure 2010-02-27 12:28:35.000000000 +0100
7@@ -1512,6 +1512,8 @@
8 }
9 }
10
11+$shared_ldflag .= " -Wl,--version-script=openssl.ld";
12+
13 open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
14 unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
15 open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
16Index: openssl-0.9.8m/openssl.ld
17===================================================================
18--- /dev/null 1970-01-01 00:00:00.000000000 +0000
19+++ openssl-0.9.8m/openssl.ld 2010-02-27 12:28:35.000000000 +0100
20@@ -0,0 +1,5 @@
21+OPENSSL_0.9.8 {
22+ global:
23+ *;
24+};
25+
26Index: openssl-0.9.8m/engines/openssl.ld
27===================================================================
28--- /dev/null 1970-01-01 00:00:00.000000000 +0000
29+++ openssl-0.9.8m/engines/openssl.ld 2010-02-27 12:28:35.000000000 +0100
30@@ -0,0 +1,5 @@
31+OPENSSL_0.9.8 {
32+ global:
33+ *;
34+};
35+
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/parallel-make-fix.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/parallel-make-fix.patch
deleted file mode 100644
index 82857f5..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/parallel-make-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Upstream-Status: Submitted
2
3fix the parallel build regarding shared libraries.
4
5Signed-off-by: Qing He <qing.he@intel.com>
6
7diff --git a/Makefile.org b/Makefile.org
8index 2fb0309..8bec3d0 100644
9--- a/Makefile.org
10+++ b/Makefile.org
11@@ -352,6 +352,9 @@ all_testapps: build_libs build_testapps
12 build_testapps:
13 @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
14
15+libcrypto.a: build_crypto
16+libssl.a: build_ssl
17+
18 build_shared: $(SHARED_LIBS)
19 libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
20 @if [ "$(SHLIB_TARGET)" != "" ]; then \
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/shared-libs.patch
deleted file mode 100644
index 19de112..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/shared-libs.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff --git a/Makefile.org b/Makefile.org
4index e87d623..25ff367 100644
5--- a/Makefile.org
6+++ b/Makefile.org
7@@ -355,7 +355,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
8 @if [ "$(SHLIB_TARGET)" != "" ]; then \
9 if [ "$(FIPSCANLIB)" = "libfips" ]; then \
10 $(ARD) libcrypto.a fipscanister.o ; \
11- $(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
12+ $(MAKE) -e SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
13 $(AR) libcrypto.a fips/fipscanister.o ; \
14 else \
15 if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
16@@ -373,7 +373,7 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
17 @if [ "$(SHLIB_TARGET)" != "" ]; then \
18 shlibdeps=-lcrypto; \
19 [ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \
20- $(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
21+ $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
22 else \
23 echo "There's no support for shared libraries on this platform" >&2 ; \
24 exit 1; \
25diff --git a/crypto/Makefile b/crypto/Makefile
26index 6557f2b..a69bf7c 100644
27--- a/crypto/Makefile
28+++ b/crypto/Makefile
29@@ -103,7 +103,7 @@ $(LIB): $(LIBOBJ)
30
31 shared: buildinf.h lib subdirs
32 if [ -n "$(SHARED_LIBS)" ]; then \
33- (cd ..; $(MAKE) $(SHARED_LIB)); \
34+ (cd ..; $(MAKE) -e $(SHARED_LIB)); \
35 fi
36
37 libs:
38diff --git a/ssl/Makefile b/ssl/Makefile
39index 5ac3507..77ea2bd 100644
40--- a/ssl/Makefile
41+++ b/ssl/Makefile
42@@ -62,7 +62,7 @@ lib: $(LIBOBJ)
43
44 shared: lib
45 if [ -n "$(SHARED_LIBS)" ]; then \
46- (cd ..; $(MAKE) $(SHARED_LIB)); \
47+ (cd ..; $(MAKE) -e $(SHARED_LIB)); \
48 fi
49
50 files:
diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8t.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8t.bb
deleted file mode 100644
index 74892c1..0000000
--- a/meta/recipes-connectivity/openssl/openssl_0.9.8t.bb
+++ /dev/null
@@ -1,31 +0,0 @@
1require openssl.inc
2
3PR = "r0"
4SRC_URI += "file://debian/ca.patch \
5 file://debian/config-hurd.patch;apply=no \
6 file://debian/debian-targets.patch \
7 file://debian/engines-path.patch \
8 file://debian/kfreebsd-pipe.patch;apply=no \
9 file://debian/make-targets.patch \
10 file://debian/man-dir.patch \
11 file://debian/man-section.patch \
12 file://debian/no-rpath.patch \
13 file://debian/no-symbolic.patch \
14 file://debian/pic.patch \
15 file://debian/pkg-config.patch \
16 file://debian/rc4-amd64.patch \
17 file://debian/rehash-crt.patch \
18 file://debian/rehash_pod.patch \
19 file://debian/shared-lib-ext.patch \
20 file://debian/stddef.patch \
21 file://debian/version-script.patch \
22 file://debian/perl-path.diff"
23
24SRC_URI += "file://configure-targets.patch \
25 file://shared-libs.patch \
26 file://parallel-make-fix.patch"
27
28SRC_URI[md5sum] = "fbf71e8e050bc1ec290b7468bab1a76e"
29SRC_URI[sha256sum] = "edc9639beaf2d5e239d8e5c9d2fe1959e6726a5d7f8ab8430613835f4623f9ba"
30
31BBCLASSEXTEND = "native nativesdk"