summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/openssl/openssl-0.9.7e/armeb.patch20
-rw-r--r--meta/packages/openssl/openssl-0.9.7e/debian.patch2589
-rw-r--r--meta/packages/openssl/openssl-0.9.7e/gnueabi-arm.patch15
-rw-r--r--meta/packages/openssl/openssl-0.9.7g/armeb.patch18
-rw-r--r--meta/packages/openssl/openssl-0.9.7g/debian.patch2808
-rw-r--r--meta/packages/openssl/openssl-0.9.7g/gnueabi-arm.patch15
-rw-r--r--meta/packages/openssl/openssl-0.9.8g/configure-targets.patch24
-rw-r--r--meta/packages/openssl/openssl-0.9.8g/debian.patch1281
-rw-r--r--meta/packages/openssl/openssl-0.9.8g/shared-libs.patch45
-rw-r--r--meta/packages/openssl/openssl-native_0.9.8g.bb (renamed from meta/packages/openssl/openssl-native_0.9.7g.bb)8
-rw-r--r--meta/packages/openssl/openssl.inc32
-rw-r--r--meta/packages/openssl/openssl_0.9.7e.bb7
-rw-r--r--meta/packages/openssl/openssl_0.9.7g.bb9
-rw-r--r--meta/packages/openssl/openssl_0.9.8g.bb11
14 files changed, 1384 insertions, 5498 deletions
diff --git a/meta/packages/openssl/openssl-0.9.7e/armeb.patch b/meta/packages/openssl/openssl-0.9.7e/armeb.patch
deleted file mode 100644
index 46632d568a..0000000000
--- a/meta/packages/openssl/openssl-0.9.7e/armeb.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Index: openssl-0.9.7e/Configure
2===================================================================
3--- openssl-0.9.7e.orig/Configure 2005-02-03 00:58:18.600626232 -0500
4+++ openssl-0.9.7e/Configure 2005-02-03 00:59:59.178336096 -0500
5@@ -385,6 +385,7 @@
6 "debian-alpha-ev4","gcc:-DTERMIO -O3 -mcpu=ev4 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
7 "debian-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
8 "debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
9+"debian-armeb","gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
10 #"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
11 "debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
12 #"debian-freebsd-alpha","gcc:-DTERMIOS -O -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)",
13@@ -460,6 +461,7 @@
14
15 # Linux on ARM
16 "linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
17+"linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
18
19 # SCO/Caldera targets.
20 #
diff --git a/meta/packages/openssl/openssl-0.9.7e/debian.patch b/meta/packages/openssl/openssl-0.9.7e/debian.patch
deleted file mode 100644
index 475c0c847f..0000000000
--- a/meta/packages/openssl/openssl-0.9.7e/debian.patch
+++ /dev/null
@@ -1,2589 +0,0 @@
1--- openssl-0.9.7e.orig/apps/CA.pl
2+++ openssl-0.9.7e/apps/CA.pl
3@@ -1,4 +1,4 @@
4-#!/usr/bin/perl
5+#!/usr/local/bin/perl
6 #
7 # CA - wrapper around ca to make it easier to use ... basically ca requires
8 # some setup stuff to be done before you can use it and this makes
9--- openssl-0.9.7e.orig/apps/der_chop.in
10+++ openssl-0.9.7e/apps/der_chop.in
11@@ -1,4 +1,4 @@
12-#!/usr/local/bin/perl
13+#!/usr/bin/perl
14 #
15 # der_chop ... this is one total hack that Eric is really not proud of
16 # so don't look at it and don't ask for support
17--- openssl-0.9.7e.orig/apps/progs.h
18+++ openssl-0.9.7e/apps/progs.h
19@@ -36,9 +36,7 @@
20 extern int smime_main(int argc,char *argv[]);
21 extern int rand_main(int argc,char *argv[]);
22 extern int prime_main(int argc,char *argv[]);
23-#ifndef OPENSSL_NO_ENGINE
24 extern int engine_main(int argc,char *argv[]);
25-#endif
26 extern int ocsp_main(int argc,char *argv[]);
27
28 #define FUNC_TYPE_GENERAL 1
29@@ -95,9 +93,7 @@
30 #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
31 {FUNC_TYPE_GENERAL,"s_client",s_client_main},
32 #endif
33-#ifndef OPENSSL_NO_SPEED
34 {FUNC_TYPE_GENERAL,"speed",speed_main},
35-#endif
36 #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
37 {FUNC_TYPE_GENERAL,"s_time",s_time_main},
38 #endif
39@@ -117,9 +113,7 @@
40 {FUNC_TYPE_GENERAL,"smime",smime_main},
41 {FUNC_TYPE_GENERAL,"rand",rand_main},
42 {FUNC_TYPE_GENERAL,"prime",prime_main},
43-#ifndef OPENSSL_NO_ENGINE
44 {FUNC_TYPE_GENERAL,"engine",engine_main},
45-#endif
46 {FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
47 #ifndef OPENSSL_NO_MD2
48 {FUNC_TYPE_MD,"md2",dgst_main},
49--- openssl-0.9.7e.orig/config
50+++ openssl-0.9.7e/config
51@@ -163,8 +163,8 @@
52 echo "${MACHINE}-whatever-linux1"; exit 0
53 ;;
54
55- GNU*)
56- echo "hurd-x86"; exit 0;
57+ GNU:*|GNU/*:*)
58+ echo "${MACHINE}-gnuish"; exit 0;
59 ;;
60
61 LynxOS:*)
62--- openssl-0.9.7e.orig/Configure
63+++ openssl-0.9.7e/Configure
64@@ -1,4 +1,4 @@
65-:
66+#!/usr/local/bin/perl
67 eval 'exec perl -S $0 ${1+"$@"}'
68 if $running_under_some_shell;
69 ##
70@@ -380,6 +380,43 @@
71 # assembler versions -- currently defunct:
72 ##"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer:::(unknown):SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${alpha_asm}",
73
74+# Debian GNU/* (various architectures)
75+"debian-alpha","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
76+"debian-alpha-ev4","gcc:-DTERMIO -O3 -mcpu=ev4 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
77+"debian-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
78+"debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
79+#"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
80+"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
81+#"debian-freebsd-alpha","gcc:-DTERMIOS -O -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)",
82+#"debian-freebsd-i386", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
83+"debian-freebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
84+"debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
85+"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
86+"debian-ia64","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
87+#"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC",
88+"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
89+"debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -mcpu=i486 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
90+"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -mcpu=i586 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
91+"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -mcpu=i686 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
92+"debian-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
93+"debian-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -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)",
94+"debian-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -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)",
95+"debian-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
96+"debian-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
97+"debian-netbsd-sparc", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
98+"debian-openbsd-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
99+"debian-openbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
100+"debian-openbsd-mips","gcc:-O2 -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)",
101+"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
102+"debian-powerpc64","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
103+"debian-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
104+"debian-sh3", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
105+"debian-sh4", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
106+"debian-sh3eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
107+"debian-sh4eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
108+"debian-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
109+"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v8 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
110+"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,-Av8plus -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
111 # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
112 # bn86-elf.o file file since it is hand tweaked assembler.
113 "linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
114@@ -1297,7 +1334,8 @@
115 elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
116 {
117 my $sotmp = $1;
118- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
119+# s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
120+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
121 }
122 elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
123 {
124--- openssl-0.9.7e.orig/crypto/asn1/charmap.pl
125+++ openssl-0.9.7e/crypto/asn1/charmap.pl
126@@ -1,4 +1,4 @@
127-#!/usr/local/bin/perl -w
128+#!/usr/local/bin/perl
129
130 use strict;
131
132--- openssl-0.9.7e.orig/crypto/md5/asm/md5-sparcv9.S
133+++ openssl-0.9.7e/crypto/md5/asm/md5-sparcv9.S
134@@ -74,14 +74,14 @@
135 #define Dval R8
136
137 #if defined(MD5_BLOCK_DATA_ORDER)
138-# if defined(OPENSSL_SYSNAME_ULTRASPARC)
139+/*# if defined(OPENSSL_SYSNAME_ULTRASPARC)*/
140 # define LOAD lda
141 # define X(i) [%i1+i*4]%asi
142 # define md5_block md5_block_asm_data_order_aligned
143 # define ASI_PRIMARY_LITTLE 0x88
144-# else
145+/*# else
146 # error "MD5_BLOCK_DATA_ORDER is supported only on UltraSPARC!"
147-# endif
148+# endif*/
149 #else
150 # define LOAD ld
151 # define X(i) [%i1+i*4]
152--- openssl-0.9.7e.orig/crypto/opensslconf.h
153+++ openssl-0.9.7e/crypto/opensslconf.h
154@@ -4,17 +4,38 @@
155 /* OpenSSL was configured with the following options: */
156 #ifndef OPENSSL_DOING_MAKEDEPEND
157
158+#ifndef OPENSSL_NO_IDEA
159+# define OPENSSL_NO_IDEA
160+#endif
161+#ifndef OPENSSL_NO_MDC2
162+# define OPENSSL_NO_MDC2
163+#endif
164+#ifndef OPENSSL_NO_RC5
165+# define OPENSSL_NO_RC5
166+#endif
167 #ifndef OPENSSL_NO_KRB5
168 # define OPENSSL_NO_KRB5
169 #endif
170
171 #endif /* OPENSSL_DOING_MAKEDEPEND */
172+#ifndef OPENSSL_THREADS
173+# define OPENSSL_THREADS
174+#endif
175
176 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
177 asks for it. This is a transient feature that is provided for those
178 who haven't had the time to do the appropriate changes in their
179 applications. */
180 #ifdef OPENSSL_ALGORITHM_DEFINES
181+# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
182+# define NO_IDEA
183+# endif
184+# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
185+# define NO_MDC2
186+# endif
187+# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
188+# define NO_RC5
189+# endif
190 # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
191 # define NO_KRB5
192 # endif
193@@ -27,7 +48,7 @@
194
195 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
196 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
197-#define OPENSSLDIR "/usr/local/ssl"
198+#define OPENSSLDIR "/usr/lib/ssl"
199 #endif
200 #endif
201
202@@ -79,7 +100,7 @@
203
204 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
205 #define CONFIG_HEADER_BN_H
206-#undef BN_LLONG
207+#define BN_LLONG
208
209 /* Should we define BN_DIV2W here? */
210
211@@ -98,7 +119,7 @@
212 #define CONFIG_HEADER_RC4_LOCL_H
213 /* if this is defined data[i] is used instead of *data, this is a %20
214 * speedup on x86 */
215-#undef RC4_INDEX
216+#define RC4_INDEX
217 #endif
218
219 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
220@@ -112,14 +133,14 @@
221 /* the following is tweaked from a config script, that is why it is a
222 * protected undef/define */
223 #ifndef DES_PTR
224-#undef DES_PTR
225+#define DES_PTR
226 #endif
227
228 /* This helps C compiler generate the correct code for multiple functional
229 * units. It reduces register dependancies at the expense of 2 more
230 * registers */
231 #ifndef DES_RISC1
232-#undef DES_RISC1
233+#define DES_RISC1
234 #endif
235
236 #ifndef DES_RISC2
237@@ -133,7 +154,7 @@
238 /* Unroll the inner loop, this sometimes helps, sometimes hinders.
239 * Very mucy CPU dependant */
240 #ifndef DES_UNROLL
241-#undef DES_UNROLL
242+#define DES_UNROLL
243 #endif
244
245 /* These default values were supplied by
246--- openssl-0.9.7e.orig/demos/tunala/configure.in
247+++ openssl-0.9.7e/demos/tunala/configure.in
248@@ -1,4 +1,4 @@
249-dnl Process this file with autoconf to produce a configure script.
250+#!/usr/local/bin/perl
251 AC_INIT(tunala.c)
252 AM_CONFIG_HEADER(config.h)
253 AM_INIT_AUTOMAKE(tunala, 0.0.1-dev)
254--- openssl-0.9.7e.orig/doc/Makefile
255+++ openssl-0.9.7e/doc/Makefile
256@@ -0,0 +1,40 @@
257+VERSION =
258+
259+#PODS = $(wildcard *.pod)
260+#MANS = $(addsuffix .man, $(basename $(PODS)))
261+
262+MANS = openssl.1 ssl.3 crypto.3
263+
264+P2M = pod2man --center='OpenSSL Documentation' --release="OpenSSL $(VERSION)"
265+
266+all: manpages
267+
268+.PHONY: manpages
269+
270+manpages: openssl.1 crypto.3 ssl.3
271+
272+openssl.1:
273+ $(P2M) --section=1 openssl.pod > openssl.1
274+
275+crypto.3:
276+ $(P2M) --section=3 crypto.pod > crypto.3
277+
278+ssl.3:
279+ $(P2M) --section=3 ssl.pod > ssl.3
280+
281+.PHONY: install
282+install:
283+ mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1
284+ mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
285+ install -m 644 -p openssl.1 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1
286+ install -m 644 -p crypto.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
287+ install -m 644 -p ssl.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
288+ rm -f $(MANS)
289+
290+.PHONY: clean
291+clean:
292+ rm -f $(MANS)
293+
294+.PHONY: realclean
295+realclean:
296+ -$(MAKE) clean
297--- openssl-0.9.7e.orig/Makefile
298+++ openssl-0.9.7e/Makefile
299@@ -11,11 +11,11 @@
300 SHLIB_VERSION_HISTORY=
301 SHLIB_MAJOR=0
302 SHLIB_MINOR=9.7
303-SHLIB_EXT=
304-PLATFORM=dist
305-OPTIONS= no-krb5
306-CONFIGURE_ARGS=dist
307-SHLIB_TARGET=
308+SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
309+PLATFORM=debian-i386
310+OPTIONS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 no-krb5
311+CONFIGURE_ARGS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 debian-i386
312+SHLIB_TARGET=linux-shared
313
314 # HERE indicates where this Makefile lives. This can be used to indicate
315 # where sub-Makefiles are expected to be. Currently has very limited usage,
316@@ -26,10 +26,10 @@
317 # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
318 # Normally it is left empty.
319 INSTALL_PREFIX=
320-INSTALLTOP=/usr/local/ssl
321+INSTALLTOP=/usr
322
323 # Do not edit this manually. Use Configure --openssldir=DIR do change this!
324-OPENSSLDIR=/usr/local/ssl
325+OPENSSLDIR=/usr/lib/ssl
326
327 # NO_IDEA - Define to build without the IDEA algorithm
328 # NO_RC4 - Define to build without the RC4 algorithm
329@@ -59,12 +59,13 @@
330 # equal 4.
331 # PKCS1_CHECK - pkcs1 tests.
332
333-CC= cc
334+#TOP=$(shell pwd)
335+CC= gcc
336 #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
337-CFLAG= -DOPENSSL_NO_KRB5 -O
338-DEPFLAG=
339+CFLAG= -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DOPENSSL_NO_KRB5 -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall
340+DEPFLAG= -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5
341 PEX_LIBS=
342-EX_LIBS=
343+EX_LIBS= -ldl
344 EXE_EXT=
345 ARFLAGS=
346 AR=ar $(ARFLAGS) r
347@@ -72,7 +73,7 @@
348 PERL= /usr/bin/perl
349 TAR= tar
350 TARFLAGS= --no-recursion
351-MAKEDEPPROG=makedepend
352+MAKEDEPPROG= gcc
353
354 # We let the C compiler driver to take care of .s files. This is done in
355 # order to be excused from maintaining a separate set of architecture
356@@ -177,13 +178,13 @@
357 # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
358 SHLIB_MARK=
359
360-DIRS= crypto fips ssl $(SHLIB_MARK) sigs apps test tools
361+DIRS= crypto fips ssl $(SHLIB_MARK) sigs apps doc tools
362 SHLIBDIRS= fips crypto ssl
363
364 # dirs in crypto to build
365 SDIRS= objects \
366- md2 md4 md5 sha mdc2 hmac ripemd \
367- des rc2 rc4 rc5 idea bf cast \
368+ md2 md4 md5 sha hmac ripemd \
369+ des rc2 rc4 bf cast \
370 bn ec rsa dsa dh dso engine aes \
371 buffer bio stack lhash rand err \
372 evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5
373@@ -196,10 +197,10 @@
374
375 MAKEFILE= Makefile
376
377-MANDIR=$(OPENSSLDIR)/man
378+MANDIR=/usr/share/man
379 MAN1=1
380 MAN3=3
381-MANSUFFIX=
382+MANSUFFIX=ssl
383 SHELL=/bin/sh
384
385 TOP= .
386@@ -211,7 +212,7 @@
387 SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
388 SHARED_SSL=libssl$(SHLIB_EXT)
389 SHARED_LIBS=
390-SHARED_LIBS_LINK_EXTS=
391+SHARED_LIBS_LINK_EXTS=.so
392 SHARED_LDFLAGS=
393
394 GENERAL= Makefile
395@@ -818,7 +819,7 @@
396 do \
397 if [ -f "$$i" ]; then \
398 ( echo installing $$i; \
399- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
400+ cp -d $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
401 if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
402 : ; \
403 else \
404--- openssl-0.9.7e.orig/Makefile.org
405+++ openssl-0.9.7e/Makefile.org
406@@ -57,6 +57,7 @@
407 # equal 4.
408 # PKCS1_CHECK - pkcs1 tests.
409
410+#TOP=$(shell pwd)
411 CC= gcc
412 #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
413 CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
414@@ -175,7 +176,7 @@
415 # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
416 SHLIB_MARK=
417
418-DIRS= crypto fips ssl $(SHLIB_MARK) sigs apps test tools
419+DIRS= crypto fips ssl $(SHLIB_MARK) sigs apps doc tools
420 SHLIBDIRS= fips crypto ssl
421
422 # dirs in crypto to build
423@@ -194,10 +195,10 @@
424
425 MAKEFILE= Makefile
426
427-MANDIR=$(OPENSSLDIR)/man
428+MANDIR=/usr/share/man
429 MAN1=1
430 MAN3=3
431-MANSUFFIX=
432+MANSUFFIX=ssl
433 SHELL=/bin/sh
434
435 TOP= .
436@@ -816,7 +817,7 @@
437 do \
438 if [ -f "$$i" ]; then \
439 ( echo installing $$i; \
440- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
441+ cp -d $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
442 if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
443 : ; \
444 else \
445--- openssl-0.9.7e.orig/os2/backwardify.pl
446+++ openssl-0.9.7e/os2/backwardify.pl
447@@ -1,4 +1,4 @@
448-#!/usr/bin/perl -w
449+#!/usr/local/bin/perl
450 use strict;
451
452 # Use as $0
453--- openssl-0.9.7e.orig/ssl/ssl_algs.c
454+++ openssl-0.9.7e/ssl/ssl_algs.c
455@@ -109,3 +109,8 @@
456 return(1);
457 }
458
459+#undef SSLeay_add_ssl_algorithms
460+int SSLeay_add_ssl_algorithms(void)
461+ {
462+ return SSL_library_init();
463+ }
464--- openssl-0.9.7e.orig/tools/c_rehash
465+++ openssl-0.9.7e/tools/c_rehash
466@@ -6,7 +6,7 @@
467
468 my $openssl;
469
470-my $dir = "/usr/local/ssl";
471+my $dir = "/usr/lib/ssl";
472
473 if(defined $ENV{OPENSSL}) {
474 $openssl = $ENV{OPENSSL};
475--- openssl-0.9.7e.orig/tools/c_rehash.in
476+++ openssl-0.9.7e/tools/c_rehash.in
477@@ -1,4 +1,4 @@
478-#!/usr/local/bin/perl
479+#!/usr/bin/perl
480
481
482 # Perl c_rehash script, scan all files in a directory
483--- openssl-0.9.7e.orig/util/clean-depend.pl
484+++ openssl-0.9.7e/util/clean-depend.pl
485@@ -1,4 +1,4 @@
486-#!/usr/local/bin/perl -w
487+#!/usr/local/bin/perl
488 # Clean the dependency list in a makefile of standard includes...
489 # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
490
491--- openssl-0.9.7e.orig/util/extract-names.pl
492+++ openssl-0.9.7e/util/extract-names.pl
493@@ -1,4 +1,4 @@
494-#!/usr/bin/perl
495+#!/usr/local/bin/perl
496
497 $/ = ""; # Eat a paragraph at once.
498 while(<STDIN>) {
499--- openssl-0.9.7e.orig/util/mkdef.pl
500+++ openssl-0.9.7e/util/mkdef.pl
501@@ -1,4 +1,4 @@
502-#!/usr/local/bin/perl -w
503+#!/usr/local/bin/perl
504 #
505 # generate a .def file
506 #
507--- openssl-0.9.7e.orig/util/mkerr.pl
508+++ openssl-0.9.7e/util/mkerr.pl
509@@ -1,4 +1,4 @@
510-#!/usr/local/bin/perl -w
511+#!/usr/local/bin/perl
512
513 my $config = "crypto/err/openssl.ec";
514 my $debug = 0;
515--- openssl-0.9.7e.orig/util/mkstack.pl
516+++ openssl-0.9.7e/util/mkstack.pl
517@@ -1,4 +1,4 @@
518-#!/usr/local/bin/perl -w
519+#!/usr/local/bin/perl
520
521 # This is a utility that searches out "DECLARE_STACK_OF()"
522 # declarations in .h and .c files, and updates/creates/replaces
523--- openssl-0.9.7e.orig/util/pod2man.pl
524+++ openssl-0.9.7e/util/pod2man.pl
525@@ -1,4 +1,4 @@
526-: #!/usr/bin/perl-5.005
527+#!/usr/local/bin/perl
528 eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
529 if $running_under_some_shell;
530
531--- openssl-0.9.7e.orig/util/selftest.pl
532+++ openssl-0.9.7e/util/selftest.pl
533@@ -1,4 +1,4 @@
534-#!/usr/local/bin/perl -w
535+#!/usr/local/bin/perl
536 #
537 # Run the test suite and generate a report
538 #
539--- openssl-0.9.7e.orig/VMS/VMSify-conf.pl
540+++ openssl-0.9.7e/VMS/VMSify-conf.pl
541@@ -1,4 +1,4 @@
542-#! /usr/bin/perl
543+#!/usr/local/bin/perl
544
545 use strict;
546 use warnings;
547--- openssl-0.9.7e.orig/debian/README.debian
548+++ openssl-0.9.7e/debian/README.debian
549@@ -0,0 +1,52 @@
550+openssl for DEBIAN
551+----------------------
552+
553+openssl replaces ssleay.
554+
555+The application links to openssl like req, ca, verify and s_client
556+have been removed.
557+
558+Instead of `<application>` please call now `openssl <application>`
559+
560+eg:
561+instead of `req` please call `openssl req`
562+
563+NOTE: The libssl library version for debian-i386 is optimized for
564+486-processors and better. It will not run on 386-processors.
565+
566+----
567+Self-signed certs and webservers:
568+
569+If you get with a selfsigned certificate and a webserver:
570+ > "The certificate is not approved for the attempted operation."
571+
572+Bodo_Moeller@public.uni-hamburg.de (Bodo Moeller) writes:
573+>Probably you are using a CA certificate for your server; if you use
574+>"openssl req" to generate a new key and self-signed certificate with
575+>the default openssl.cnf, the certificate you get includes certain
576+>X.509v3 extensions that make it unfit for use as a server certificate.
577+>This was not so with earlier versions of the software because back
578+>then there was far less X.509v3 support.
579+>
580+>To look at the certificate some HTTPS server presents to its cliens,
581+>use "openssl s_client -port 443 -host your.server", store the output
582+>(at least the part from "-----BEGIN CERTIFICATE-----" up to "-----END
583+>CERTIFICATE-----", including these separators) in a file and use
584+>"openssl x509 -in the_file_you_just_stored -text" to look at it in
585+>readable form. If it has in the "X509v3 extensions section" any of
586+>the following entries, it is not usable as a server certificate:
587+>
588+> X509v3 Basic Constraints:
589+> CA:TRUE
590+>
591+> X509v3 Key Usage:
592+> Certificate Sign, CRL Sign
593+>
594+>To quickly create a new server key and certificate that works with
595+>Netscape, you can just copy the original openssl.cnf file and comment
596+>out the "x509_extensions" entry in the "[ req ]" section.
597+>The, use "openssl req ..." as before to create a new certificate and
598+>key.
599+
600+
601+Christoph Martin <martin@uni-mainz.de>, Wed, 31 Mar 1999 16:00:51 +0200
602--- openssl-0.9.7e.orig/debian/changelog
603+++ openssl-0.9.7e/debian/changelog
604@@ -0,0 +1,605 @@
605+openssl (0.9.7e-2) unstable; urgency=high
606+
607+ * fix perl path in der_chop and c_rehash (closes: #281212)
608+ * still fixes security problem CAN-2004-0975 etc.
609+ - tempfile raise condition in der_chop
610+ - Avoid a race condition when CRLs are checked in a multi threaded
611+ environment.
612+
613+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sun, 14 Nov 2004 20:16:21 +0100
614+
615+openssl (0.9.7e-1) unstable; urgency=high
616+
617+ * SECURITY UPDATE: fix insecure temporary file handling
618+ * apps/der_chop:
619+ - replaced $$-style creation of temporary files with
620+ File::Temp::tempfile()
621+ - removed unused temporary file name in do_certificate()
622+ * References:
623+ CAN-2004-0975 (closes: #278260)
624+ * fix ASN1_STRING_to_UTF8 with UTF8 (closes: #260357)
625+ * New upstream release with security fixes
626+ - Avoid a race condition when CRLs are checked in a multi threaded
627+ environment.
628+ - Various fixes to s3_pkt.c so alerts are sent properly.
629+ - Reduce the chances of duplicate issuer name and serial numbers (in
630+ violation of RFC3280) using the OpenSSL certificate creation
631+ utilities.
632+ * depends openssl on perl-base instead of perl (closes: #280225)
633+ * support powerpc64 in Configure (closes: #275224)
634+ * include cs translation (closes: #273517)
635+ * include nl translation (closes: #272479)
636+ * Fix default dir of c_rehash (closes: #253126)
637+
638+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 12 Nov 2004 14:11:15 +0100
639+
640+openssl (0.9.7d-5) unstable; urgency=low
641+
642+ * Make S/MIME encrypt work again (backport from CVS) (closes: #241407,
643+ #241386)
644+
645+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 26 Jul 2004 17:22:42 +0200
646+
647+openssl (0.9.7d-4) unstable; urgency=low
648+
649+ * add Catalan translation (closes: #248749)
650+ * add Spanish translation (closes: #254561)
651+ * include NMU fixes: see below
652+ * decrease optimisation level for debian-arm to work around gcc bug
653+ (closes: #253848) (thanks to Steve Langasek and Thom May)
654+ * Add libcrypto0.9.7-udeb. (closes: #250010) (thanks to Bastian Blank)
655+ * Add watchfile
656+
657+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 14 Jul 2004 14:31:02 +0200
658+
659+openssl (0.9.7d-3) unstable; urgency=low
660+
661+ * rename -pic.a libraries to _pic.a (closes: #250016)
662+
663+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 24 May 2004 17:02:29 +0200
664+
665+openssl (0.9.7d-2) unstable; urgency=low
666+
667+ * include PIC libs (libcrypto-pic.a and libssl-pic.a) to libssl-dev
668+ (closes: #246928, #243999)
669+ * add racoon to restart list (closes: #242652)
670+ * add Brazilian, Japanese and Danish translations (closes: #242087,
671+ #241830, #241705)
672+
673+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 11 May 2004 10:13:49 +0200
674+
675+openssl (0.9.7d-1) unstable; urgency=high
676+
677+ * new upstream
678+ * fixes security holes (http://www.openssl.org/news/secadv_20040317.txt)
679+ (closes: #238661)
680+ * includes support for debian-amd64 (closes: #235551, #232310)
681+ * fix typo in pem.pod (closes: #219873)
682+ * fix typo in libssl0.9.7.templates (closes: #224690)
683+ * openssl suggests ca-certificates (closes: #217180)
684+ * change debconf template to gettext format (closes: #219013)
685+ * include french debconf template (closes: #219014)
686+
687+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 18 Mar 2004 16:18:43 +0100
688+
689+openssl (0.9.7c-5) unstable; urgency=low
690+
691+ * include openssl.pc into libssl-dev (closes: #212545)
692+
693+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 16 Oct 2003 16:31:32 +0200
694+
695+openssl (0.9.7c-4) unstable; urgency=low
696+
697+ * change question to restart services to debconf (closes: #214840)
698+ * stop using dh_undocumented (closes: #214831)
699+
700+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 10 Oct 2003 15:40:48 +0200
701+
702+openssl (0.9.7c-3) unstable; urgency=low
703+
704+ * fix POSIX conformance for head in libssl0.9.7.postinst (closes:
705+ #214700)
706+
707+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 8 Oct 2003 14:02:38 +0200
708+
709+openssl (0.9.7c-2) unstable; urgency=low
710+
711+ * add filerc macro to libssl0.9.7.postinst (closes: #213906)
712+ * restart spamassassins spamd on upgrade (closes: #214106)
713+ * restart more services on upgrade
714+ * fix EVP_BytesToKey manpage (closes: #213715)
715+
716+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 7 Oct 2003 15:01:32 +0200
717+
718+openssl (0.9.7c-1) unstable; urgency=high
719+
720+ * upstream security fix (closes: #213451)
721+ - Fix various bugs revealed by running the NISCC test suite:
722+ Stop out of bounds reads in the ASN1 code when presented with
723+ invalid tags (CAN-2003-0543 and CAN-2003-0544).
724+ Free up ASN1_TYPE correctly if ANY type is invalid (CAN-2003-0545).
725+ If verify callback ignores invalid public key errors don't try to check
726+ certificate signature with the NULL public key.
727+ - In ssl3_accept() (ssl/s3_srvr.c) only accept a client certificate
728+ if the server requested one: as stated in TLS 1.0 and SSL 3.0
729+ specifications.
730+ * more minor upstream bugfixes
731+ * fix formatting in c_issuer (closes: #190026)
732+ * fix Debian-FreeBSD support (closes: #200381)
733+ * restart some services in postinst to make them use the new libraries
734+ * remove duplicated openssl.1, crypto.3 and ssl.3 (closes: #198594)
735+
736+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 1 Oct 2003 08:54:27 +0200
737+
738+openssl (0.9.7b-2) unstable; urgency=high
739+
740+ * fix permission of /etc/ssl/private to 700 again
741+ * change section of libssl-dev to libdevel
742+
743+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 23 Apr 2003 11:13:24 +0200
744+
745+openssl (0.9.7b-1) unstable; urgency=high
746+
747+ * upstream security fix
748+ - Countermeasure against the Klima-Pokorny-Rosa extension of
749+ Bleichbacher's attack on PKCS #1 v1.5 padding: treat
750+ a protocol version number mismatch like a decryption error
751+ in ssl3_get_client_key_exchange (ssl/s3_srvr.c). (CAN-2003-0131)
752+ (closes: #189087)
753+ - Turn on RSA blinding by default in the default implementation
754+ to avoid a timing attack. Applications that don't want it can call
755+ RSA_blinding_off() or use the new flag RSA_FLAG_NO_BLINDING.
756+ They would be ill-advised to do so in most cases. (CAN-2003-0147)
757+ - Change RSA blinding code so that it works when the PRNG is not
758+ seeded (in this case, the secret RSA exponent is abused as
759+ an unpredictable seed -- if it is not unpredictable, there
760+ is no point in blinding anyway). Make RSA blinding thread-safe
761+ by remembering the creator's thread ID in rsa->blinding and
762+ having all other threads use local one-time blinding factors
763+ (this requires more computation than sharing rsa->blinding, but
764+ avoids excessive locking; and if an RSA object is not shared
765+ between threads, blinding will still be very fast).
766+ for more details see the CHANGES file
767+
768+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 16 Apr 2003 10:32:57 +0200
769+
770+openssl (0.9.7a-1) unstable; urgency=high
771+
772+ * upstream Security fix
773+ - In ssl3_get_record (ssl/s3_pkt.c), minimize information leaked
774+ via timing by performing a MAC computation even if incorrrect
775+ block cipher padding has been found. This is a countermeasure
776+ against active attacks where the attacker has to distinguish
777+ between bad padding and a MAC verification error. (CAN-2003-0078)
778+ for more details see the CHANGES file
779+
780+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 21 Feb 2003 22:39:40 +0100
781+
782+openssl (0.9.7-4) unstable; urgency=low
783+
784+ * use DH_COMPAT=3 to build
785+ * move i686 to i686/cmov to fix problems on Via C3. For that to work we
786+ have to depend on the newest libc6 on i386 (closes: #177891)
787+ * fix bug in ui_util.c (closes: #177615)
788+ * fix typo in md5.h (closes: #178112)
789+
790+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 24 Jan 2003 10:22:56 +0100
791+
792+openssl (0.9.7-3) unstable; urgency=low
793+
794+ * enable build of ultrasparc code on non ultrasparc machines (closes:
795+ #177024)
796+
797+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 17 Jan 2003 08:22:13 +0100
798+
799+openssl (0.9.7-2) unstable; urgency=low
800+
801+ * include changes between 0.9.6g-9 and -10
802+ * fix problem in build-process on i386 with libc6 version number
803+
804+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 13 Jan 2003 14:26:56 +0100
805+
806+openssl (0.9.7-1) unstable; urgency=low
807+
808+ * new upstream
809+ * includes engine support
810+ * a lot of bugfixes and enhancements, see the CHANGES file
811+ * include AES encryption
812+ * makes preview of certificate configurable (closes: #176059)
813+ * fix x509 manpage (closes: #168070)
814+ * fix declaration of ERR_load_PEM_string in pem.h (closes: #141360)
815+
816+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 11 Jan 2003 09:12:16 +0100
817+
818+openssl (0.9.6g-10) unstable; urgency=low
819+
820+ * fix problem in build-process on i386 with libc6 version number
821+ (closes: #167096)
822+
823+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 4 Nov 2002 12:27:21 +0100
824+
825+openssl (0.9.6g-9) unstable; urgency=low
826+
827+ * fix typo in i386 libc6 depend (sigh) (closes: #163848)
828+
829+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 8 Oct 2002 23:29:20 +0200
830+
831+openssl (0.9.6g-8) unstable; urgency=low
832+
833+ * fix libc6 depends. Only needed for i386 (closes: #163701)
834+ * remove SHLIB section for bsds from Configure (closes: #163585)
835+
836+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 8 Oct 2002 10:57:35 +0200
837+
838+openssl (0.9.6g-7) unstable; urgency=low
839+
840+ * enable i686 optimisation and depend on fixed glibc (closes: #163500)
841+ * remove transition package ssleay
842+ * include optimisation vor sparcv8 (closes: #139996)
843+ * improve optimisation vor sparcv9
844+
845+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sun, 6 Oct 2002 14:07:12 +0200
846+
847+openssl (0.9.6g-6) unstable; urgency=low
848+
849+ * temporarily disable i686 optimisation (See bug in glibc #161788)
850+
851+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 21 Sep 2002 18:56:49 +0200
852+
853+openssl (0.9.6g-5) unstable; urgency=low
854+
855+ * i486 can use i586 assembler
856+ * include set -xe in the for loops in the rules files to make it abort
857+ on error (closes: #161768)
858+
859+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 21 Sep 2002 16:23:11 +0200
860+
861+openssl (0.9.6g-4) unstable; urgency=low
862+
863+ * fix optimization for alpha and sparc
864+ * add optimization for i486
865+
866+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 20 Sep 2002 22:36:19 +0200
867+
868+openssl (0.9.6g-3) unstable; urgency=low
869+
870+ * add optimized libraries for i586, i686, ev4, ev5 and v9 (closes: #139783)
871+
872+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 19 Sep 2002 18:33:04 +0200
873+
874+openssl (0.9.6g-2) unstable; urgency=low
875+
876+ * fix manpage names (closes: #156717, #156718, #156719, #156721)
877+
878+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 15 Aug 2002 11:26:37 +0200
879+
880+openssl (0.9.6g-1) unstable; urgency=low
881+
882+ * new upstream version
883+ * Use proper error handling instead of 'assertions' in buffer
884+ overflow checks added in 0.9.6e. This prevents DoS (the
885+ assertions could call abort()). (closes: #155985, #156495)
886+ * Fix ASN1 checks. Check for overflow by comparing with LONG_MAX
887+ and get fix the header length calculation.
888+ * include support for new sh* architectures (closes: #155117)
889+
890+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 14 Aug 2002 13:59:22 +0200
891+
892+openssl (0.9.6e-1) unstable; urgency=high
893+
894+ * fixes remote exploits (see DSA-136-1)
895+
896+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 30 Jul 2002 18:32:28 +0200
897+
898+openssl (0.9.6d-1) unstable; urgency=low
899+
900+ * new upstream (minor) version
901+ * includes Configure lines for debian-*bsd-* (closes: #130413)
902+ * fix wrong prototype for BN_pseudo_rand_range in BN_rand(3ssl) (closes:
903+ #144586)
904+ * fix typos in package description (closes: #141469)
905+ * fix typo in SSL_CTX_set_cert_store manpage (closes: #135297)
906+
907+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 3 Jun 2002 19:42:10 +0200
908+
909+openssl (0.9.6c-2) unstable; urgency=low
910+
911+ * moved from non-US to main
912+
913+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 19 Mar 2002 14:48:39 +0100
914+
915+openssl (0.9.6c-1) unstable; urgency=low
916+
917+ * new upstream version with a lot of bugfixes
918+ * remove directory /usr/include/openssl from openssl package (closes:
919+ bug #121226)
920+ * remove selfdepends from libssl0.9.6
921+ * link openssl binary shared again
922+
923+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 5 Jan 2002 19:04:31 +0100
924+
925+openssl (0.9.6b-4) unstable; urgency=low
926+
927+ * build with -D_REENTRANT for threads support on all architectures
928+ (closes: #112329, #119239)
929+
930+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 24 Nov 2001 12:17:51 +0100
931+
932+openssl (0.9.6b-3) unstable; urgency=low
933+
934+ * disable idea, mdc2 and rc5 because they are not free (closes: #65368)
935+ * ready to be moved from nonus to main
936+
937+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 21 Nov 2001 17:51:41 +0100
938+
939+openssl (0.9.6b-2) unstable; urgency=high
940+
941+ * fix definition of crypt in des.h (closes: #107533)
942+ * fix descriptions (closes: #109503)
943+
944+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 17 Sep 2001 15:38:27 +0200
945+
946+openssl (0.9.6b-1) unstable; urgency=medium
947+
948+ * new upstream fixes some security issues (closes: #105835, #100146)
949+ * added support for s390 (closes: #105681)
950+ * added support for sh (closes: #100003)
951+ * change priority of libssl096 to standard as ssh depends on it (closes:
952+ #105440)
953+ * don't optimize for i486 to support i386. (closes: #104127, #82194)
954+
955+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 20 Jul 2001 15:52:42 +0200
956+
957+openssl (0.9.6a-3) unstable; urgency=medium
958+
959+ * add perl-base to builddeps
960+ * include static libraries in libssl-dev (closes: #93688)
961+
962+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 14 May 2001 20:16:06 +0200
963+
964+openssl (0.9.6a-2) unstable; urgency=medium
965+
966+ * change Architecture of ssleay from any to all (closes: #92913)
967+ * depend libssl-dev on the exact same version of libssl0.9.6 (closes:
968+ #88939)
969+ * remove lib{crypto,ssl}.a from openssl (closes: #93666)
970+ * rebuild with newer gcc to fix atexit problem (closes: #94036)
971+
972+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 2 May 2001 12:28:39 +0200
973+
974+openssl (0.9.6a-1) unstable; urgency=medium
975+
976+ * new upstream, fixes some security bugs (closes: #90584)
977+ * fix typo in s_server manpage (closes: #89756)
978+
979+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 10 Apr 2001 12:13:11 +0200
980+
981+openssl (0.9.6-2) unstable; urgency=low
982+
983+ * policy: reorganisation of package names: libssl096 -> libssl0.9.6,
984+ libssl096-dev -> libssl-dev (closes: #83426)
985+ * libssl0.9.6 drops replaces libssl09 (Closes: #83425)
986+ * install upstream CHANGES files (Closes: #83430)
987+ * added support for hppa and ia64 (Closes: #88790)
988+ * move man3 manpages to libssl-dev (Closes: #87546)
989+ * fix formating problem in rand_add(1) (Closes: #87547)
990+ * remove manpage duplicates (Closes: #87545, #74986)
991+ * make package descriptions clearer (Closes: #83518, #83444)
992+ * increase default emailAddress_max from 40 to 60 (Closes: #67238)
993+ * removed RSAREF warning (Closes: #84122)
994+
995+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 8 Mar 2001 14:24:00 +0100
996+
997+openssl (0.9.6-1) unstable; urgency=low
998+
999+ * New upstream version (Thanks to Enrique Zanardi <ezanard@debian.org>)
1000+ (closes: #72388)
1001+ * Add support for debian-hurd (closes: #76032)
1002+
1003+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 13 Nov 2000 22:30:46 +0100
1004+
1005+openssl (0.9.5a-5) unstable; urgency=low
1006+
1007+ * move manpages in standard directories with section ssl (closes:
1008+ #72152, #69809)
1009+
1010+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 5 Oct 2000 19:56:20 +0200
1011+
1012+openssl (0.9.5a-4) unstable; urgency=low
1013+
1014+ * include edg_rand_bytes patch from and for apache-ssl
1015+
1016+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 23 Sep 2000 16:48:06 +0200
1017+
1018+openssl (0.9.5a-3) unstable; urgency=low
1019+
1020+ * fix call to dh_makeshlibs to create correct shlibs file and make
1021+ dependend programs link correctly (closes: Bug#61658)
1022+ * include a note in README.debian concerning the location of the
1023+ subcommand manpages (closes: Bug#69809)
1024+
1025+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 16 Sep 2000 19:10:50 +0200
1026+
1027+openssl (0.9.5a-2) unstable; urgency=low
1028+
1029+ * try to fix the sharedlib problem. change soname of library
1030+ (closes: Bug#4622, #66102, #66538, #66123)
1031+
1032+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 12 Jul 2000 03:26:30 +0200
1033+
1034+openssl (0.9.5a-1) unstable; urgency=low
1035+
1036+ * new upstream version (major changes see file NEWS) (closes: Bug#63976,
1037+ #65239, #65358)
1038+ * new library package libssl095a because of probably changed library
1039+ interface (closes: Bug#46222)
1040+ * added architecture mips and mipsel (closes: Bug#62437, #60366)
1041+ * provide shlibs.local file in build to help build if libraries are not
1042+ yet installed (closes: Bug#63984)
1043+
1044+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sun, 11 Jun 2000 15:17:35 +0200
1045+
1046+openssl (0.9.4-5) frozen unstable; urgency=medium
1047+
1048+ * cleanup of move of doc directories to /usr/share/doc (closes:
1049+ Bug#56430)
1050+ * lintian issues (closes: Bug#49358)
1051+ * move demos from openssl to libssl09-dev (closes: Bug#59201)
1052+ * move to debhelpers
1053+
1054+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 11 Mar 2000 10:38:04 +0100
1055+
1056+openssl (0.9.4-4) unstable; urgency=medium
1057+
1058+ * Added 'debian-arm' in 'Configure'. (closes: Bug#54251, #54766)
1059+ * Fixed Configure for 'debian-m68k' (closes: Bug#53636)
1060+
1061+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 15 Jan 2000 13:16:18 +0100
1062+
1063+openssl (0.9.4-3) unstable; urgency=low
1064+
1065+ * define symbol SSLeay_add_ssl_algorithms for backward compatibility
1066+ (closes: Bug#46882)
1067+ * remove manpages from /usr/doc/openssl (closes: Bug#46791)
1068+
1069+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 14 Oct 1999 16:51:08 +0200
1070+
1071+openssl (0.9.4-2) unstable; urgency=low
1072+
1073+ * include some more docu in pod format (Bug #43933)
1074+ * removed -mv8 from sparc flags (Bug #44769)
1075+
1076+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 14 Sep 1999 22:04:06 +0200
1077+
1078+openssl (0.9.4-1) unstable; urgency=low
1079+
1080+ * new upstream version (Closes: #42926)
1081+
1082+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 28 Aug 1999 17:04:23 +0200
1083+
1084+openssl (0.9.3a-1) unstable; urgency=low
1085+
1086+ * new upstream version (Bug #38345, #38627)
1087+ * sparc is big-endian (Bug #39973)
1088+
1089+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 7 Jul 1999 16:03:37 +0200
1090+
1091+openssl (0.9.2b-3) unstable; urgency=low
1092+
1093+ * correct move conffiles to /etc/ssl (Bug #38570)
1094+
1095+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 31 May 1999 21:08:07 +0200
1096+
1097+openssl (0.9.2b-2) unstable; urgency=low
1098+
1099+ * added convenience package ssleay to help upgrade to openssl (Bug
1100+ #37185, #37623, #36326)
1101+ * added some missing dependencies from libssl09 (Bug #36681, #35867,
1102+ #36326)
1103+ * move lib*.so to libssl09-dev (Bug #36761)
1104+ * corrected version numbers of library files
1105+ * introduce link from /usr/lib/ssl to /etc/ssl (Bug #36710)
1106+
1107+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sun, 23 May 1999 14:57:48 +0200
1108+
1109+openssl (0.9.2b-1) unstable; urgency=medium
1110+
1111+ * First openssl version
1112+
1113+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 31 Mar 1999 15:54:26 +0200
1114+
1115+ssleay (0.9.0b-2) unstable; urgency=low
1116+
1117+ * Include message about the (not)usage of RSAREF (#24409)
1118+ * Move configfiles from /usr/lib/ssl to /etc/ssl (#26406)
1119+ * Change definitions for sparc (#26487)
1120+ * Added missing dependency (#28591)
1121+ * Make debian/libtool executable (#29708)
1122+ * /etc/ssl/lib/ssleay.cnf is now a confile (#32624)
1123+
1124+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sun, 21 Mar 1999 19:41:04 +0100
1125+
1126+ssleay (0.9.0b-1) unstable; urgency=low
1127+
1128+ * new upstream version (Bug #21227, #25971)
1129+ * build shared libraries with -fPIC (Bug #20027)
1130+ * support sparc architecture (Bug #28467)
1131+
1132+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 13 Oct 1998 10:20:13 +0200
1133+
1134+ssleay (0.8.1-7) frozen unstable; urgency=high
1135+
1136+ * security fix patch to 0.8.1b (bug #24022)
1137+
1138+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 6 Jul 1998 15:42:15 +0200
1139+
1140+ssleay (0.8.1-6) frozen unstable; urgency=low
1141+
1142+ * second try to fix bug #15235 (copyright was still missing)
1143+
1144+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 22 Jun 1998 08:56:27 +0200
1145+
1146+ssleay (0.8.1-5) frozen unstable; urgency=high
1147+
1148+ * changed /dev/random to /dev/urandom (Bug #23169, #17817)
1149+ * copyright contains now the full licence (Bug #15235)
1150+ * fixed bug #19410 (md5sums-lists-nonexisting-file)
1151+ * added demos to /usr/doc (Bug #17372)
1152+ * fixed type in package description (Bug #18969)
1153+ * fixed bug in adding documentation (Bug #21463)
1154+ * added patch for support of debian-powerpc (Bug #21579)
1155+
1156+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 18 Jun 1998 23:09:13 +0200
1157+
1158+ssleay (0.8.1-4) unstable; urgency=low
1159+
1160+ * purged dependency from libc5
1161+
1162+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 11 Nov 1997 15:31:50 +0100
1163+
1164+ssleay (0.8.1-3) unstable; urgency=low
1165+
1166+ * changed packagename libssl to libssl08 to get better dependancies
1167+
1168+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 7 Nov 1997 14:23:17 +0100
1169+
1170+ssleay (0.8.1-2) unstable; urgency=low
1171+
1172+ * linked shared libraries against libc6
1173+ * use /dev/random for randomseed
1174+
1175+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 5 Nov 1997 11:21:40 +0100
1176+
1177+ssleay (0.8.1-1) unstable; urgency=low
1178+
1179+ * new upstream version
1180+
1181+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 16 Oct 1997 16:15:43 +0200
1182+
1183+ssleay (0.6.6-2) unstable; urgency=low
1184+
1185+ * cleanup in diffs
1186+ * removed INSTALL from docs (bug #13205)
1187+ * split libssl and libssl-dev (but #13735)
1188+
1189+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 15 Oct 1997 17:38:38 +0200
1190+
1191+ssleay (0.6.6-1) unstable; urgency=low
1192+
1193+ * New upstream version
1194+ * added shared libraries for libcrypto and libssl
1195+
1196+ -- Christoph Martin <martin@uni-mainz.de> Thu, 26 Jun 1997 19:26:14 +0200
1197+
1198+ssleay (0.6.4-2) unstable; urgency=low
1199+
1200+ * changed doc filenames from .doc to .txt to be able to read them
1201+ over with webbrowser
1202+
1203+ -- Christoph Martin <martin@uni-mainz.de> Tue, 25 Feb 1997 14:02:53 +0100
1204+
1205+ssleay (0.6.4-1) unstable; urgency=low
1206+
1207+ * Initial Release.
1208+
1209+ -- Christoph Martin <martin@uni-mainz.de> Fri, 22 Nov 1996 21:29:51 +0100
1210--- openssl-0.9.7e.orig/debian/control
1211+++ openssl-0.9.7e/debian/control
1212@@ -0,0 +1,60 @@
1213+Source: openssl
1214+Build-Depends: debhelper (>= 4.2.0)
1215+Section: utils
1216+Priority: optional
1217+Maintainer: Christoph Martin <christoph.martin@uni-mainz.de>
1218+Standards-Version: 3.6.1
1219+
1220+Package: openssl
1221+Priority: optional
1222+Architecture: any
1223+Depends: ${shlibs:Depends}, ${perl:Depends}
1224+Conflicts: ssleay (<< 0.9.2b)
1225+Suggests: ca-certificates
1226+Description: Secure Socket Layer (SSL) binary and related cryptographic tools
1227+ This package contains the openssl binary and related tools.
1228+ .
1229+ It is part of the OpenSSL implementation of SSL.
1230+ .
1231+ You need it to perform certain cryptographic actions like:
1232+ o Creation of RSA, DH and DSA Key Parameters
1233+ o Creation of X.509 Certificates, CSRs and CRLs
1234+ o Calculation of Message Digests
1235+ o Encryption and Decryption with Ciphers
1236+ o SSL/TLS Client and Server Tests
1237+ o Handling of S/MIME signed or encrypted Mail
1238+
1239+Package: libssl0.9.7
1240+Section: libs
1241+Priority: standard
1242+Architecture: any
1243+Depends: ${shlibs:Depends}, ${misc:Depends}
1244+Conflicts: ssleay (<< 0.9.2b), libssl, openssl (<< 0.9.6-2), libssl096-dev (<< 0.9.6-2)
1245+Description: SSL shared libraries
1246+ libssl and libcrypto shared libraries needed by programs like
1247+ apache-ssl, telnet-ssl and openssh.
1248+ .
1249+ It is part of the OpenSSL implementation of SSL.
1250+
1251+Package: libcrypto0.9.7-udeb
1252+XC-Package-Type: udeb
1253+Section: debian-installer
1254+Priority: optional
1255+Architecture: any
1256+Depends: ${shlibs:Depends}, ${misc:Depends}
1257+Provides: libssl0.9.7
1258+Description: crypto shared library - udeb
1259+ libcrypto shared library.
1260+ .
1261+ Do not install it on a normal system.
1262+
1263+Package: libssl-dev
1264+Section: libdevel
1265+Priority: optional
1266+Architecture: any
1267+Depends: libssl0.9.7 (= ${Source-Version})
1268+Conflicts: ssleay (<< 0.9.2b), libssl08-dev, libssl09-dev, libssl095a-dev, libssl096-dev
1269+Description: SSL development libraries, header files and documentation
1270+ libssl and libcrypt development libraries, header files and manpages
1271+ .
1272+ It is part of the OpenSSL implementation of SSL.
1273--- openssl-0.9.7e.orig/debian/rules
1274+++ openssl-0.9.7e/debian/rules
1275@@ -0,0 +1,186 @@
1276+#!/usr/bin/make -f
1277+# Sample debian.rules file - for GNU Hello (1.3).
1278+# Copyright 1994,1995 by Ian Jackson.
1279+# I hereby give you perpetual unlimited permission to copy,
1280+# modify and relicense this file, provided that you do not remove
1281+# my name from the file itself. (I assert my moral right of
1282+# paternity under the Copyright, Designs and Patents Act 1988.)
1283+# This file may have to be extensively modified
1284+#
1285+# Modified to be a prototype for debmake by Christoph Lameter <clameter@debian.org>
1286+SHELL=/bin/bash
1287+export DH_COMPAT=3
1288+
1289+package=openssl
1290+
1291+# For generating the manpages
1292+export VERSION=$(shell dpkg-parsechangelog | grep '^Version:' | sed -e 's/^.*://' -e 's/-.*//')
1293+
1294+# The binary architeture
1295+DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
1296+
1297+CONFARGS = --prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5
1298+OPT_alpha = ev4 ev5
1299+OPT_i386 = i486 i586 i686/cmov
1300+OPT_sparc = v8 v9
1301+ARCHOPTS = OPT_$(DEB_HOST_ARCH)
1302+OPTS = $($(ARCHOPTS))
1303+WANTED_LIBC_VERSION = 2.3.1-10
1304+
1305+build:
1306+ dh_testdir
1307+ perl util/perlpath.pl /usr/bin
1308+# perl util/ssldir.pl /usr/lib/ssl
1309+# chmod +x debian/libtool
1310+ ./Configure no-shared $(CONFARGS) debian-$(DEB_HOST_ARCH)
1311+ make -f Makefile DIRS="crypto ssl" all
1312+ mv libcrypto.a libcrypto.static
1313+ mv libssl.a libssl.static
1314+ make -f Makefile DIRS="crypto ssl" clean
1315+ test -z "$(OPTS)" || for opt in $(OPTS); \
1316+ do \
1317+ set -xe; \
1318+ ./Configure shared $(CONFARGS) debian-$(DEB_HOST_ARCH)-$$opt; \
1319+ make -f Makefile DIRS="crypto ssl" all; \
1320+ mkdir -p $$opt; \
1321+ mv libcrypto.so* libssl.so* $$opt/; \
1322+ make -f Makefile DIRS="crypto ssl" clean; \
1323+ done
1324+ ./Configure shared $(CONFARGS) debian-$(DEB_HOST_ARCH)
1325+ #make -f Makefile depend
1326+ ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
1327+# make -f Makefile linux-shared
1328+ make -f Makefile all
1329+# strip apps/openssl
1330+# make -f Makefile clean DIRS="crypto ssl"
1331+# ./Configure --prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 debian-$(DEB_HOST_ARCH)
1332+# make -f Makefile all DIRS="crypto ssl"
1333+ touch build
1334+
1335+clean:
1336+ dh_testdir
1337+ dh_testroot
1338+ -rm -f build
1339+ perl util/perlpath.pl /usr/bin
1340+ ./Configure $(CONFARGS) debian-$(DEB_HOST_ARCH)
1341+ -make -f Makefile clean clean-shared
1342+ #-make -f Makefile dclean
1343+ perl util/perlpath.pl /usr/local/bin
1344+# perl util/ssldir.pl /usr/local/ssl
1345+ -rm -f test/.rnd test/testkey.pem test/testreq.pem test/certCA.srl
1346+ -rm -f util/mk1mf.bak Makefile.bak `find . -name Makefile.save`
1347+ -rm -f crypto/pem/ctx_size
1348+ -rm -f `find . -name "*~"`
1349+ -rm -f `find . -name "*.orig" -o -name "*.rej"`
1350+ -rm -f certs/*.0 certs/*.1
1351+# -rm -rf debian/tmp debian/files* core `find debian/* -type d`
1352+ -rm -rf core $(OPTS)
1353+ -rm doc/*.pod
1354+ -rm -f libcrypto.* libssl.*
1355+ dh_clean
1356+
1357+binary-indep: build
1358+ dh_testdir
1359+ dh_testroot
1360+# There are no architecture-independent files to be uploaded
1361+# generated by this package. If there were any they would be
1362+# made here.
1363+
1364+binary-arch: build
1365+ dh_testdir
1366+ dh_testroot
1367+ dh_clean
1368+# -rm -rf debian/tmp `find debian/* -type d`
1369+ install -d debian/tmp debian/libssl0.9.7 debian/libssl-dev debian/ssleay/usr/share/doc
1370+# cd debian/tmp && install -d `cat ../dirs`
1371+# cd debian/libssl09 && install -d `cat ../libssl09.dirs`
1372+# cd debian/libssl09-dev && install -d `cat ../libssl09-dev.dirs`
1373+ dh_installdirs
1374+#openssl install
1375+ make -f Makefile install INSTALL_PREFIX=`pwd`/debian/tmp
1376+ rm debian/tmp/usr/share/man/man1/openssl.1
1377+ rm debian/tmp/usr/share/man/man3/crypto.3
1378+ rm debian/tmp/usr/share/man/man3/ssl.3
1379+# rm debian/tmp/usr/lib/libcrypto.a
1380+# rm debian/tmp/usr/lib/libssl.a
1381+ mv debian/tmp/usr/lib/libcrypto.a debian/tmp/usr/lib/libcrypto_pic.a
1382+ mv debian/tmp/usr/lib/libssl.a debian/tmp/usr/lib/libssl_pic.a
1383+ cp -pf libcrypto.static debian/tmp/usr/lib/libcrypto.a
1384+ cp -pf libssl.static debian/tmp/usr/lib/libssl.a
1385+# mv debian/tmp/usr/lib/ssl/bin debian/tmp/usr/bin/ssl
1386+# (cd debian/tmp/usr/lib/ssl; ln -s /usr/bin/ssl bin)
1387+# mv debian/tmp/usr/lib/ssl/include debian/tmp/usr/include/ssl
1388+# (cd debian/tmp/usr/lib/ssl; ln -s /usr/include/ssl include)
1389+# chmod -x debian/tmp/usr/lib/*.so.*
1390+# mv debian/tmp/usr/lib/*.a debian/libssl09-dev/usr/lib/
1391+# mv debian/tmp/usr/lib/*.so debian/libssl09-dev/usr/lib/
1392+# mv debian/tmp/usr/lib/*.so.*.*.* debian/libssl09/usr/lib/
1393+# mv debian/tmp/usr/lib/*.la debian/libssl09-dev/usr/lib/
1394+# mv debian/tmp/usr/include debian/libssl09-dev/usr/
1395+ mkdir -p debian/tmp/etc/ssl
1396+ mv debian/tmp/usr/lib/ssl/{certs,openssl.cnf,private} debian/tmp/etc/ssl/
1397+ ln -s /etc/ssl/{certs,openssl.cnf,private} debian/tmp/usr/lib/ssl/
1398+ cp -pf debian/tmp/usr/lib/libcrypto.so.* debian/libcrypto0.9.7-udeb/usr/lib/
1399+#ssleay install
1400+ #ln -s openssl debian/ssleay/usr/share/doc/ssleay
1401+#libssl install
1402+# install -m 644 libcrypto.so.08.1 libssl.so.08.1 debian/libssl08/usr/lib/
1403+# ln -s libssl.so.08 debian/libssl08-dev/usr/lib/libssl.so
1404+# ln -s libcrypto.so.08 debian/libssl08-dev/usr/lib/libcrypto.so
1405+# debian/libtool install -m 644 crypto/libcrypto.la
1406+# debian/libtool install -m 644 ssl/libssl.la
1407+ cp -auv lib*.so* debian/tmp/usr/lib/
1408+# cp -auv lib*.a debian/tmp/usr/lib/
1409+ for opt in $(OPTS); do set -xe; mkdir -p debian/tmp/usr/lib/$$opt; cp -auv $$opt/lib*.so* debian/tmp/usr/lib/$$opt/; done
1410+ install debian/copyright debian/libssl0.9.7/usr/share/doc/libssl0.9.7/
1411+ install debian/changelog debian/libssl0.9.7/usr/share/doc/libssl0.9.7/changelog.Debian
1412+ install debian/copyright debian/libssl-dev/usr/share/doc/libssl-dev/
1413+ install debian/changelog debian/libssl-dev/usr/share/doc/libssl-dev/changelog.Debian
1414+# (cd debian/tmp/usr/doc/openssl/doc; for f in *.doc*; do mv "$$f" "$$(echo $$f | sed -e 's/doc/txt/')";done)
1415+# (cd doc; for f in *; do install "$$f" ../debian/tmp/usr/share/doc/openssl/doc/"$$(echo $$f | sed -e 's/doc/txt/')";done)
1416+# debstd -u CHANGES* LICENSE README NEWS
1417+ dh_installdocs -Nssleay CHANGES.SSLeay LICENSE README NEWS debian/README.optimization
1418+ dh_installexamples
1419+ dh_installchangelogs -Nssleay CHANGES
1420+# dh_installmenu
1421+# dh_installcron
1422+ dh_installmanpages -popenssl
1423+ dh_installdebconf
1424+# dh_undocumented c_rehash.1
1425+ dh_movefiles
1426+# rmdir debian/tmp/usr/lib/ssl/lib
1427+# rmdir debian/tmp/usr/include/openssl
1428+# rmdir debian/tmp/usr/include
1429+# for opt in $(OPTS); do set -xe; rm -fr debian/tmp/usr/lib/$$opt; done
1430+ dh_strip
1431+ dh_compress
1432+ chmod 700 debian/openssl/etc/ssl/private
1433+ dh_fixperms -X etc/ssl/private
1434+ dh_perl -d
1435+# dh_suidregister
1436+ dh_shlibdeps -l`pwd` -Xlibssl.so
1437+ # Hack, to depend on version of libc6 which supports the i686 directory
1438+ if [ "${DEB_HOST_ARCH}" == "i386" ]; \
1439+ then \
1440+ SHLIB=`cat debian/libssl0.9.7.substvars`; \
1441+ LIBC_VERSION=`echo $$SHLIB | sed s'/.*libc6 (>= \(.*\))/\1/'`; \
1442+ if dpkg --compare-versions ${WANTED_LIBC_VERSION} gt $$LIBC_VERSION; \
1443+ then \
1444+ echo $$SHLIB | sed s'/libc6 (>= \(.*\))/libc6 (>= ${WANTED_LIBC_VERSION})/' > debian/libssl0.9.7.substvars; \
1445+ fi \
1446+ fi
1447+ dh_gencontrol
1448+ dh_makeshlibs -m 0.9.7
1449+ dh_installdeb
1450+ dh_md5sums
1451+ dh_builddeb
1452+ echo -en "\a"
1453+
1454+# Below here is fairly generic really
1455+
1456+binary: binary-indep binary-arch
1457+
1458+source diff:
1459+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
1460+
1461+.PHONY: binary binary-arch binary-indep clean
1462--- openssl-0.9.7e.orig/debian/copyright
1463+++ openssl-0.9.7e/debian/copyright
1464@@ -0,0 +1,130 @@
1465+This package was debianized by Christoph Martin martin@uni-mainz.de on
1466+Fri, 22 Nov 1996 21:29:51 +0100.
1467+
1468+
1469+ LICENSE ISSUES
1470+ ==============
1471+
1472+ The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
1473+ the OpenSSL License and the original SSLeay license apply to the toolkit.
1474+ See below for the actual license texts. Actually both licenses are BSD-style
1475+ Open Source licenses. In case of any license issues related to OpenSSL
1476+ please contact openssl-core@openssl.org.
1477+
1478+ OpenSSL License
1479+ ---------------
1480+
1481+/* ====================================================================
1482+ * Copyright (c) 1998-1999 The OpenSSL Project. All rights reserved.
1483+ *
1484+ * Redistribution and use in source and binary forms, with or without
1485+ * modification, are permitted provided that the following conditions
1486+ * are met:
1487+ *
1488+ * 1. Redistributions of source code must retain the above copyright
1489+ * notice, this list of conditions and the following disclaimer.
1490+ *
1491+ * 2. Redistributions in binary form must reproduce the above copyright
1492+ * notice, this list of conditions and the following disclaimer in
1493+ * the documentation and/or other materials provided with the
1494+ * distribution.
1495+ *
1496+ * 3. All advertising materials mentioning features or use of this
1497+ * software must display the following acknowledgment:
1498+ * "This product includes software developed by the OpenSSL Project
1499+ * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
1500+ *
1501+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
1502+ * endorse or promote products derived from this software without
1503+ * prior written permission. For written permission, please contact
1504+ * openssl-core@openssl.org.
1505+ *
1506+ * 5. Products derived from this software may not be called "OpenSSL"
1507+ * nor may "OpenSSL" appear in their names without prior written
1508+ * permission of the OpenSSL Project.
1509+ *
1510+ * 6. Redistributions of any form whatsoever must retain the following
1511+ * acknowledgment:
1512+ * "This product includes software developed by the OpenSSL Project
1513+ * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
1514+ *
1515+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
1516+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
1517+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
1518+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
1519+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1520+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
1521+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
1522+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
1523+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
1524+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
1525+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
1526+ * OF THE POSSIBILITY OF SUCH DAMAGE.
1527+ * ====================================================================
1528+ *
1529+ * This product includes cryptographic software written by Eric Young
1530+ * (eay@cryptsoft.com). This product includes software written by Tim
1531+ * Hudson (tjh@cryptsoft.com).
1532+ *
1533+ */
1534+
1535+ Original SSLeay License
1536+ -----------------------
1537+
1538+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
1539+ * All rights reserved.
1540+ *
1541+ * This package is an SSL implementation written
1542+ * by Eric Young (eay@cryptsoft.com).
1543+ * The implementation was written so as to conform with Netscapes SSL.
1544+ *
1545+ * This library is free for commercial and non-commercial use as long as
1546+ * the following conditions are aheared to. The following conditions
1547+ * apply to all code found in this distribution, be it the RC4, RSA,
1548+ * lhash, DES, etc., code; not just the SSL code. The SSL documentation
1549+ * included with this distribution is covered by the same copyright terms
1550+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
1551+ *
1552+ * Copyright remains Eric Young's, and as such any Copyright notices in
1553+ * the code are not to be removed.
1554+ * If this package is used in a product, Eric Young should be given attribution
1555+ * as the author of the parts of the library used.
1556+ * This can be in the form of a textual message at program startup or
1557+ * in documentation (online or textual) provided with the package.
1558+ *
1559+ * Redistribution and use in source and binary forms, with or without
1560+ * modification, are permitted provided that the following conditions
1561+ * are met:
1562+ * 1. Redistributions of source code must retain the copyright
1563+ * notice, this list of conditions and the following disclaimer.
1564+ * 2. Redistributions in binary form must reproduce the above copyright
1565+ * notice, this list of conditions and the following disclaimer in the
1566+ * documentation and/or other materials provided with the distribution.
1567+ * 3. All advertising materials mentioning features or use of this software
1568+ * must display the following acknowledgement:
1569+ * "This product includes cryptographic software written by
1570+ * Eric Young (eay@cryptsoft.com)"
1571+ * The word 'cryptographic' can be left out if the rouines from the library
1572+ * being used are not cryptographic related :-).
1573+ * 4. If you include any Windows specific code (or a derivative thereof) from
1574+ * the apps directory (application code) you must include an acknowledgement:
1575+ * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
1576+ *
1577+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
1578+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
1579+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
1580+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
1581+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
1582+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
1583+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
1584+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
1585+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
1586+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
1587+ * SUCH DAMAGE.
1588+ *
1589+ * The licence and distribution terms for any publically available version or
1590+ * derivative of this code cannot be changed. i.e. this code cannot simply be
1591+ * copied and put under another distribution licence
1592+ * [including the GNU Public Licence.]
1593+ */
1594+
1595--- openssl-0.9.7e.orig/debian/libssl-dev.docs
1596+++ openssl-0.9.7e/debian/libssl-dev.docs
1597@@ -0,0 +1 @@
1598+demos
1599--- openssl-0.9.7e.orig/debian/libssl0.9.7.prerm
1600+++ openssl-0.9.7e/debian/libssl0.9.7.prerm
1601@@ -0,0 +1,3 @@
1602+#!/bin/sh -e
1603+
1604+#DEBHELPER#
1605--- openssl-0.9.7e.orig/debian/libssl0.9.7.files
1606+++ openssl-0.9.7e/debian/libssl0.9.7.files
1607@@ -0,0 +1,3 @@
1608+usr/lib/*.so.*.*.*
1609+usr/lib/*/*.so.*.*.*
1610+usr/lib/i686/cmov/*.so.*.*.*
1611--- openssl-0.9.7e.orig/debian/openssl.prerm
1612+++ openssl-0.9.7e/debian/openssl.prerm
1613@@ -0,0 +1,3 @@
1614+#!/bin/sh -e
1615+
1616+#DEBHELPER#
1617--- openssl-0.9.7e.orig/debian/ssleay.postinst
1618+++ openssl-0.9.7e/debian/ssleay.postinst
1619@@ -0,0 +1,9 @@
1620+#!/bin/sh -e
1621+
1622+ if [ "$1" = "configure" ]; then
1623+ if [ -d /usr/doc -a ! -e /usr/doc/ssleay -a -d /usr/share/doc/ssleay ]; then
1624+ ln -sf ../share/doc/ssleay /usr/doc/ssleay
1625+ fi
1626+ fi
1627+
1628+#DEBHELPER#
1629--- openssl-0.9.7e.orig/debian/ssleay.prerm
1630+++ openssl-0.9.7e/debian/ssleay.prerm
1631@@ -0,0 +1,7 @@
1632+#!/bin/sh -e
1633+
1634+ if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/ssleay ]; then
1635+ rm -f /usr/doc/ssleay
1636+ fi
1637+
1638+#DEBHELPER#
1639--- openssl-0.9.7e.orig/debian/libssl-dev.postinst
1640+++ openssl-0.9.7e/debian/libssl-dev.postinst
1641@@ -0,0 +1,3 @@
1642+#!/bin/sh -e
1643+
1644+#DEBHELPER#
1645--- openssl-0.9.7e.orig/debian/libssl-dev.files
1646+++ openssl-0.9.7e/debian/libssl-dev.files
1647@@ -0,0 +1,9 @@
1648+usr/lib/libssl.so
1649+usr/lib/libcrypto.so
1650+usr/lib/libssl.a
1651+usr/lib/libcrypto.a
1652+usr/lib/libssl_pic.a
1653+usr/lib/libcrypto_pic.a
1654+usr/lib/pkgconfig/openssl.pc
1655+usr/include
1656+usr/share/man/man3
1657--- openssl-0.9.7e.orig/debian/libssl-dev.dirs
1658+++ openssl-0.9.7e/debian/libssl-dev.dirs
1659@@ -0,0 +1,3 @@
1660+usr/lib
1661+usr/share/doc/libssl-dev
1662+usr/share/man
1663--- openssl-0.9.7e.orig/debian/libssl-dev.prerm
1664+++ openssl-0.9.7e/debian/libssl-dev.prerm
1665@@ -0,0 +1,3 @@
1666+#!/bin/sh -e
1667+
1668+#DEBHELPER#
1669--- openssl-0.9.7e.orig/debian/shlibs.local
1670+++ openssl-0.9.7e/debian/shlibs.local
1671@@ -0,0 +1,2 @@
1672+libcrypto 0.9.7 libssl0.9.7
1673+libssl 0.9.7 libssl0.9.7
1674--- openssl-0.9.7e.orig/debian/README.optimization
1675+++ openssl-0.9.7e/debian/README.optimization
1676@@ -0,0 +1,32 @@
1677+openssl ships optimized libraries for some cpus. The loading of these
1678+libraries depends on the ability of the dynamic linker to automaticly
1679+search additional directories depending on the cpu. If you want to
1680+find out which are these directories for your computer, run the
1681+following command:
1682+
1683+LD_LIBRARY_PATH=/usr/lib strace true 2>&1 | fgrep "open(\"/usr/lib"
1684+
1685+On a Pentium III this gives:
1686+
1687+open("/usr/lib/i686/mmx/libc.so.6", O_RDONLY) = -1 ENOENT (No such file or directory)
1688+open("/usr/lib/i686/libc.so.6", O_RDONLY) = -1 ENOENT (No such file or directory)
1689+open("/usr/lib/mmx/libc.so.6", O_RDONLY) = -1 ENOENT (No such file or directory)
1690+open("/usr/lib/libc.so.6", O_RDONLY) = -1 ENOENT (No such file or directory)
1691+
1692+Following is a list of cpus, library paths and possible optimizations:
1693+
1694+486 /usr/lib/i486 -march=i486 -mcpu=i486 +asm
1695+Pentium /usr/lib/i586 -march=i586 -mcpu=i586 +asm
1696+Pentium MMX /usr/lib/i586 -march=i586 -mcpu=i586 +asm
1697+Pentium II /usr/lib/i686 -march=i686 -mcpu=i686 +asm
1698+Pentium III /usr/lib/i686 -march=i686 -mcpu=i686 +asm
1699+AMD-K6 /usr/lib/i586 -march=i586 -mcpu=i586 +asm
1700+AMD-K7 /usr/lib/i686 -march=i686 -mcpu=i686 +asm
1701+
1702+Sparc v8 /usr/lib/v8 -mcpu=v8 +asm
1703+Sparc v9 /usr/lib/v9 -mcpu=v9 -Wa,-Av8plus +asm
1704+
1705+Alpha EV4 /usr/lib/ev4 -mcpu=ev4
1706+Alpha EV5 /usr/lib/ev5 -mcpu=ev5
1707+
1708++asm means that the handcrafted 586 assembler routines can be used.
1709--- openssl-0.9.7e.orig/debian/openssl.preinst
1710+++ openssl-0.9.7e/debian/openssl.preinst
1711@@ -0,0 +1,36 @@
1712+#!/bin/sh -e
1713+
1714+if [ -L /etc/ssl ]
1715+then
1716+ echo Removing obsolete link /etc/ssl
1717+ rm /etc/ssl
1718+fi
1719+if [ ! -d /etc/ssl ]
1720+then
1721+ echo Creating directory /etc/ssl
1722+ mkdir /etc/ssl
1723+fi
1724+if [ -d /usr/lib/ssl ]
1725+then
1726+ for file in lib certs private
1727+ do
1728+ if [ -e /usr/lib/ssl/$file -a ! -L /usr/lib/ssl/$file ]
1729+ then
1730+ echo Moving $file from /usr/lib/ssl to /etc/ssl
1731+ cp -av /usr/lib/ssl/$file /etc/ssl || true
1732+ rm -fr /usr/lib/ssl/$file
1733+ fi
1734+ done
1735+fi
1736+if [ -L /usr/lib/ssl ]
1737+then
1738+ echo Removeing obsolete link /usr/lib/ssl
1739+ rm /usr/lib/ssl
1740+fi
1741+if [ -e /etc/ssl/lib/openssl.cnf ]
1742+then
1743+ echo Moving openssl.cnf
1744+ mv /etc/ssl/lib/openssl.cnf /etc/ssl/
1745+fi
1746+
1747+#DEBHELPER#
1748--- openssl-0.9.7e.orig/debian/libssl0.9.7.dirs
1749+++ openssl-0.9.7e/debian/libssl0.9.7.dirs
1750@@ -0,0 +1,2 @@
1751+usr/lib
1752+usr/share/doc/libssl0.9.7
1753--- openssl-0.9.7e.orig/debian/libssl0.9.7.postinst
1754+++ openssl-0.9.7e/debian/libssl0.9.7.postinst
1755@@ -0,0 +1,139 @@
1756+#!/bin/sh -e
1757+
1758+. /usr/share/debconf/confmodule
1759+
1760+package_name()
1761+{
1762+ echo $(basename $0 .postinst)
1763+}
1764+
1765+# element() is a helper function for file-rc:
1766+element() {
1767+ local element list IFS
1768+
1769+ element="$1"
1770+
1771+ [ "$2" = "in" ] && shift
1772+ list="$2"
1773+ [ "$list" = "-" ] && return 1
1774+ [ "$list" = "*" ] && return 0
1775+
1776+ IFS=","
1777+ set -- $list
1778+ case $element in
1779+ "$1"|"$2"|"$3"|"$4"|"$5"|"$6"|"$7"|"$8"|"$9")
1780+ return 0
1781+ esac
1782+ return 1
1783+}
1784+
1785+# filerc (runlevel, service) returns /etc/init.d/service, if service is
1786+# running in $runlevel:
1787+filerc() {
1788+ local runlevel basename
1789+ runlevel=$1
1790+ basename=$2
1791+ while read LINE
1792+ do
1793+ case $LINE in
1794+ \#*|"") continue
1795+ esac
1796+
1797+ set -- $LINE
1798+ SORT_NO="$1"; STOP="$2"; START="$3"; CMD="$4"
1799+ [ "$CMD" = "/etc/init.d/$basename" ] || continue
1800+
1801+ if element "$runlevel" in "$START" || element "S" in "$START"
1802+ then
1803+ echo "/etc/init.d/$basename"
1804+ return 0
1805+ fi
1806+ done < /etc/runlevel.conf
1807+ echo ""
1808+}
1809+
1810+if [ "$1" = "configure" ]
1811+then
1812+ if [ ! -z $2 ]; then
1813+ if dpkg --compare-versions $2 lt 0.9.7d-1; then
1814+ echo -n "Checking for services that may need to be restarted..."
1815+
1816+ check="sendmail ssh"
1817+ check="$check apache2-common ssh-nonfree exim4"
1818+ check="$check apache-ssl libapache-mod-ssl openvpn spamassassin"
1819+ check="$check courier-imap-ssl courier-mta-ssl courier-pop-ssl"
1820+ check="$check postfix-tls cyrus21-imapd cyrus21-pop3d"
1821+ check="$check postgresql racoon"
1822+ # Only get the ones that are installed, and configured
1823+ check=$(dpkg -s $check 2> /dev/null | sed '/^$/{N;/^\n$/D;}' | awk 'BEGIN{RS="\n\n";FS="\n"}{if ( $2 ~ /Status: .* installed$/ ) { print $1 } }' | cut -f 2 -d ' ')
1824+ # apache2 ships its init script in apache2-common, but the
1825+ # script is apache2
1826+ check=$(echo $check | sed 's/apache2-common/apache2/g')
1827+ # For mod-ssl apache has to be restarted
1828+ check=$(echo $check | sed 's/libapache-mod-ssl/apache/g')
1829+ rl=$(runlevel | awk '{print $2}')
1830+ for service in $check; do
1831+ if [ -f /usr/share/file-rc/rc -o -f /usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ]; then
1832+ idl=$(filerc $rl $service)
1833+ else
1834+ idl=$(ls /etc/rc${rl}.d/S??${service} 2> /dev/null | head -n 1)
1835+ fi
1836+ if [ -n "$idl" ] && [ -x $idl ]; then
1837+ services="$service $services"
1838+ fi
1839+ done
1840+ echo "done."
1841+ if [ -n "$services" ]; then
1842+ db_version 2.0
1843+
1844+ db_reset libssl0.9.7/restart-services
1845+ db_set libssl0.9.7/restart-services "$services"
1846+ db_input critical libssl0.9.7/restart-services || true
1847+ db_go || true
1848+ db_get libssl0.9.7/restart-services
1849+ # Arghhh, close all the stupid debconf pipes
1850+ db_stop
1851+
1852+ if [ "x$RET" != "x" ]
1853+ then
1854+ services=$RET
1855+ answer=yes
1856+ else
1857+ answer=no
1858+ fi
1859+ echo
1860+ if [ "$answer" = yes ] && [ "$services" != "" ]; then
1861+ echo "Restarting services possibly affected by the upgrade:"
1862+ failed=""
1863+ for service in $services; do
1864+ idl=$(ls /etc/rc${rl}.d/S??${service} 2> /dev/null | head -n 1)
1865+ echo -n " $service: stopping..."
1866+ $idl stop > /dev/null 2>&1 || true
1867+ sleep 1
1868+ echo -n "starting..."
1869+ if $idl start > /dev/null 2>&1; then
1870+ echo "done."
1871+ else
1872+ echo "FAILED! ($?)"
1873+ failed="$service $failed"
1874+ fi
1875+ done
1876+ echo
1877+ if [ -n "$failed" ]; then
1878+ # Ruh roh, George
1879+ echo "The following services failed to start: $failed"
1880+ echo
1881+ echo "You will need to start these manually by running \`/etc/init.d/<service> start'"
1882+ echo "If the service still fails to start, you may need to file a bug on"
1883+ echo "$(package_name) or the service involved."
1884+ else
1885+ echo "Services restarted successfully."
1886+ fi
1887+ echo
1888+ fi
1889+ fi
1890+ fi # end upgrading and $2 lt 0.9.7c-1
1891+ fi # Upgrading
1892+fi
1893+
1894+#DEBHELPER#
1895--- openssl-0.9.7e.orig/debian/openssl.postinst
1896+++ openssl-0.9.7e/debian/openssl.postinst
1897@@ -0,0 +1,9 @@
1898+#!/bin/sh -e
1899+
1900+if [ ! -e /usr/lib/ssl ]
1901+then
1902+ echo Linking /usr/lib/ssl to /etc/ssl
1903+ ln -sf /etc/ssl /usr/lib/ssl
1904+fi
1905+
1906+#DEBHELPER#
1907--- openssl-0.9.7e.orig/debian/openssl.docs
1908+++ openssl-0.9.7e/debian/openssl.docs
1909@@ -0,0 +1 @@
1910+doc
1911--- openssl-0.9.7e.orig/debian/openssl.dirs
1912+++ openssl-0.9.7e/debian/openssl.dirs
1913@@ -0,0 +1,5 @@
1914+usr/share/doc/openssl/doc
1915+usr/bin
1916+usr/lib
1917+etc/ssl/certs
1918+etc/ssl/private
1919--- openssl-0.9.7e.orig/debian/openssl.files
1920+++ openssl-0.9.7e/debian/openssl.files
1921@@ -0,0 +1,6 @@
1922+usr/share/man/man1
1923+usr/share/man/man5
1924+usr/share/man/man7
1925+usr/bin
1926+usr/lib/ssl
1927+etc/ssl
1928--- openssl-0.9.7e.orig/debian/libssl0.9.7.preinst
1929+++ openssl-0.9.7e/debian/libssl0.9.7.preinst
1930@@ -0,0 +1,3 @@
1931+#!/bin/sh -e
1932+
1933+#DEBHELPER#
1934--- openssl-0.9.7e.orig/debian/libssl0.9.7.templates
1935+++ openssl-0.9.7e/debian/libssl0.9.7.templates
1936@@ -0,0 +1,15 @@
1937+Template: libssl0.9.7/restart-services
1938+Type: string
1939+_Description: Which services should be restarted to make them use the new libraries?
1940+ Security holes were fixed with this release. Services may not use these
1941+ fixes until they are restarted. Note: restarting sshd should not affect any
1942+ existing connections.
1943+ .
1944+ Following is a list of detected services that need to be restarted. Please
1945+ correct the list, if you think it is incorrect. The services names must be
1946+ identical to the script names in /etc/init.d and must be separated by
1947+ spaces. If you clear the list, no services will be restarted.
1948+ .
1949+ If other services begin to fail mysteriously after this upgrade, it may be
1950+ necessary to restart them too. We strongly recommend you to reboot your
1951+ machine to avoid the SSL related trouble.
1952--- openssl-0.9.7e.orig/debian/watch
1953+++ openssl-0.9.7e/debian/watch
1954@@ -0,0 +1,2 @@
1955+version=2
1956+ftp://ftp.openssl.org/source/openssl-(([\d+\.]+|\d+)[a-z]?)\.tar\.gz debian uupdate
1957--- openssl-0.9.7e.orig/debian/libcrypto0.9.7-udeb.dirs
1958+++ openssl-0.9.7e/debian/libcrypto0.9.7-udeb.dirs
1959@@ -0,0 +1 @@
1960+usr/lib
1961--- openssl-0.9.7e.orig/debian/po/POTFILES.in
1962+++ openssl-0.9.7e/debian/po/POTFILES.in
1963@@ -0,0 +1 @@
1964+[type: gettext/rfc822deb] libssl0.9.7.templates
1965--- openssl-0.9.7e.orig/debian/po/fr.po
1966+++ openssl-0.9.7e/debian/po/fr.po
1967@@ -0,0 +1,69 @@
1968+#
1969+# Translators, if you are not familiar with the PO format, gettext
1970+# documentation is worth reading, especially sections dedicated to
1971+# this format, e.g. by running:
1972+# info -n '(gettext)PO Files'
1973+# info -n '(gettext)Header Entry'
1974+# Some information specific to po-debconf are available at
1975+# /usr/share/doc/po-debconf/README-trans
1976+# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
1977+# Developers do not need to manually edit POT or PO files.
1978+#
1979+msgid ""
1980+msgstr ""
1981+"Project-Id-Version: openssl_0.9.7c-5\n"
1982+"Report-Msgid-Bugs-To: \n"
1983+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
1984+"PO-Revision-Date: 2003-10-22 21:37+0200\n"
1985+"Last-Translator: Michel Grentzinger <mic.grentz@online.fr>\n"
1986+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
1987+"MIME-Version: 1.0\n"
1988+"Content-Type: text/plain; charset=ISO-8859-15\n"
1989+"Content-Transfer-Encoding: 8bit\n"
1990+
1991+#. Type: string
1992+#. Description
1993+#: ../libssl0.9.7.templates:3
1994+msgid "Which services should be restarted to make them use the new libraries?"
1995+msgstr "Services à redémarrer afin d'utiliser les nouvelles bibliothèques"
1996+
1997+#. Type: string
1998+#. Description
1999+#: ../libssl0.9.7.templates:3
2000+msgid ""
2001+"Security holes were fixed with this release. Services may not use these "
2002+"fixes until they are restarted. Note: restarting sshd should not affect any "
2003+"existing connections."
2004+msgstr ""
2005+"Des failles de sécurité on été corrigées dans cette version. Les services ne "
2006+"devraient pas utiliser ces correctifs tant qu'ils n'auront pas été "
2007+"redémarrés. Note : le redémarrage de sshd n'affectera aucune connexion "
2008+"existante."
2009+
2010+#. Type: string
2011+#. Description
2012+#: ../libssl0.9.7.templates:3
2013+msgid ""
2014+"Following is a list of detected services that need to be restarted. Please "
2015+"correct the list, if you think it is incorrect. The services names must be "
2016+"identical to the script names in /etc/init.d and must be separated by "
2017+"spaces. If you clear the list, no services will be restarted."
2018+msgstr ""
2019+"La liste suivante recense tous les services devant être redémarrés. Veuillez "
2020+"corriger la liste si vous pensez qu'elle contient des erreurs. Les noms des "
2021+"services doivent être identiques aux noms des scripts présents dans /etc/"
2022+"init.d et doivent être séparés par des espaces. Si vous effacez la liste, "
2023+"aucun service ne sera redémarré."
2024+
2025+#. Type: string
2026+#. Description
2027+#: ../libssl0.9.7.templates:3
2028+msgid ""
2029+"If other services begin to fail mysteriously after this upgrade, it may be "
2030+"necessary to restart them too. We strongly recommend you to reboot your "
2031+"machine to avoid the SSL related trouble."
2032+msgstr ""
2033+"Si d'autres services ne fonctionnent plus correctement après cette mise à "
2034+"jour, il est sans doute nécessaire de les redémarrer de la même façon. Il "
2035+"est fortement recommandé de redémarrer votre machine pour éviter les "
2036+"problèmes liés à SSL."
2037--- openssl-0.9.7e.orig/debian/po/templates.pot
2038+++ openssl-0.9.7e/debian/po/templates.pot
2039@@ -0,0 +1,59 @@
2040+#
2041+# Translators, if you are not familiar with the PO format, gettext
2042+# documentation is worth reading, especially sections dedicated to
2043+# this format, e.g. by running:
2044+# info -n '(gettext)PO Files'
2045+# info -n '(gettext)Header Entry'
2046+#
2047+# Some information specific to po-debconf are available at
2048+# /usr/share/doc/po-debconf/README-trans
2049+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
2050+#
2051+# Developers do not need to manually edit POT or PO files.
2052+#
2053+#, fuzzy
2054+msgid ""
2055+msgstr ""
2056+"Project-Id-Version: PACKAGE VERSION\n"
2057+"Report-Msgid-Bugs-To: \n"
2058+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
2059+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
2060+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2061+"Language-Team: LANGUAGE <LL@li.org>\n"
2062+"MIME-Version: 1.0\n"
2063+"Content-Type: text/plain; charset=CHARSET\n"
2064+"Content-Transfer-Encoding: 8bit\n"
2065+
2066+#. Type: string
2067+#. Description
2068+#: ../libssl0.9.7.templates:3
2069+msgid "Which services should be restarted to make them use the new libraries?"
2070+msgstr ""
2071+
2072+#. Type: string
2073+#. Description
2074+#: ../libssl0.9.7.templates:3
2075+msgid ""
2076+"Security holes were fixed with this release. Services may not use these "
2077+"fixes until they are restarted. Note: restarting sshd should not affect any "
2078+"existing connections."
2079+msgstr ""
2080+
2081+#. Type: string
2082+#. Description
2083+#: ../libssl0.9.7.templates:3
2084+msgid ""
2085+"Following is a list of detected services that need to be restarted. Please "
2086+"correct the list, if you think it is incorrect. The services names must be "
2087+"identical to the script names in /etc/init.d and must be separated by "
2088+"spaces. If you clear the list, no services will be restarted."
2089+msgstr ""
2090+
2091+#. Type: string
2092+#. Description
2093+#: ../libssl0.9.7.templates:3
2094+msgid ""
2095+"If other services begin to fail mysteriously after this upgrade, it may be "
2096+"necessary to restart them too. We strongly recommend you to reboot your "
2097+"machine to avoid the SSL related trouble."
2098+msgstr ""
2099--- openssl-0.9.7e.orig/debian/po/pt_BR.po
2100+++ openssl-0.9.7e/debian/po/pt_BR.po
2101@@ -0,0 +1,71 @@
2102+#
2103+# Translators, if you are not familiar with the PO format, gettext
2104+# documentation is worth reading, especially sections dedicated to
2105+# this format, e.g. by running:
2106+# info -n '(gettext)PO Files'
2107+# info -n '(gettext)Header Entry'
2108+#
2109+# Some information specific to po-debconf are available at
2110+# /usr/share/doc/po-debconf/README-trans
2111+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
2112+#
2113+# Developers do not need to manually edit POT or PO files.
2114+#
2115+msgid ""
2116+msgstr ""
2117+"Project-Id-Version: openssl\n"
2118+"Report-Msgid-Bugs-To: \n"
2119+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
2120+"PO-Revision-Date: 2004-04-04 15:21-0300\n"
2121+"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
2122+"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
2123+"MIME-Version: 1.0\n"
2124+"Content-Type: text/plain; charset=ISO-8859-1\n"
2125+"Content-Transfer-Encoding: 8bit\n"
2126+
2127+#. Type: string
2128+#. Description
2129+#: ../libssl0.9.7.templates:3
2130+msgid "Which services should be restarted to make them use the new libraries?"
2131+msgstr "Quais serviços devem ser reiniciados para utilizar novas bibliotecas ?"
2132+
2133+#. Type: string
2134+#. Description
2135+#: ../libssl0.9.7.templates:3
2136+msgid ""
2137+"Security holes were fixed with this release. Services may not use these "
2138+"fixes until they are restarted. Note: restarting sshd should not affect any "
2139+"existing connections."
2140+msgstr ""
2141+"Falhas de segurança foram corrigidas nesta versão. Alguns serviços podem "
2142+"não utilizar estas correções até que sejam reiniciados. Note : reiniciar "
2143+"o sshd não afetará nenhuma conexão já estabelecida."
2144+
2145+#. Type: string
2146+#. Description
2147+#: ../libssl0.9.7.templates:3
2148+msgid ""
2149+"Following is a list of detected services that need to be restarted. Please "
2150+"correct the list, if you think it is incorrect. The services names must be "
2151+"identical to the script names in /etc/init.d and must be separated by "
2152+"spaces. If you clear the list, no services will be restarted."
2153+msgstr ""
2154+"A seguir será exibida uma lista de serviços que foram detectados e que "
2155+"precisam ser reiniciados. Por favor, corrija a lista caso você tenha "
2156+"certeza que ela esteja incorreta. Os nomes dos serviços devem ser "
2157+"idênticos aos nomes dos scripts sob o diretório /etc/init.d e devem "
2158+"estar separados por espaços. Caso você esvazie a lista, nenhum serviço "
2159+"será reiniciado."
2160+
2161+#. Type: string
2162+#. Description
2163+#: ../libssl0.9.7.templates:3
2164+msgid ""
2165+"If other services begin to fail mysteriously after this upgrade, it may be "
2166+"necessary to restart them too. We strongly recommend you to reboot your "
2167+"machine to avoid the SSL related trouble."
2168+msgstr ""
2169+"Caso outros serviços comecem a falhar misteriosamente após esta "
2170+"atualização, pode ser necessário reiniciá-los também. Recomendados "
2171+"fortemente que você reinicie sua máquina para evitar problemas "
2172+"relacionados a SSL."
2173--- openssl-0.9.7e.orig/debian/po/ja.po
2174+++ openssl-0.9.7e/debian/po/ja.po
2175@@ -0,0 +1,69 @@
2176+#
2177+# Translators, if you are not familiar with the PO format, gettext
2178+# documentation is worth reading, especially sections dedicated to
2179+# this format, e.g. by running:
2180+# info -n '(gettext)PO Files'
2181+# info -n '(gettext)Header Entry'
2182+#
2183+# Some information specific to po-debconf are available at
2184+# /usr/share/doc/po-debconf/README-trans
2185+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
2186+#
2187+# Developers do not need to manually edit POT or PO files.
2188+#
2189+#
2190+msgid ""
2191+msgstr ""
2192+"Project-Id-Version: openssl 0.9.7d-1\n"
2193+"Report-Msgid-Bugs-To: \n"
2194+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
2195+"PO-Revision-Date: 2004-03-24 23:41+0900\n"
2196+"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n"
2197+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
2198+"MIME-Version: 1.0\n"
2199+"Content-Type: text/plain; charset=EUC-JP\n"
2200+"Content-Transfer-Encoding: 8bit\n"
2201+
2202+#. Type: string
2203+#. Description
2204+#: ../libssl0.9.7.templates:3
2205+msgid "Which services should be restarted to make them use the new libraries?"
2206+msgstr "¤É¤Î¥µ¡¼¥Ó¥¹¤ò¿·¤·¤¤¥é¥¤¥Ö¥é¥ê¤ò»È¤¦¤¿¤á¤ËºÆµ¯Æ°¤·¤Þ¤¹¤«?"
2207+
2208+#. Type: string
2209+#. Description
2210+#: ../libssl0.9.7.templates:3
2211+msgid ""
2212+"Security holes were fixed with this release. Services may not use these "
2213+"fixes until they are restarted. Note: restarting sshd should not affect any "
2214+"existing connections."
2215+msgstr ""
2216+"º£²ó¤Î¥ê¥ê¡¼¥¹¤Ç¥»¥­¥å¥ê¥Æ¥£¥Û¡¼¥ë¤¬½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£³Æ¥µ¡¼¥Ó¥¹¤ÏºÆµ¯Æ°¤ò¹Ô¤¦"
2217+"¤Þ¤Ç¤³¤Î½¤Àµ¤µ¤ì¤¿¥é¥¤¥Ö¥é¥ê¤òÍøÍѤ·¤Þ¤»¤ó¡£Ãí°Õ: sshd ¤ÎºÆµ¯Æ°¤Ï¸½¾õ¤ÎÀܳ¤Ë"
2218+"¤Ï²¿¤é±Æ¶Á¤·¤Þ¤»¤ó¡£"
2219+
2220+#. Type: string
2221+#. Description
2222+#: ../libssl0.9.7.templates:3
2223+msgid ""
2224+"Following is a list of detected services that need to be restarted. Please "
2225+"correct the list, if you think it is incorrect. The services names must be "
2226+"identical to the script names in /etc/init.d and must be separated by "
2227+"spaces. If you clear the list, no services will be restarted."
2228+msgstr ""
2229+"°Ê²¼¤¬ºÆµ¯Æ°¤¬É¬ÍפÀ¤ÈȽÃǤµ¤ì¤¿¥µ¡¼¥Ó¥¹¤Î¥ê¥¹¥È¤Ç¤¹¡£´Ö°ã¤Ã¤Æ¤¤¤ë¤È»×¤Ã¤¿¤é"
2230+"½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤¡£¥µ¡¼¥Ó¥¹Ì¾¤Ï /etc/init.d ¤Ë¤¢¤ë¥¹¥¯¥ê¥×¥È¤Î̾Á°¤ò»Ø¤·¡¢¶õÇò"
2231+"¤Ç¶èÀÚ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥ê¥¹¥È¤¬¶õ¤Î¾ì¹ç¤Ï¡¢¥µ¡¼¥Ó¥¹¤ÎºÆµ¯Æ°¤ÏɬÍפ¢¤ê¤Þ¤»"
2232+"¤ó¡£"
2233+
2234+#. Type: string
2235+#. Description
2236+#: ../libssl0.9.7.templates:3
2237+msgid ""
2238+"If other services begin to fail mysteriously after this upgrade, it may be "
2239+"necessary to restart them too. We strongly recommend you to reboot your "
2240+"machine to avoid the SSL related trouble."
2241+msgstr ""
2242+"¾¤Î¥µ¡¼¥Ó¥¹¤¬¤³¤³¤Ç¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¸å¤Ë²¿¸Î¤«¥¨¥é¡¼¤òµ¯¤³¤·»Ï¤á¤¿¾ì¹ç¡¢¤½"
2243+"¤ì¤é¤âºÆµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£SSL ´ØÏ¢¤Î¥È¥é¥Ö¥ë¤òÈò¤±¤ë¤¿¤á¤Ë¥Þ¥·¥ó¤òºÆµ¯"
2244+"Æ°¤¹¤ë¤Î¤ò¶¯¤¯¤ª´«¤á¤·¤Þ¤¹¡£"
2245--- openssl-0.9.7e.orig/debian/po/da.po
2246+++ openssl-0.9.7e/debian/po/da.po
2247@@ -0,0 +1,71 @@
2248+# translation of openssl_0.9.7d-1_templates.po to Danish
2249+#
2250+# Translators, if you are not familiar with the PO format, gettext
2251+# documentation is worth reading, especially sections dedicated to
2252+# this format, e.g. by running:
2253+# info -n '(gettext)PO Files'
2254+# info -n '(gettext)Header Entry'
2255+# Some information specific to po-debconf are available at
2256+# /usr/share/doc/po-debconf/README-trans
2257+# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
2258+# Developers do not need to manually edit POT or PO files.
2259+# Claus Hindsgaul <claus_h@image.dk>, 2004.
2260+#
2261+msgid ""
2262+msgstr ""
2263+"Project-Id-Version: openssl_0.9.7d-1_templates\n"
2264+"Report-Msgid-Bugs-To: \n"
2265+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
2266+"PO-Revision-Date: 2004-04-02 16:08+0200\n"
2267+"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
2268+"Language-Team: Danish <dansk@klid.dk>\n"
2269+"MIME-Version: 1.0\n"
2270+"Content-Type: text/plain; charset=ISO-8859-1\n"
2271+"Content-Transfer-Encoding: 8bit\n"
2272+"X-Generator: KBabel 1.3.1\n"
2273+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2274+
2275+#. Type: string
2276+#. Description
2277+#: ../libssl0.9.7.templates:3
2278+msgid "Which services should be restarted to make them use the new libraries?"
2279+msgstr "Hvilke services skal genstartes, så de benytter de nye biblioteker?"
2280+
2281+#. Type: string
2282+#. Description
2283+#: ../libssl0.9.7.templates:3
2284+msgid ""
2285+"Security holes were fixed with this release. Services may not use these "
2286+"fixes until they are restarted. Note: restarting sshd should not affect any "
2287+"existing connections."
2288+msgstr ""
2289+"Der lukket nogle sikkerhedshuller i denne version af openssl. Disse huller "
2290+"bliver ikke lukket i dine services før de er blevet genstartet. Bemærk at "
2291+"det ikke vil påvirke eksisterende forbindelser at genstarte ssh."
2292+
2293+#. Type: string
2294+#. Description
2295+#: ../libssl0.9.7.templates:3
2296+msgid ""
2297+"Following is a list of detected services that need to be restarted. Please "
2298+"correct the list, if you think it is incorrect. The services names must be "
2299+"identical to the script names in /etc/init.d and must be separated by "
2300+"spaces. If you clear the list, no services will be restarted."
2301+msgstr ""
2302+"Herunder ser du en liste over fundne services, som bør genstartes. Ret "
2303+"listen, hvis du mener at den ikke er korrekt. Servicenavnene skal være "
2304+"identiske med skriptnavnene i /etc/init.d, og skal adskilles med "
2305+"mellemrum. Hvis du sletter listen, vil ingen services blive genstartet."
2306+
2307+#. Type: string
2308+#. Description
2309+#: ../libssl0.9.7.templates:3
2310+msgid ""
2311+"If other services begin to fail mysteriously after this upgrade, it may be "
2312+"necessary to restart them too. We strongly recommend you to reboot your "
2313+"machine to avoid the SSL related trouble."
2314+msgstr ""
2315+"Hvis andre services begynder at fejle på mystisk vis efter denne opgradering, "
2316+"kan det være nødvendigt også at genstarte disse. Vi anbefaler dig kraftigt "
2317+"at genstarte din maskine for at undgå SSL-relaterede problemer."
2318+
2319--- openssl-0.9.7e.orig/debian/po/ca.po
2320+++ openssl-0.9.7e/debian/po/ca.po
2321@@ -0,0 +1,59 @@
2322+# openssl (debconf) translation to Catalan.
2323+# Copyright (C) 2004 Free Software Foundation, Inc.
2324+# Aleix Badia i Bosch <abadia@ica.es>, 2004
2325+msgid ""
2326+msgstr ""
2327+"Project-Id-Version: openssl_0.9.7d-1_templates\n"
2328+"Report-Msgid-Bugs-To: \n"
2329+"POT-Creation-Date: 2003-07-20 11:44+0200\n"
2330+"PO-Revision-Date: 2004-04-08 19:46GMT\n"
2331+"Last-Translator: Aleix Badia i Bosch <abadia@ica.es>\n"
2332+"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
2333+"MIME-Version: 1.0\n"
2334+"Content-Type: text/plain; charset=UTF-8\n"
2335+"Content-Transfer-Encoding: 8bit"
2336+
2337+#. Type: string
2338+#. Description
2339+#: ../libssl0.9.7.templates:3
2340+msgid "Which services should be restarted to make them use the new libraries?"
2341+msgstr ""
2342+"Quina serveis s'han de reiniciar perquè utilitzin les noves biblioteques?"
2343+
2344+#. Type: string
2345+#. Description
2346+#: ../libssl0.9.7.templates:3
2347+msgid ""
2348+"Security holes were fixed with this release. Services may not use these "
2349+"fixes until they are restarted. Note: restarting sshd should not affect any "
2350+"existing connections."
2351+msgstr ""
2352+"Aquesta versió resol els errors de seguretat. Els serveis no utilitzaran les "
2353+"correccions fins que no s'hagin reiniciat. Nota: reiniciant l'sshd no "
2354+"s'afectarà cap connexió existent."
2355+
2356+#. Type: string
2357+#. Description
2358+#: ../libssl0.9.7.templates:3
2359+msgid ""
2360+"Following is a list of detected services that need to be restarted. Please "
2361+"correct the list, if you think it is incorrect. The services names must be "
2362+"identical to the script names in /etc/init.d and must be separated by "
2363+"spaces. If you clear the list, no services will be restarted."
2364+msgstr ""
2365+"És una llista de serveis que s'ha detectat que s'haurien de reiniciar, "
2366+"corregiu-la si és incorrecta. El nom dels serveis hauria de ser idèntic als "
2367+"noms de les seqüències del directori /etc/init.d i haurien d'estar separats "
2368+"per espais. Si suprimiu la llista no es reiniciarà cap servei."
2369+
2370+#. Type: string
2371+#. Description
2372+#: ../libssl0.9.7.templates:3
2373+msgid ""
2374+"If other services begin to fail mysteriously after this upgrade, it may be "
2375+"necessary to restart them too. We strongly recommend you to reboot your "
2376+"machine to avoid the SSL related trouble."
2377+msgstr ""
2378+"Si després de l'actualització d'altres serveis fallen de forma inexplicable, "
2379+"probablement també sigui necessari reiniciar-los. Us recomanem que per "
2380+"evitar els problemes relacionats amb l'SSL reinicieu l'ordinador."
2381--- openssl-0.9.7e.orig/debian/po/es.po
2382+++ openssl-0.9.7e/debian/po/es.po
2383@@ -0,0 +1,84 @@
2384+# openssl translation to spanish
2385+# Copyright (C) 2004 Software in the Public Interest
2386+# This file is distributed under the same license as the openssl package.
2387+#
2388+# Changes:
2389+# - Initial translation
2390+# Lucas Wall <kthulhu@kadath.com.ar>, 2004
2391+#
2392+#
2393+# Traductores, si no conoce el formato PO, merece la pena leer la
2394+# documentación de gettext, especialmente las secciones dedicadas a este
2395+# formato, por ejemplo ejecutando:
2396+# info -n '(gettext)PO Files'
2397+# info -n '(gettext)Header Entry'
2398+#
2399+# Equipo de traducción al español, por favor lean antes de traducir
2400+# los siguientes documentos:
2401+#
2402+# - El proyecto de traducción de Debian al español
2403+# http://www.debian.org/intl/spanish/coordinacion
2404+# especialmente las notas de traducción en
2405+# http://www.debian.org/intl/spanish/notas
2406+#
2407+# - La guía de traducción de po's de debconf:
2408+# /usr/share/doc/po-debconf/README-trans
2409+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
2410+#
2411+msgid ""
2412+msgstr ""
2413+"Project-Id-Version: openssl 0.9.7d-3\n"
2414+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
2415+"PO-Revision-Date: 2004-06-12 15:23-0300\n"
2416+"Last-Translator: Lucas Wall <kthulhu@kadath.com.ar>\n"
2417+"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
2418+"MIME-Version: 1.0\n"
2419+"Content-Type: text/plain; charset=ISO-8859-15\n"
2420+"Content-Transfer-Encoding: 8bit\n"
2421+
2422+#. Type: string
2423+#. Description
2424+#: ../libssl0.9.7.templates:3
2425+msgid "Which services should be restarted to make them use the new libraries?"
2426+msgstr ""
2427+"¿Qué servicios desea reiniciar para que utilicen las nuevas bibliotecas?"
2428+
2429+#. Type: string
2430+#. Description
2431+#: ../libssl0.9.7.templates:3
2432+msgid ""
2433+"Security holes were fixed with this release. Services may not use these "
2434+"fixes until they are restarted. Note: restarting sshd should not affect any "
2435+"existing connections."
2436+msgstr ""
2437+"En esta versión se han solucionado problemas de seguridad. Los servicios "
2438+"afectados no gozarán de los arreglos hasta que no se hayan reiniciado. Nota: "
2439+"reiniciar el servicio «sshd» no afectará ninguna de las conexiones "
2440+"existentes."
2441+
2442+#. Type: string
2443+#. Description
2444+#: ../libssl0.9.7.templates:3
2445+msgid ""
2446+"Following is a list of detected services that need to be restarted. Please "
2447+"correct the list, if you think it is incorrect. The services names must be "
2448+"identical to the script names in /etc/init.d and must be separated by "
2449+"spaces. If you clear the list, no services will be restarted."
2450+msgstr ""
2451+"Una lista de los servicios que deben ser reiniciados se presenta a "
2452+"continuación. Si cree que no es correcta haga los ajustes necesarios. Los "
2453+"nombres de los servicios deben ser iguales a los nombres de los ficheros "
2454+"en «/etc/init.d» y debe estar separados por espacios. Ningún servicio será "
2455+"reiniciado si deja la lista en blanco."
2456+
2457+#. Type: string
2458+#. Description
2459+#: ../libssl0.9.7.templates:3
2460+msgid ""
2461+"If other services begin to fail mysteriously after this upgrade, it may be "
2462+"necessary to restart them too. We strongly recommend you to reboot your "
2463+"machine to avoid the SSL related trouble."
2464+msgstr ""
2465+"Si, tras esta actualización, otros servicios comienzan a fallar en forma "
2466+"misteriosa puede ser necesario reiniciarlos también. Para evitar problemas "
2467+"relacionados con «SSL» se le recomienda reiniciar su sistema."
2468--- openssl-0.9.7e.orig/debian/po/nl.pl
2469+++ openssl-0.9.7e/debian/po/nl.pl
2470@@ -0,0 +1,48 @@
2471+#!/usr/local/bin/perl
2472+# Translators, if you are not familiar with the PO format, gettext
2473+# documentation is worth reading, especially sections dedicated to
2474+# this format, e.g. by running:
2475+# info -n '(gettext)PO Files'
2476+# info -n '(gettext)Header Entry'
2477+#
2478+# Some information specific to po-debconf are available at
2479+# /usr/share/doc/po-debconf/README-trans
2480+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
2481+#
2482+# Developers do not need to manually edit POT or PO files.
2483+#
2484+msgid ""
2485+msgstr ""
2486+"Project-Id-Version: openssl 0.9.7d-5\n"
2487+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
2488+"PO-Revision-Date: 2004-08-01 18:31+0100\n"
2489+"Last-Translator: Luk Claes <luk.claes@ugent.be>\n"
2490+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
2491+"MIME-Version: 1.0\n"
2492+"Content-Type: text/plain; charset=iso-8859-1\n"
2493+"Content-Transfer-Encoding: 8bit\n"
2494+
2495+#. Type: string
2496+#. Description
2497+#: ../libssl0.9.7.templates:3
2498+msgid "Which services should be restarted to make them use the new libraries?"
2499+msgstr "Welke diensten moeten herstart worden om ze de nieuwe bibliotheken te laten gebruiken?"
2500+
2501+#. Type: string
2502+#. Description
2503+#: ../libssl0.9.7.templates:3
2504+msgid "Security holes were fixed with this release. Services may not use these fixes until they are restarted. Note: restarting sshd should not affect any existing connections."
2505+msgstr "Er zijn veiligheidslekken gedicht in deze release. Diensten gebruiken deze versie misschien niet totdat ze herstart zijn. Merk op: sshd herstarten zou geen effect mogen hebben op bestaande verbindingen."
2506+
2507+#. Type: string
2508+#. Description
2509+#: ../libssl0.9.7.templates:3
2510+msgid "Following is a list of detected services that need to be restarted. Please correct the list, if you think it is incorrect. The services names must be identical to the script names in /etc/init.d and must be separated by spaces. If you clear the list, no services will be restarted."
2511+msgstr "Hierna volgt een lijst van gedetecteerde diensten die herstart moeten worden. Verbeter de lijst, als u denkt dat ze incorrect is. De namen moeten overeenkomen met de script-namen in /etc/init.d en moeten gescheiden worden door spaties. Als u de lijst ledigt, dan zullen er geen diensten worden herstart."
2512+
2513+#. Type: string
2514+#. Description
2515+#: ../libssl0.9.7.templates:3
2516+msgid "If other services begin to fail mysteriously after this upgrade, it may be necessary to restart them too. We strongly recommend you to reboot your machine to avoid the SSL related trouble."
2517+msgstr "Als er andere diensten mysterieus beginnen te falen na deze opwaardering, kan het nodig zijn om ze ook te herstarten. Er wordt u ten zeerste aanbevolen uw machine te herstarten om SSL-gerelateerde problemen te vermijden."
2518+
2519--- openssl-0.9.7e.orig/debian/po/cs.po
2520+++ openssl-0.9.7e/debian/po/cs.po
2521@@ -0,0 +1,68 @@
2522+#
2523+# Translators, if you are not familiar with the PO format, gettext
2524+# documentation is worth reading, especially sections dedicated to
2525+# this format, e.g. by running:
2526+# info -n '(gettext)PO Files'
2527+# info -n '(gettext)Header Entry'
2528+#
2529+# Some information specific to po-debconf are available at
2530+# /usr/share/doc/po-debconf/README-trans
2531+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
2532+#
2533+# Developers do not need to manually edit POT or PO files.
2534+#
2535+msgid ""
2536+msgstr ""
2537+"Project-Id-Version: openssl\n"
2538+"Report-Msgid-Bugs-To: \n"
2539+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
2540+"PO-Revision-Date: 2004-09-26 17:40+0200\n"
2541+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
2542+"Language-Team: Czech <provoz@debian.cz>\n"
2543+"MIME-Version: 1.0\n"
2544+"Content-Type: text/plain; charset=ISO-8859-2\n"
2545+"Content-Transfer-Encoding: 8bit\n"
2546+
2547+#. Type: string
2548+#. Description
2549+#: ../libssl0.9.7.templates:3
2550+msgid "Which services should be restarted to make them use the new libraries?"
2551+msgstr "Které slu¾by se mají restartovat, aby zaèaly vyu¾ívat nové knihovny?"
2552+
2553+#. Type: string
2554+#. Description
2555+#: ../libssl0.9.7.templates:3
2556+msgid ""
2557+"Security holes were fixed with this release. Services may not use these "
2558+"fixes until they are restarted. Note: restarting sshd should not affect any "
2559+"existing connections."
2560+msgstr ""
2561+"V této verzi balíku byly opraveny bezbeènostní chyby. Tyto opravy se v "
2562+"programech projeví a¾ po jejich restartu. Poznámka: restart sshd by nemìl "
2563+"ovlivnit stávající spojení."
2564+
2565+#. Type: string
2566+#. Description
2567+#: ../libssl0.9.7.templates:3
2568+msgid ""
2569+"Following is a list of detected services that need to be restarted. Please "
2570+"correct the list, if you think it is incorrect. The services names must be "
2571+"identical to the script names in /etc/init.d and must be separated by "
2572+"spaces. If you clear the list, no services will be restarted."
2573+msgstr ""
2574+"Následuje seznam rozpoznaných slu¾eb, které je tøeba restartovat. Pokud se "
2575+"vám zdá, ¾e je tento seznam chybný, mù¾ete jej opravit. Názvy slu¾eb musí "
2576+"být shodné s názvy skriptù v adresáøi /etc/init.d a musí být oddìleny "
2577+"mezerami. Pokud seznam vyma¾ete, nebude restartována ¾ádná slu¾ba."
2578+
2579+#. Type: string
2580+#. Description
2581+#: ../libssl0.9.7.templates:3
2582+msgid ""
2583+"If other services begin to fail mysteriously after this upgrade, it may be "
2584+"necessary to restart them too. We strongly recommend you to reboot your "
2585+"machine to avoid the SSL related trouble."
2586+msgstr ""
2587+"Jestli¾e po této aktualizaci zaènou selhávat nìkteré slu¾by, mo¾ná bude "
2588+"nutné je takté¾ restartovat. Abyste se vyhnuli problémùm spojených se SSL, "
2589+"doporuèujeme restartovat celý poèítaè."
diff --git a/meta/packages/openssl/openssl-0.9.7e/gnueabi-arm.patch b/meta/packages/openssl/openssl-0.9.7e/gnueabi-arm.patch
deleted file mode 100644
index be0adbdea7..0000000000
--- a/meta/packages/openssl/openssl-0.9.7e/gnueabi-arm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- openssl-0.9.7e/Configure~gnueabi-arm 2006-03-19 21:04:31.000000000 +0100
7+++ openssl-0.9.7e/Configure 2006-03-19 21:07:22.000000000 +0100
8@@ -462,6 +462,7 @@
9 # Linux on ARM
10 "linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
11 "linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
12+"linux-gnueabi-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
13
14 # SCO/Caldera targets.
15 #
diff --git a/meta/packages/openssl/openssl-0.9.7g/armeb.patch b/meta/packages/openssl/openssl-0.9.7g/armeb.patch
deleted file mode 100644
index 7539506949..0000000000
--- a/meta/packages/openssl/openssl-0.9.7g/armeb.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1--- Configure.orig 2006-03-22 16:29:20.000000000 +0100
2+++ Configure 2006-03-22 16:31:44.000000000 +0100
3@@ -395,6 +395,7 @@
4 "debian-alpha-ev4","gcc:-DTERMIO -O3 -mcpu=ev4 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
5 "debian-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
6 "debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
7+"debian-armeb","gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
8 #"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
9 "debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
10 #"debian-freebsd-alpha","gcc:-DTERMIOS -O -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)",
11@@ -474,6 +475,7 @@
12 # ARM comes in both little- and big-endian flavors. The following line is
13 # endian neutral, but ./config is free to throw in -D[BL]_ENDIAN...
14 "linux-elf-arm","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
15+"linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
16
17 # SCO/Caldera targets.
18 #
diff --git a/meta/packages/openssl/openssl-0.9.7g/debian.patch b/meta/packages/openssl/openssl-0.9.7g/debian.patch
deleted file mode 100644
index 8cfdd2d653..0000000000
--- a/meta/packages/openssl/openssl-0.9.7g/debian.patch
+++ /dev/null
@@ -1,2808 +0,0 @@
1--- openssl097-0.9.7g.orig/apps/CA.pl
2+++ openssl097-0.9.7g/apps/CA.pl
3@@ -1,4 +1,4 @@
4-#!/usr/bin/perl
5+#!/usr/local/bin/perl
6 #
7 # CA - wrapper around ca to make it easier to use ... basically ca requires
8 # some setup stuff to be done before you can use it and this makes
9@@ -63,6 +63,7 @@
10 foreach (@ARGV) {
11 if ( /^(-\?|-h|-help)$/ ) {
12 print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
13+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
14 exit 0;
15 } elsif (/^-newcert$/) {
16 # create a certificate
17@@ -158,6 +159,7 @@
18 } else {
19 print STDERR "Unknown arg $_\n";
20 print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
21+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
22 exit 1;
23 }
24 }
25--- openssl097-0.9.7g.orig/apps/CA.pl.in
26+++ openssl097-0.9.7g/apps/CA.pl.in
27@@ -63,6 +63,7 @@
28 foreach (@ARGV) {
29 if ( /^(-\?|-h|-help)$/ ) {
30 print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
31+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
32 exit 0;
33 } elsif (/^-newcert$/) {
34 # create a certificate
35@@ -158,6 +159,7 @@
36 } else {
37 print STDERR "Unknown arg $_\n";
38 print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
39+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
40 exit 1;
41 }
42 }
43--- openssl097-0.9.7g.orig/apps/progs.h
44+++ openssl097-0.9.7g/apps/progs.h
45@@ -35,11 +35,9 @@
46 extern int spkac_main(int argc,char *argv[]);
47 extern int smime_main(int argc,char *argv[]);
48 extern int rand_main(int argc,char *argv[]);
49-extern int prime_main(int argc,char *argv[]);
50-#ifndef OPENSSL_NO_ENGINE
51 extern int engine_main(int argc,char *argv[]);
52-#endif
53 extern int ocsp_main(int argc,char *argv[]);
54+extern int prime_main(int argc,char *argv[]);
55
56 #define FUNC_TYPE_GENERAL 1
57 #define FUNC_TYPE_MD 2
58@@ -95,9 +93,7 @@
59 #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
60 {FUNC_TYPE_GENERAL,"s_client",s_client_main},
61 #endif
62-#ifndef OPENSSL_NO_SPEED
63 {FUNC_TYPE_GENERAL,"speed",speed_main},
64-#endif
65 #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
66 {FUNC_TYPE_GENERAL,"s_time",s_time_main},
67 #endif
68@@ -116,11 +112,9 @@
69 {FUNC_TYPE_GENERAL,"spkac",spkac_main},
70 {FUNC_TYPE_GENERAL,"smime",smime_main},
71 {FUNC_TYPE_GENERAL,"rand",rand_main},
72- {FUNC_TYPE_GENERAL,"prime",prime_main},
73-#ifndef OPENSSL_NO_ENGINE
74 {FUNC_TYPE_GENERAL,"engine",engine_main},
75-#endif
76 {FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
77+ {FUNC_TYPE_GENERAL,"prime",prime_main},
78 #ifndef OPENSSL_NO_MD2
79 {FUNC_TYPE_MD,"md2",dgst_main},
80 #endif
81--- openssl097-0.9.7g.orig/config
82+++ openssl097-0.9.7g/config
83@@ -163,8 +163,8 @@
84 echo "${MACHINE}-whatever-linux1"; exit 0
85 ;;
86
87- GNU*)
88- echo "hurd-x86"; exit 0;
89+ GNU:*|GNU/*:*)
90+ echo "${MACHINE}-gnuish"; exit 0;
91 ;;
92
93 LynxOS:*)
94--- openssl097-0.9.7g.orig/Configure
95+++ openssl097-0.9.7g/Configure
96@@ -1,4 +1,4 @@
97-:
98+#!/usr/local/bin/perl
99 eval 'exec perl -S $0 ${1+"$@"}'
100 if $running_under_some_shell;
101 ##
102@@ -390,6 +390,42 @@
103 # assembler versions -- currently defunct:
104 ##"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer:::(unknown):SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${alpha_asm}",
105
106+# Debian GNU/* (various architectures)
107+"debian-alpha","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
108+"debian-alpha-ev4","gcc:-DTERMIO -O3 -mcpu=ev4 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
109+"debian-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
110+"debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
111+#"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
112+"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
113+#"debian-freebsd-alpha","gcc:-DTERMIOS -O -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)",
114+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
115+"debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
116+"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
117+"debian-ia64","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
118+#"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC",
119+"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
120+"debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -mcpu=i486 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
121+"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -mcpu=i586 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
122+"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -mcpu=i686 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
123+"debian-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
124+"debian-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -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)",
125+"debian-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -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)",
126+"debian-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
127+"debian-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
128+"debian-netbsd-sparc", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
129+"debian-openbsd-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
130+"debian-openbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
131+"debian-openbsd-mips","gcc:-O2 -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)",
132+"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
133+"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
134+"debian-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
135+"debian-sh3", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
136+"debian-sh4", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
137+"debian-sh3eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
138+"debian-sh4eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
139+"debian-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
140+"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v8 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
141+"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,-Av8plus -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
142 # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
143 # bn86-elf.o file file since it is hand tweaked assembler.
144 "linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
145@@ -1316,7 +1352,8 @@
146 elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
147 {
148 my $sotmp = $1;
149- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
150+# s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
151+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
152 }
153 elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
154 {
155--- openssl097-0.9.7g.orig/crypto/asn1/charmap.pl
156+++ openssl097-0.9.7g/crypto/asn1/charmap.pl
157@@ -1,4 +1,4 @@
158-#!/usr/local/bin/perl -w
159+#!/usr/local/bin/perl
160
161 use strict;
162
163--- openssl097-0.9.7g.orig/crypto/bn/asm/ppc.pl
164+++ openssl097-0.9.7g/crypto/bn/asm/ppc.pl
165@@ -1,4 +1,4 @@
166-#!/usr/bin/env perl
167+#!/usr/local/bin/perl
168 #
169 # Implemented as a Perl wrapper as we want to support several different
170 # architectures with single file. We pick up the target based on the
171--- openssl097-0.9.7g.orig/crypto/md5/asm/md5-sparcv9.S
172+++ openssl097-0.9.7g/crypto/md5/asm/md5-sparcv9.S
173@@ -74,14 +74,14 @@
174 #define Dval R8
175
176 #if defined(MD5_BLOCK_DATA_ORDER)
177-# if defined(OPENSSL_SYSNAME_ULTRASPARC)
178+/*# if defined(OPENSSL_SYSNAME_ULTRASPARC)*/
179 # define LOAD lda
180 # define X(i) [%i1+i*4]%asi
181 # define md5_block md5_block_asm_data_order_aligned
182 # define ASI_PRIMARY_LITTLE 0x88
183-# else
184+/*# else
185 # error "MD5_BLOCK_DATA_ORDER is supported only on UltraSPARC!"
186-# endif
187+# endif*/
188 #else
189 # define LOAD ld
190 # define X(i) [%i1+i*4]
191--- openssl097-0.9.7g.orig/crypto/opensslconf.h
192+++ openssl097-0.9.7g/crypto/opensslconf.h
193@@ -4,17 +4,38 @@
194 /* OpenSSL was configured with the following options: */
195 #ifndef OPENSSL_DOING_MAKEDEPEND
196
197+#ifndef OPENSSL_NO_IDEA
198+# define OPENSSL_NO_IDEA
199+#endif
200+#ifndef OPENSSL_NO_MDC2
201+# define OPENSSL_NO_MDC2
202+#endif
203+#ifndef OPENSSL_NO_RC5
204+# define OPENSSL_NO_RC5
205+#endif
206 #ifndef OPENSSL_NO_KRB5
207 # define OPENSSL_NO_KRB5
208 #endif
209
210 #endif /* OPENSSL_DOING_MAKEDEPEND */
211+#ifndef OPENSSL_THREADS
212+# define OPENSSL_THREADS
213+#endif
214
215 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
216 asks for it. This is a transient feature that is provided for those
217 who haven't had the time to do the appropriate changes in their
218 applications. */
219 #ifdef OPENSSL_ALGORITHM_DEFINES
220+# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
221+# define NO_IDEA
222+# endif
223+# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
224+# define NO_MDC2
225+# endif
226+# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
227+# define NO_RC5
228+# endif
229 # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
230 # define NO_KRB5
231 # endif
232@@ -27,7 +48,7 @@
233
234 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
235 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
236-#define OPENSSLDIR "/usr/local/ssl"
237+#define OPENSSLDIR "/usr/lib/ssl"
238 #endif
239 #endif
240
241@@ -79,7 +100,7 @@
242
243 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
244 #define CONFIG_HEADER_BN_H
245-#undef BN_LLONG
246+#define BN_LLONG
247
248 /* Should we define BN_DIV2W here? */
249
250@@ -98,7 +119,7 @@
251 #define CONFIG_HEADER_RC4_LOCL_H
252 /* if this is defined data[i] is used instead of *data, this is a %20
253 * speedup on x86 */
254-#undef RC4_INDEX
255+#define RC4_INDEX
256 #endif
257
258 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
259@@ -112,14 +133,14 @@
260 /* the following is tweaked from a config script, that is why it is a
261 * protected undef/define */
262 #ifndef DES_PTR
263-#undef DES_PTR
264+#define DES_PTR
265 #endif
266
267 /* This helps C compiler generate the correct code for multiple functional
268 * units. It reduces register dependancies at the expense of 2 more
269 * registers */
270 #ifndef DES_RISC1
271-#undef DES_RISC1
272+#define DES_RISC1
273 #endif
274
275 #ifndef DES_RISC2
276@@ -133,7 +154,7 @@
277 /* Unroll the inner loop, this sometimes helps, sometimes hinders.
278 * Very mucy CPU dependant */
279 #ifndef DES_UNROLL
280-#undef DES_UNROLL
281+#define DES_UNROLL
282 #endif
283
284 /* These default values were supplied by
285--- openssl097-0.9.7g.orig/crypto/pkcs7/pk7_mime.c
286+++ openssl097-0.9.7g/crypto/pkcs7/pk7_mime.c
287@@ -277,9 +277,9 @@
288
289 if(strcmp(hdr->value, "application/x-pkcs7-signature") &&
290 strcmp(hdr->value, "application/pkcs7-signature")) {
291- sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
292 PKCS7err(PKCS7_F_SMIME_READ_PKCS7,PKCS7_R_SIG_INVALID_MIME_TYPE);
293 ERR_add_error_data(2, "type: ", hdr->value);
294+ sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
295 sk_BIO_pop_free(parts, BIO_vfree);
296 return NULL;
297 }
298--- openssl097-0.9.7g.orig/crypto/rc4/asm/rc4-amd64.pl
299+++ openssl097-0.9.7g/crypto/rc4/asm/rc4-amd64.pl
300@@ -1,4 +1,4 @@
301-#!/usr/bin/env perl
302+#!/usr/local/bin/perl
303 #
304 # ====================================================================
305 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
306--- openssl097-0.9.7g.orig/crypto/rc4/rc4_enc.c
307+++ openssl097-0.9.7g/crypto/rc4/rc4_enc.c
308@@ -77,10 +77,6 @@
309 x=key->x;
310 y=key->y;
311 d=key->data;
312-#if defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
313- /* see crypto/rc4/asm/rc4-ia64.S for further details... */
314- d=(RC4_INT *)(((size_t)(d+255))&~(sizeof(key->data)-1));
315-#endif
316
317 #if defined(RC4_CHUNK)
318 /*
319--- openssl097-0.9.7g.orig/crypto/rc4/rc4.h
320+++ openssl097-0.9.7g/crypto/rc4/rc4.h
321@@ -73,10 +73,6 @@
322 {
323 RC4_INT x,y;
324 RC4_INT data[256];
325-#if defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
326- /* see crypto/rc4/asm/rc4-ia64.S for further details... */
327- RC4_INT pad[512-256-2];
328-#endif
329 } RC4_KEY;
330
331
332--- openssl097-0.9.7g.orig/crypto/rc4/rc4_skey.c
333+++ openssl097-0.9.7g/crypto/rc4/rc4_skey.c
334@@ -94,10 +94,6 @@
335 unsigned int i;
336
337 d= &(key->data[0]);
338-#if defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
339- /* see crypto/rc4/asm/rc4-ia64.S for further details... */
340- d=(RC4_INT *)(((size_t)(d+255))&~(sizeof(key->data)-1));
341-#endif
342
343 for (i=0; i<256; i++)
344 d[i]=i;
345--- openssl097-0.9.7g.orig/crypto/sha/asm/sha1-ia64.pl
346+++ openssl097-0.9.7g/crypto/sha/asm/sha1-ia64.pl
347@@ -1,4 +1,4 @@
348-#!/usr/bin/env perl
349+#!/usr/local/bin/perl
350 #
351 # ====================================================================
352 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
353--- openssl097-0.9.7g.orig/demos/tunala/configure.in
354+++ openssl097-0.9.7g/demos/tunala/configure.in
355@@ -1,4 +1,4 @@
356-dnl Process this file with autoconf to produce a configure script.
357+#!/usr/local/bin/perl
358 AC_INIT(tunala.c)
359 AM_CONFIG_HEADER(config.h)
360 AM_INIT_AUTOMAKE(tunala, 0.0.1-dev)
361--- openssl097-0.9.7g.orig/doc/apps/CA.pl.pod
362+++ openssl097-0.9.7g/doc/apps/CA.pl.pod
363@@ -47,7 +47,7 @@
364 creates a new certificate request. The private key and request are
365 written to the file "newreq.pem".
366
367-=item B<-newreq-nowdes>
368+=item B<-newreq-nodes>
369
370 is like B<-newreq> except that the private key will not be encrypted.
371
372--- openssl097-0.9.7g.orig/doc/Makefile
373+++ openssl097-0.9.7g/doc/Makefile
374@@ -0,0 +1,40 @@
375+VERSION =
376+
377+#PODS = $(wildcard *.pod)
378+#MANS = $(addsuffix .man, $(basename $(PODS)))
379+
380+MANS = openssl.1 ssl.3 crypto.3
381+
382+P2M = pod2man --center='OpenSSL Documentation' --release="OpenSSL $(VERSION)"
383+
384+all: manpages
385+
386+.PHONY: manpages
387+
388+manpages: openssl.1 crypto.3 ssl.3
389+
390+openssl.1:
391+ $(P2M) --section=1 openssl.pod > openssl.1
392+
393+crypto.3:
394+ $(P2M) --section=3 crypto.pod > crypto.3
395+
396+ssl.3:
397+ $(P2M) --section=3 ssl.pod > ssl.3
398+
399+.PHONY: install
400+install:
401+ mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1
402+ mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
403+ install -m 644 -p openssl.1 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1
404+ install -m 644 -p crypto.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
405+ install -m 644 -p ssl.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
406+ rm -f $(MANS)
407+
408+.PHONY: clean
409+clean:
410+ rm -f $(MANS)
411+
412+.PHONY: realclean
413+realclean:
414+ -$(MAKE) clean
415--- openssl097-0.9.7g.orig/Makefile
416+++ openssl097-0.9.7g/Makefile
417@@ -11,11 +11,11 @@
418 SHLIB_VERSION_HISTORY=
419 SHLIB_MAJOR=0
420 SHLIB_MINOR=9.7
421-SHLIB_EXT=
422-PLATFORM=dist
423-OPTIONS= no-krb5
424-CONFIGURE_ARGS=dist
425-SHLIB_TARGET=
426+SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
427+PLATFORM=debian-i386
428+OPTIONS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 zlib-dynamic debug no-krb5
429+CONFIGURE_ARGS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 zlib-dynamic debug debian-i386
430+SHLIB_TARGET=linux-shared
431
432 # HERE indicates where this Makefile lives. This can be used to indicate
433 # where sub-Makefiles are expected to be. Currently has very limited usage,
434@@ -26,10 +26,10 @@
435 # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
436 # Normally it is left empty.
437 INSTALL_PREFIX=
438-INSTALLTOP=/usr/local/ssl
439+INSTALLTOP=/usr
440
441 # Do not edit this manually. Use Configure --openssldir=DIR do change this!
442-OPENSSLDIR=/usr/local/ssl
443+OPENSSLDIR=/usr/lib/ssl
444
445 # NO_IDEA - Define to build without the IDEA algorithm
446 # NO_RC4 - Define to build without the RC4 algorithm
447@@ -59,12 +59,13 @@
448 # equal 4.
449 # PKCS1_CHECK - pkcs1 tests.
450
451-CC= cc
452+#TOP=$(shell pwd)
453+CC= gcc
454 #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
455-CFLAG= -DOPENSSL_NO_KRB5 -O
456-DEPFLAG=
457+CFLAG= -DZLIB_SHARED -DZLIB -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DOPENSSL_NO_KRB5 -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DL_ENDIAN -DTERMIO -O3 -Wall -g
458+DEPFLAG= -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5
459 PEX_LIBS=
460-EX_LIBS=
461+EX_LIBS= -ldl
462 EXE_EXT=
463 ARFLAGS=
464 AR=ar $(ARFLAGS) r
465@@ -72,7 +73,7 @@
466 PERL= /usr/bin/perl
467 TAR= tar
468 TARFLAGS= --no-recursion
469-MAKEDEPPROG=makedepend
470+MAKEDEPPROG= gcc
471
472 # We let the C compiler driver to take care of .s files. This is done in
473 # order to be excused from maintaining a separate set of architecture
474@@ -177,13 +178,13 @@
475 # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
476 SHLIB_MARK=
477
478-DIRS= crypto fips ssl $(SHLIB_MARK) sigs apps test tools
479+DIRS= crypto fips ssl $(SHLIB_MARK) sigs apps doc tools
480 SHLIBDIRS= crypto ssl
481
482 # dirs in crypto to build
483 SDIRS= objects \
484- md2 md4 md5 sha mdc2 hmac ripemd \
485- des rc2 rc4 rc5 idea bf cast \
486+ md2 md4 md5 sha hmac ripemd \
487+ des rc2 rc4 bf cast \
488 bn ec rsa dsa dh dso engine aes \
489 buffer bio stack lhash rand err \
490 evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5
491@@ -196,10 +197,10 @@
492
493 MAKEFILE= Makefile
494
495-MANDIR=$(OPENSSLDIR)/man
496+MANDIR=/usr/share/man
497 MAN1=1
498 MAN3=3
499-MANSUFFIX=
500+MANSUFFIX=ssl
501 SHELL=/bin/sh
502
503 TOP= .
504@@ -211,7 +212,7 @@
505 SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
506 SHARED_SSL=libssl$(SHLIB_EXT)
507 SHARED_LIBS=
508-SHARED_LIBS_LINK_EXTS=
509+SHARED_LIBS_LINK_EXTS=.so
510 SHARED_LDFLAGS=
511
512 GENERAL= Makefile
513@@ -826,7 +827,7 @@
514 do \
515 if [ -f "$$i" ]; then \
516 ( echo installing $$i; \
517- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
518+ cp -d $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
519 if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
520 : ; \
521 else \
522--- openssl097-0.9.7g.orig/Makefile.org
523+++ openssl097-0.9.7g/Makefile.org
524@@ -57,6 +57,7 @@
525 # equal 4.
526 # PKCS1_CHECK - pkcs1 tests.
527
528+#TOP=$(shell pwd)
529 CC= gcc
530 #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
531 CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
532@@ -175,7 +176,7 @@
533 # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
534 SHLIB_MARK=
535
536-DIRS= crypto fips ssl $(SHLIB_MARK) sigs apps test tools
537+DIRS= crypto fips ssl $(SHLIB_MARK) sigs apps doc tools
538 SHLIBDIRS= crypto ssl
539
540 # dirs in crypto to build
541@@ -194,10 +195,10 @@
542
543 MAKEFILE= Makefile
544
545-MANDIR=$(OPENSSLDIR)/man
546+MANDIR=/usr/share/man
547 MAN1=1
548 MAN3=3
549-MANSUFFIX=
550+MANSUFFIX=ssl
551 SHELL=/bin/sh
552
553 TOP= .
554@@ -824,7 +825,7 @@
555 do \
556 if [ -f "$$i" ]; then \
557 ( echo installing $$i; \
558- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
559+ cp -d $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
560 if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
561 : ; \
562 else \
563--- openssl097-0.9.7g.orig/os2/backwardify.pl
564+++ openssl097-0.9.7g/os2/backwardify.pl
565@@ -1,4 +1,4 @@
566-#!/usr/bin/perl -w
567+#!/usr/local/bin/perl
568 use strict;
569
570 # Use as $0
571--- openssl097-0.9.7g.orig/ssl/s23_srvr.c
572+++ openssl097-0.9.7g/ssl/s23_srvr.c
573@@ -528,9 +528,7 @@
574 }
575
576 s->state=SSL2_ST_GET_CLIENT_HELLO_A;
577- if ((s->options & SSL_OP_MSIE_SSLV2_RSA_PADDING) ||
578- use_sslv2_strong ||
579- (s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3))
580+ if (s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3)
581 s->s2->ssl2_rollback=0;
582 else
583 /* reject SSL 2.0 session if client supports SSL 3.0 or TLS 1.0
584--- openssl097-0.9.7g.orig/ssl/ssl_algs.c
585+++ openssl097-0.9.7g/ssl/ssl_algs.c
586@@ -109,3 +109,8 @@
587 return(1);
588 }
589
590+#undef SSLeay_add_ssl_algorithms
591+int SSLeay_add_ssl_algorithms(void)
592+ {
593+ return SSL_library_init();
594+ }
595--- openssl097-0.9.7g.orig/tools/c_rehash
596+++ openssl097-0.9.7g/tools/c_rehash
597@@ -6,7 +6,7 @@
598
599 my $openssl;
600
601-my $dir = "/usr/local/ssl";
602+my $dir = "/usr/lib/ssl";
603
604 if(defined $ENV{OPENSSL}) {
605 $openssl = $ENV{OPENSSL};
606--- openssl097-0.9.7g.orig/tools/c_rehash.in
607+++ openssl097-0.9.7g/tools/c_rehash.in
608@@ -1,4 +1,4 @@
609-#!/usr/local/bin/perl
610+#!/usr/bin/perl
611
612
613 # Perl c_rehash script, scan all files in a directory
614--- openssl097-0.9.7g.orig/util/clean-depend.pl
615+++ openssl097-0.9.7g/util/clean-depend.pl
616@@ -1,4 +1,4 @@
617-#!/usr/local/bin/perl -w
618+#!/usr/local/bin/perl
619 # Clean the dependency list in a makefile of standard includes...
620 # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
621
622--- openssl097-0.9.7g.orig/util/extract-names.pl
623+++ openssl097-0.9.7g/util/extract-names.pl
624@@ -1,4 +1,4 @@
625-#!/usr/bin/perl
626+#!/usr/local/bin/perl
627
628 $/ = ""; # Eat a paragraph at once.
629 while(<STDIN>) {
630--- openssl097-0.9.7g.orig/util/mkdef.pl
631+++ openssl097-0.9.7g/util/mkdef.pl
632@@ -1,4 +1,4 @@
633-#!/usr/local/bin/perl -w
634+#!/usr/local/bin/perl
635 #
636 # generate a .def file
637 #
638--- openssl097-0.9.7g.orig/util/mkerr.pl
639+++ openssl097-0.9.7g/util/mkerr.pl
640@@ -1,4 +1,4 @@
641-#!/usr/local/bin/perl -w
642+#!/usr/local/bin/perl
643
644 my $config = "crypto/err/openssl.ec";
645 my $debug = 0;
646--- openssl097-0.9.7g.orig/util/mkstack.pl
647+++ openssl097-0.9.7g/util/mkstack.pl
648@@ -1,4 +1,4 @@
649-#!/usr/local/bin/perl -w
650+#!/usr/local/bin/perl
651
652 # This is a utility that searches out "DECLARE_STACK_OF()"
653 # declarations in .h and .c files, and updates/creates/replaces
654--- openssl097-0.9.7g.orig/util/pod2man.pl
655+++ openssl097-0.9.7g/util/pod2man.pl
656@@ -1,4 +1,4 @@
657-: #!/usr/bin/perl-5.005
658+#!/usr/local/bin/perl
659 eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
660 if $running_under_some_shell;
661
662--- openssl097-0.9.7g.orig/util/selftest.pl
663+++ openssl097-0.9.7g/util/selftest.pl
664@@ -1,4 +1,4 @@
665-#!/usr/local/bin/perl -w
666+#!/usr/local/bin/perl
667 #
668 # Run the test suite and generate a report
669 #
670--- openssl097-0.9.7g.orig/VMS/VMSify-conf.pl
671+++ openssl097-0.9.7g/VMS/VMSify-conf.pl
672@@ -1,4 +1,4 @@
673-#! /usr/bin/perl
674+#!/usr/local/bin/perl
675
676 use strict;
677 use warnings;
678--- openssl097-0.9.7g.orig/debian/po/sv.po
679+++ openssl097-0.9.7g/debian/po/sv.po
680@@ -0,0 +1,61 @@
681+# Translators, if you are not familiar with the PO format, gettext
682+# documentation is worth reading, especially sections dedicated to
683+# this format, e.g. by running:
684+# info -n '(gettext)PO Files'
685+# info -n '(gettext)Header Entry'
686+# Some information specific to po-debconf are available at
687+# /usr/share/doc/po-debconf/README-trans
688+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
689+# Developers do not need to manually edit POT or PO files.
690+# , fuzzy
691+#
692+#
693+msgid ""
694+msgstr ""
695+"Project-Id-Version: openssl 0.9.7g-2\n"
696+"Report-Msgid-Bugs-To: \n"
697+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
698+"PO-Revision-Date: 2005-09-28 19:22-0700\n"
699+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
700+"Language-Team: Swedish <sv@li.org>\n"
701+"MIME-Version: 1.0\n"
702+"Content-Type: text/plain; charset=iso-8859-1\n"
703+"Content-Transfer-Encoding: 8bit"
704+
705+#. Type: string
706+#. Description
707+#: ../libssl0.9.7.templates:3
708+msgid "Which services should be restarted to make them use the new libraries?"
709+msgstr "Vilka tjänster ska startas om för att få dom att använda de nya biblioteken?"
710+
711+#. Type: string
712+#. Description
713+#: ../libssl0.9.7.templates:3
714+msgid ""
715+"Security holes were fixed with this release. Services may not use these "
716+"fixes until they are restarted. Note: restarting sshd should not affect any "
717+"existing connections."
718+msgstr ""
719+"Säkerhetshålen fixades i denna versionen. Tjänster kommer inte att använda denna version förrän de har startats om. Notera: startar du om sshd kommer inte fixen aktiveras för redan etablerade anslutningar."
720+
721+#. Type: string
722+#. Description
723+#: ../libssl0.9.7.templates:3
724+msgid ""
725+"Following is a list of detected services that need to be restarted. Please "
726+"correct the list, if you think it is incorrect. The services names must be "
727+"identical to the script names in /etc/init.d and must be separated by "
728+"spaces. If you clear the list, no services will be restarted."
729+msgstr ""
730+"Följande är en lista på upptäcka tjänster som behöver startas om. Vänligen undersök listan och du tror den är felaktig. Namnen på tjänsterna måste vara identiska som skriptnamnen i /etc/init.d och måste separeras med mellanslag. Om du rensar listan kommer inga tjänster att startas om."
731+
732+#. Type: string
733+#. Description
734+#: ../libssl0.9.7.templates:3
735+msgid ""
736+"If other services begin to fail mysteriously after this upgrade, it may be "
737+"necessary to restart them too. We strongly recommend you to reboot your "
738+"machine to avoid the SSL related trouble."
739+msgstr ""
740+"Om andra tjänster börjar att få underliga problem efter denna uppgradering kanske de måste startas om också. Vi rekommenderar att du startar om din maskin för att inte få SSL-relaterade problem."
741+
742--- openssl097-0.9.7g.orig/debian/po/templates.pot
743+++ openssl097-0.9.7g/debian/po/templates.pot
744@@ -0,0 +1,59 @@
745+#
746+# Translators, if you are not familiar with the PO format, gettext
747+# documentation is worth reading, especially sections dedicated to
748+# this format, e.g. by running:
749+# info -n '(gettext)PO Files'
750+# info -n '(gettext)Header Entry'
751+#
752+# Some information specific to po-debconf are available at
753+# /usr/share/doc/po-debconf/README-trans
754+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
755+#
756+# Developers do not need to manually edit POT or PO files.
757+#
758+#, fuzzy
759+msgid ""
760+msgstr ""
761+"Project-Id-Version: PACKAGE VERSION\n"
762+"Report-Msgid-Bugs-To: \n"
763+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
764+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
765+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
766+"Language-Team: LANGUAGE <LL@li.org>\n"
767+"MIME-Version: 1.0\n"
768+"Content-Type: text/plain; charset=CHARSET\n"
769+"Content-Transfer-Encoding: 8bit\n"
770+
771+#. Type: string
772+#. Description
773+#: ../libssl0.9.7.templates:3
774+msgid "Which services should be restarted to make them use the new libraries?"
775+msgstr ""
776+
777+#. Type: string
778+#. Description
779+#: ../libssl0.9.7.templates:3
780+msgid ""
781+"Security holes were fixed with this release. Services may not use these "
782+"fixes until they are restarted. Note: restarting sshd should not affect any "
783+"existing connections."
784+msgstr ""
785+
786+#. Type: string
787+#. Description
788+#: ../libssl0.9.7.templates:3
789+msgid ""
790+"Following is a list of detected services that need to be restarted. Please "
791+"correct the list, if you think it is incorrect. The services names must be "
792+"identical to the script names in /etc/init.d and must be separated by "
793+"spaces. If you clear the list, no services will be restarted."
794+msgstr ""
795+
796+#. Type: string
797+#. Description
798+#: ../libssl0.9.7.templates:3
799+msgid ""
800+"If other services begin to fail mysteriously after this upgrade, it may be "
801+"necessary to restart them too. We strongly recommend you to reboot your "
802+"machine to avoid the SSL related trouble."
803+msgstr ""
804--- openssl097-0.9.7g.orig/debian/po/ca.po
805+++ openssl097-0.9.7g/debian/po/ca.po
806@@ -0,0 +1,59 @@
807+# openssl (debconf) translation to Catalan.
808+# Copyright (C) 2004 Free Software Foundation, Inc.
809+# Aleix Badia i Bosch <abadia@ica.es>, 2004
810+msgid ""
811+msgstr ""
812+"Project-Id-Version: openssl_0.9.7d-1_templates\n"
813+"Report-Msgid-Bugs-To: \n"
814+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
815+"PO-Revision-Date: 2004-04-08 19:46GMT\n"
816+"Last-Translator: Aleix Badia i Bosch <abadia@ica.es>\n"
817+"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
818+"MIME-Version: 1.0\n"
819+"Content-Type: text/plain; charset=UTF-8\n"
820+"Content-Transfer-Encoding: 8bit\n"
821+
822+#. Type: string
823+#. Description
824+#: ../libssl0.9.7.templates:3
825+msgid "Which services should be restarted to make them use the new libraries?"
826+msgstr ""
827+"Quina serveis s'han de reiniciar perquè utilitzin les noves biblioteques?"
828+
829+#. Type: string
830+#. Description
831+#: ../libssl0.9.7.templates:3
832+msgid ""
833+"Security holes were fixed with this release. Services may not use these "
834+"fixes until they are restarted. Note: restarting sshd should not affect any "
835+"existing connections."
836+msgstr ""
837+"Aquesta versió resol els errors de seguretat. Els serveis no utilitzaran les "
838+"correccions fins que no s'hagin reiniciat. Nota: reiniciant l'sshd no "
839+"s'afectarà cap connexió existent."
840+
841+#. Type: string
842+#. Description
843+#: ../libssl0.9.7.templates:3
844+msgid ""
845+"Following is a list of detected services that need to be restarted. Please "
846+"correct the list, if you think it is incorrect. The services names must be "
847+"identical to the script names in /etc/init.d and must be separated by "
848+"spaces. If you clear the list, no services will be restarted."
849+msgstr ""
850+"És una llista de serveis que s'ha detectat que s'haurien de reiniciar, "
851+"corregiu-la si és incorrecta. El nom dels serveis hauria de ser idèntic als "
852+"noms de les seqüències del directori /etc/init.d i haurien d'estar separats "
853+"per espais. Si suprimiu la llista no es reiniciarà cap servei."
854+
855+#. Type: string
856+#. Description
857+#: ../libssl0.9.7.templates:3
858+msgid ""
859+"If other services begin to fail mysteriously after this upgrade, it may be "
860+"necessary to restart them too. We strongly recommend you to reboot your "
861+"machine to avoid the SSL related trouble."
862+msgstr ""
863+"Si després de l'actualització d'altres serveis fallen de forma inexplicable, "
864+"probablement també sigui necessari reiniciar-los. Us recomanem que per "
865+"evitar els problemes relacionats amb l'SSL reinicieu l'ordinador."
866--- openssl097-0.9.7g.orig/debian/po/da.po
867+++ openssl097-0.9.7g/debian/po/da.po
868@@ -0,0 +1,70 @@
869+# translation of openssl_0.9.7d-1_templates.po to Danish
870+#
871+# Translators, if you are not familiar with the PO format, gettext
872+# documentation is worth reading, especially sections dedicated to
873+# this format, e.g. by running:
874+# info -n '(gettext)PO Files'
875+# info -n '(gettext)Header Entry'
876+# Some information specific to po-debconf are available at
877+# /usr/share/doc/po-debconf/README-trans
878+# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
879+# Developers do not need to manually edit POT or PO files.
880+# Claus Hindsgaul <claus_h@image.dk>, 2004.
881+#
882+msgid ""
883+msgstr ""
884+"Project-Id-Version: openssl_0.9.7d-1_templates\n"
885+"Report-Msgid-Bugs-To: \n"
886+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
887+"PO-Revision-Date: 2004-04-02 16:08+0200\n"
888+"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
889+"Language-Team: Danish <dansk@klid.dk>\n"
890+"MIME-Version: 1.0\n"
891+"Content-Type: text/plain; charset=ISO-8859-1\n"
892+"Content-Transfer-Encoding: 8bit\n"
893+"X-Generator: KBabel 1.3.1\n"
894+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
895+
896+#. Type: string
897+#. Description
898+#: ../libssl0.9.7.templates:3
899+msgid "Which services should be restarted to make them use the new libraries?"
900+msgstr "Hvilke services skal genstartes, så de benytter de nye biblioteker?"
901+
902+#. Type: string
903+#. Description
904+#: ../libssl0.9.7.templates:3
905+msgid ""
906+"Security holes were fixed with this release. Services may not use these "
907+"fixes until they are restarted. Note: restarting sshd should not affect any "
908+"existing connections."
909+msgstr ""
910+"Der lukket nogle sikkerhedshuller i denne version af openssl. Disse huller "
911+"bliver ikke lukket i dine services før de er blevet genstartet. Bemærk at "
912+"det ikke vil påvirke eksisterende forbindelser at genstarte ssh."
913+
914+#. Type: string
915+#. Description
916+#: ../libssl0.9.7.templates:3
917+msgid ""
918+"Following is a list of detected services that need to be restarted. Please "
919+"correct the list, if you think it is incorrect. The services names must be "
920+"identical to the script names in /etc/init.d and must be separated by "
921+"spaces. If you clear the list, no services will be restarted."
922+msgstr ""
923+"Herunder ser du en liste over fundne services, som bør genstartes. Ret "
924+"listen, hvis du mener at den ikke er korrekt. Servicenavnene skal være "
925+"identiske med skriptnavnene i /etc/init.d, og skal adskilles med mellemrum. "
926+"Hvis du sletter listen, vil ingen services blive genstartet."
927+
928+#. Type: string
929+#. Description
930+#: ../libssl0.9.7.templates:3
931+msgid ""
932+"If other services begin to fail mysteriously after this upgrade, it may be "
933+"necessary to restart them too. We strongly recommend you to reboot your "
934+"machine to avoid the SSL related trouble."
935+msgstr ""
936+"Hvis andre services begynder at fejle på mystisk vis efter denne "
937+"opgradering, kan det være nødvendigt også at genstarte disse. Vi anbefaler "
938+"dig kraftigt at genstarte din maskine for at undgå SSL-relaterede problemer."
939--- openssl097-0.9.7g.orig/debian/po/cs.po
940+++ openssl097-0.9.7g/debian/po/cs.po
941@@ -0,0 +1,68 @@
942+#
943+# Translators, if you are not familiar with the PO format, gettext
944+# documentation is worth reading, especially sections dedicated to
945+# this format, e.g. by running:
946+# info -n '(gettext)PO Files'
947+# info -n '(gettext)Header Entry'
948+#
949+# Some information specific to po-debconf are available at
950+# /usr/share/doc/po-debconf/README-trans
951+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
952+#
953+# Developers do not need to manually edit POT or PO files.
954+#
955+msgid ""
956+msgstr ""
957+"Project-Id-Version: openssl\n"
958+"Report-Msgid-Bugs-To: \n"
959+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
960+"PO-Revision-Date: 2004-09-26 17:40+0200\n"
961+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
962+"Language-Team: Czech <provoz@debian.cz>\n"
963+"MIME-Version: 1.0\n"
964+"Content-Type: text/plain; charset=ISO-8859-2\n"
965+"Content-Transfer-Encoding: 8bit\n"
966+
967+#. Type: string
968+#. Description
969+#: ../libssl0.9.7.templates:3
970+msgid "Which services should be restarted to make them use the new libraries?"
971+msgstr "Které slu¾by se mají restartovat, aby zaèaly vyu¾ívat nové knihovny?"
972+
973+#. Type: string
974+#. Description
975+#: ../libssl0.9.7.templates:3
976+msgid ""
977+"Security holes were fixed with this release. Services may not use these "
978+"fixes until they are restarted. Note: restarting sshd should not affect any "
979+"existing connections."
980+msgstr ""
981+"V této verzi balíku byly opraveny bezbeènostní chyby. Tyto opravy se v "
982+"programech projeví a¾ po jejich restartu. Poznámka: restart sshd by nemìl "
983+"ovlivnit stávající spojení."
984+
985+#. Type: string
986+#. Description
987+#: ../libssl0.9.7.templates:3
988+msgid ""
989+"Following is a list of detected services that need to be restarted. Please "
990+"correct the list, if you think it is incorrect. The services names must be "
991+"identical to the script names in /etc/init.d and must be separated by "
992+"spaces. If you clear the list, no services will be restarted."
993+msgstr ""
994+"Následuje seznam rozpoznaných slu¾eb, které je tøeba restartovat. Pokud se "
995+"vám zdá, ¾e je tento seznam chybný, mù¾ete jej opravit. Názvy slu¾eb musí "
996+"být shodné s názvy skriptù v adresáøi /etc/init.d a musí být oddìleny "
997+"mezerami. Pokud seznam vyma¾ete, nebude restartována ¾ádná slu¾ba."
998+
999+#. Type: string
1000+#. Description
1001+#: ../libssl0.9.7.templates:3
1002+msgid ""
1003+"If other services begin to fail mysteriously after this upgrade, it may be "
1004+"necessary to restart them too. We strongly recommend you to reboot your "
1005+"machine to avoid the SSL related trouble."
1006+msgstr ""
1007+"Jestli¾e po této aktualizaci zaènou selhávat nìkteré slu¾by, mo¾ná bude "
1008+"nutné je takté¾ restartovat. Abyste se vyhnuli problémùm spojených se SSL, "
1009+"doporuèujeme restartovat celý poèítaè."
1010--- openssl097-0.9.7g.orig/debian/po/pt_BR.po
1011+++ openssl097-0.9.7g/debian/po/pt_BR.po
1012@@ -0,0 +1,69 @@
1013+#
1014+# Translators, if you are not familiar with the PO format, gettext
1015+# documentation is worth reading, especially sections dedicated to
1016+# this format, e.g. by running:
1017+# info -n '(gettext)PO Files'
1018+# info -n '(gettext)Header Entry'
1019+#
1020+# Some information specific to po-debconf are available at
1021+# /usr/share/doc/po-debconf/README-trans
1022+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
1023+#
1024+# Developers do not need to manually edit POT or PO files.
1025+#
1026+msgid ""
1027+msgstr ""
1028+"Project-Id-Version: openssl\n"
1029+"Report-Msgid-Bugs-To: \n"
1030+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
1031+"PO-Revision-Date: 2004-04-04 15:21-0300\n"
1032+"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
1033+"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
1034+"MIME-Version: 1.0\n"
1035+"Content-Type: text/plain; charset=ISO-8859-1\n"
1036+"Content-Transfer-Encoding: 8bit\n"
1037+
1038+#. Type: string
1039+#. Description
1040+#: ../libssl0.9.7.templates:3
1041+msgid "Which services should be restarted to make them use the new libraries?"
1042+msgstr "Quais serviços devem ser reiniciados para utilizar novas bibliotecas ?"
1043+
1044+#. Type: string
1045+#. Description
1046+#: ../libssl0.9.7.templates:3
1047+msgid ""
1048+"Security holes were fixed with this release. Services may not use these "
1049+"fixes until they are restarted. Note: restarting sshd should not affect any "
1050+"existing connections."
1051+msgstr ""
1052+"Falhas de segurança foram corrigidas nesta versão. Alguns serviços podem não "
1053+"utilizar estas correções até que sejam reiniciados. Note : reiniciar o sshd "
1054+"não afetará nenhuma conexão já estabelecida."
1055+
1056+#. Type: string
1057+#. Description
1058+#: ../libssl0.9.7.templates:3
1059+msgid ""
1060+"Following is a list of detected services that need to be restarted. Please "
1061+"correct the list, if you think it is incorrect. The services names must be "
1062+"identical to the script names in /etc/init.d and must be separated by "
1063+"spaces. If you clear the list, no services will be restarted."
1064+msgstr ""
1065+"A seguir será exibida uma lista de serviços que foram detectados e que "
1066+"precisam ser reiniciados. Por favor, corrija a lista caso você tenha certeza "
1067+"que ela esteja incorreta. Os nomes dos serviços devem ser idênticos aos "
1068+"nomes dos scripts sob o diretório /etc/init.d e devem estar separados por "
1069+"espaços. Caso você esvazie a lista, nenhum serviço será reiniciado."
1070+
1071+#. Type: string
1072+#. Description
1073+#: ../libssl0.9.7.templates:3
1074+msgid ""
1075+"If other services begin to fail mysteriously after this upgrade, it may be "
1076+"necessary to restart them too. We strongly recommend you to reboot your "
1077+"machine to avoid the SSL related trouble."
1078+msgstr ""
1079+"Caso outros serviços comecem a falhar misteriosamente após esta atualização, "
1080+"pode ser necessário reiniciá-los também. Recomendados fortemente que você "
1081+"reinicie sua máquina para evitar problemas relacionados a SSL."
1082--- openssl097-0.9.7g.orig/debian/po/es.po
1083+++ openssl097-0.9.7g/debian/po/es.po
1084@@ -0,0 +1,85 @@
1085+# openssl translation to spanish
1086+# Copyright (C) 2004 Software in the Public Interest
1087+# This file is distributed under the same license as the openssl package.
1088+#
1089+# Changes:
1090+# - Initial translation
1091+# Lucas Wall <kthulhu@kadath.com.ar>, 2004
1092+#
1093+#
1094+# Traductores, si no conoce el formato PO, merece la pena leer la
1095+# documentación de gettext, especialmente las secciones dedicadas a este
1096+# formato, por ejemplo ejecutando:
1097+# info -n '(gettext)PO Files'
1098+# info -n '(gettext)Header Entry'
1099+#
1100+# Equipo de traducción al español, por favor lean antes de traducir
1101+# los siguientes documentos:
1102+#
1103+# - El proyecto de traducción de Debian al español
1104+# http://www.debian.org/intl/spanish/coordinacion
1105+# especialmente las notas de traducción en
1106+# http://www.debian.org/intl/spanish/notas
1107+#
1108+# - La guía de traducción de po's de debconf:
1109+# /usr/share/doc/po-debconf/README-trans
1110+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
1111+#
1112+msgid ""
1113+msgstr ""
1114+"Project-Id-Version: openssl 0.9.7d-3\n"
1115+"Report-Msgid-Bugs-To: \n"
1116+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
1117+"PO-Revision-Date: 2004-06-12 15:23-0300\n"
1118+"Last-Translator: Lucas Wall <kthulhu@kadath.com.ar>\n"
1119+"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
1120+"MIME-Version: 1.0\n"
1121+"Content-Type: text/plain; charset=ISO-8859-15\n"
1122+"Content-Transfer-Encoding: 8bit\n"
1123+
1124+#. Type: string
1125+#. Description
1126+#: ../libssl0.9.7.templates:3
1127+msgid "Which services should be restarted to make them use the new libraries?"
1128+msgstr ""
1129+"¿Qué servicios desea reiniciar para que utilicen las nuevas bibliotecas?"
1130+
1131+#. Type: string
1132+#. Description
1133+#: ../libssl0.9.7.templates:3
1134+msgid ""
1135+"Security holes were fixed with this release. Services may not use these "
1136+"fixes until they are restarted. Note: restarting sshd should not affect any "
1137+"existing connections."
1138+msgstr ""
1139+"En esta versión se han solucionado problemas de seguridad. Los servicios "
1140+"afectados no gozarán de los arreglos hasta que no se hayan reiniciado. Nota: "
1141+"reiniciar el servicio «sshd» no afectará ninguna de las conexiones "
1142+"existentes."
1143+
1144+#. Type: string
1145+#. Description
1146+#: ../libssl0.9.7.templates:3
1147+msgid ""
1148+"Following is a list of detected services that need to be restarted. Please "
1149+"correct the list, if you think it is incorrect. The services names must be "
1150+"identical to the script names in /etc/init.d and must be separated by "
1151+"spaces. If you clear the list, no services will be restarted."
1152+msgstr ""
1153+"Una lista de los servicios que deben ser reiniciados se presenta a "
1154+"continuación. Si cree que no es correcta haga los ajustes necesarios. Los "
1155+"nombres de los servicios deben ser iguales a los nombres de los ficheros en "
1156+"«/etc/init.d» y debe estar separados por espacios. Ningún servicio será "
1157+"reiniciado si deja la lista en blanco."
1158+
1159+#. Type: string
1160+#. Description
1161+#: ../libssl0.9.7.templates:3
1162+msgid ""
1163+"If other services begin to fail mysteriously after this upgrade, it may be "
1164+"necessary to restart them too. We strongly recommend you to reboot your "
1165+"machine to avoid the SSL related trouble."
1166+msgstr ""
1167+"Si, tras esta actualización, otros servicios comienzan a fallar en forma "
1168+"misteriosa puede ser necesario reiniciarlos también. Para evitar problemas "
1169+"relacionados con «SSL» se le recomienda reiniciar su sistema."
1170--- openssl097-0.9.7g.orig/debian/po/fr.po
1171+++ openssl097-0.9.7g/debian/po/fr.po
1172@@ -0,0 +1,69 @@
1173+#
1174+# Translators, if you are not familiar with the PO format, gettext
1175+# documentation is worth reading, especially sections dedicated to
1176+# this format, e.g. by running:
1177+# info -n '(gettext)PO Files'
1178+# info -n '(gettext)Header Entry'
1179+# Some information specific to po-debconf are available at
1180+# /usr/share/doc/po-debconf/README-trans
1181+# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
1182+# Developers do not need to manually edit POT or PO files.
1183+#
1184+msgid ""
1185+msgstr ""
1186+"Project-Id-Version: openssl_0.9.7c-5\n"
1187+"Report-Msgid-Bugs-To: \n"
1188+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
1189+"PO-Revision-Date: 2003-10-22 21:37+0200\n"
1190+"Last-Translator: Michel Grentzinger <mic.grentz@online.fr>\n"
1191+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
1192+"MIME-Version: 1.0\n"
1193+"Content-Type: text/plain; charset=ISO-8859-15\n"
1194+"Content-Transfer-Encoding: 8bit\n"
1195+
1196+#. Type: string
1197+#. Description
1198+#: ../libssl0.9.7.templates:3
1199+msgid "Which services should be restarted to make them use the new libraries?"
1200+msgstr "Services à redémarrer afin d'utiliser les nouvelles bibliothèques"
1201+
1202+#. Type: string
1203+#. Description
1204+#: ../libssl0.9.7.templates:3
1205+msgid ""
1206+"Security holes were fixed with this release. Services may not use these "
1207+"fixes until they are restarted. Note: restarting sshd should not affect any "
1208+"existing connections."
1209+msgstr ""
1210+"Des failles de sécurité on été corrigées dans cette version. Les services ne "
1211+"devraient pas utiliser ces correctifs tant qu'ils n'auront pas été "
1212+"redémarrés. Note : le redémarrage de sshd n'affectera aucune connexion "
1213+"existante."
1214+
1215+#. Type: string
1216+#. Description
1217+#: ../libssl0.9.7.templates:3
1218+msgid ""
1219+"Following is a list of detected services that need to be restarted. Please "
1220+"correct the list, if you think it is incorrect. The services names must be "
1221+"identical to the script names in /etc/init.d and must be separated by "
1222+"spaces. If you clear the list, no services will be restarted."
1223+msgstr ""
1224+"La liste suivante recense tous les services devant être redémarrés. Veuillez "
1225+"corriger la liste si vous pensez qu'elle contient des erreurs. Les noms des "
1226+"services doivent être identiques aux noms des scripts présents dans /etc/"
1227+"init.d et doivent être séparés par des espaces. Si vous effacez la liste, "
1228+"aucun service ne sera redémarré."
1229+
1230+#. Type: string
1231+#. Description
1232+#: ../libssl0.9.7.templates:3
1233+msgid ""
1234+"If other services begin to fail mysteriously after this upgrade, it may be "
1235+"necessary to restart them too. We strongly recommend you to reboot your "
1236+"machine to avoid the SSL related trouble."
1237+msgstr ""
1238+"Si d'autres services ne fonctionnent plus correctement après cette mise à "
1239+"jour, il est sans doute nécessaire de les redémarrer de la même façon. Il "
1240+"est fortement recommandé de redémarrer votre machine pour éviter les "
1241+"problèmes liés à SSL."
1242--- openssl097-0.9.7g.orig/debian/po/nl.po
1243+++ openssl097-0.9.7g/debian/po/nl.po
1244@@ -0,0 +1,71 @@
1245+# Translators, if you are not familiar with the PO format, gettext
1246+# documentation is worth reading, especially sections dedicated to
1247+# this format, e.g. by running:
1248+# info -n '(gettext)PO Files'
1249+# info -n '(gettext)Header Entry'
1250+#
1251+# Some information specific to po-debconf are available at
1252+# /usr/share/doc/po-debconf/README-trans
1253+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
1254+#
1255+# Developers do not need to manually edit POT or PO files.
1256+#
1257+msgid ""
1258+msgstr ""
1259+"Project-Id-Version: openssl 0.9.7d-5\n"
1260+"Report-Msgid-Bugs-To: \n"
1261+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
1262+"PO-Revision-Date: 2004-08-01 18:31+0100\n"
1263+"Last-Translator: Luk Claes <luk.claes@ugent.be>\n"
1264+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
1265+"MIME-Version: 1.0\n"
1266+"Content-Type: text/plain; charset=iso-8859-1\n"
1267+"Content-Transfer-Encoding: 8bit\n"
1268+
1269+#. Type: string
1270+#. Description
1271+#: ../libssl0.9.7.templates:3
1272+msgid "Which services should be restarted to make them use the new libraries?"
1273+msgstr ""
1274+"Welke diensten moeten herstart worden om ze de nieuwe bibliotheken te laten "
1275+"gebruiken?"
1276+
1277+#. Type: string
1278+#. Description
1279+#: ../libssl0.9.7.templates:3
1280+msgid ""
1281+"Security holes were fixed with this release. Services may not use these "
1282+"fixes until they are restarted. Note: restarting sshd should not affect any "
1283+"existing connections."
1284+msgstr ""
1285+"Er zijn veiligheidslekken gedicht in deze release. Diensten gebruiken deze "
1286+"versie misschien niet totdat ze herstart zijn. Merk op: sshd herstarten zou "
1287+"geen effect mogen hebben op bestaande verbindingen."
1288+
1289+#. Type: string
1290+#. Description
1291+#: ../libssl0.9.7.templates:3
1292+msgid ""
1293+"Following is a list of detected services that need to be restarted. Please "
1294+"correct the list, if you think it is incorrect. The services names must be "
1295+"identical to the script names in /etc/init.d and must be separated by "
1296+"spaces. If you clear the list, no services will be restarted."
1297+msgstr ""
1298+"Hierna volgt een lijst van gedetecteerde diensten die herstart moeten "
1299+"worden. Verbeter de lijst, als u denkt dat ze incorrect is. De namen moeten "
1300+"overeenkomen met de script-namen in /etc/init.d en moeten gescheiden worden "
1301+"door spaties. Als u de lijst ledigt, dan zullen er geen diensten worden "
1302+"herstart."
1303+
1304+#. Type: string
1305+#. Description
1306+#: ../libssl0.9.7.templates:3
1307+msgid ""
1308+"If other services begin to fail mysteriously after this upgrade, it may be "
1309+"necessary to restart them too. We strongly recommend you to reboot your "
1310+"machine to avoid the SSL related trouble."
1311+msgstr ""
1312+"Als er andere diensten mysterieus beginnen te falen na deze opwaardering, "
1313+"kan het nodig zijn om ze ook te herstarten. Er wordt u ten zeerste "
1314+"aanbevolen uw machine te herstarten om SSL-gerelateerde problemen te "
1315+"vermijden."
1316--- openssl097-0.9.7g.orig/debian/po/ja.po
1317+++ openssl097-0.9.7g/debian/po/ja.po
1318@@ -0,0 +1,69 @@
1319+#
1320+# Translators, if you are not familiar with the PO format, gettext
1321+# documentation is worth reading, especially sections dedicated to
1322+# this format, e.g. by running:
1323+# info -n '(gettext)PO Files'
1324+# info -n '(gettext)Header Entry'
1325+#
1326+# Some information specific to po-debconf are available at
1327+# /usr/share/doc/po-debconf/README-trans
1328+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
1329+#
1330+# Developers do not need to manually edit POT or PO files.
1331+#
1332+#
1333+msgid ""
1334+msgstr ""
1335+"Project-Id-Version: openssl 0.9.7d-1\n"
1336+"Report-Msgid-Bugs-To: \n"
1337+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
1338+"PO-Revision-Date: 2004-03-24 23:41+0900\n"
1339+"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n"
1340+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
1341+"MIME-Version: 1.0\n"
1342+"Content-Type: text/plain; charset=EUC-JP\n"
1343+"Content-Transfer-Encoding: 8bit\n"
1344+
1345+#. Type: string
1346+#. Description
1347+#: ../libssl0.9.7.templates:3
1348+msgid "Which services should be restarted to make them use the new libraries?"
1349+msgstr "¤É¤Î¥µ¡¼¥Ó¥¹¤ò¿·¤·¤¤¥é¥¤¥Ö¥é¥ê¤ò»È¤¦¤¿¤á¤ËºÆµ¯Æ°¤·¤Þ¤¹¤«?"
1350+
1351+#. Type: string
1352+#. Description
1353+#: ../libssl0.9.7.templates:3
1354+msgid ""
1355+"Security holes were fixed with this release. Services may not use these "
1356+"fixes until they are restarted. Note: restarting sshd should not affect any "
1357+"existing connections."
1358+msgstr ""
1359+"º£²ó¤Î¥ê¥ê¡¼¥¹¤Ç¥»¥­¥å¥ê¥Æ¥£¥Û¡¼¥ë¤¬½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£³Æ¥µ¡¼¥Ó¥¹¤ÏºÆµ¯Æ°¤ò¹Ô¤¦"
1360+"¤Þ¤Ç¤³¤Î½¤Àµ¤µ¤ì¤¿¥é¥¤¥Ö¥é¥ê¤òÍøÍѤ·¤Þ¤»¤ó¡£Ãí°Õ: sshd ¤ÎºÆµ¯Æ°¤Ï¸½¾õ¤ÎÀܳ¤Ë"
1361+"¤Ï²¿¤é±Æ¶Á¤·¤Þ¤»¤ó¡£"
1362+
1363+#. Type: string
1364+#. Description
1365+#: ../libssl0.9.7.templates:3
1366+msgid ""
1367+"Following is a list of detected services that need to be restarted. Please "
1368+"correct the list, if you think it is incorrect. The services names must be "
1369+"identical to the script names in /etc/init.d and must be separated by "
1370+"spaces. If you clear the list, no services will be restarted."
1371+msgstr ""
1372+"°Ê²¼¤¬ºÆµ¯Æ°¤¬É¬ÍפÀ¤ÈȽÃǤµ¤ì¤¿¥µ¡¼¥Ó¥¹¤Î¥ê¥¹¥È¤Ç¤¹¡£´Ö°ã¤Ã¤Æ¤¤¤ë¤È»×¤Ã¤¿¤é"
1373+"½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤¡£¥µ¡¼¥Ó¥¹Ì¾¤Ï /etc/init.d ¤Ë¤¢¤ë¥¹¥¯¥ê¥×¥È¤Î̾Á°¤ò»Ø¤·¡¢¶õÇò"
1374+"¤Ç¶èÀÚ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥ê¥¹¥È¤¬¶õ¤Î¾ì¹ç¤Ï¡¢¥µ¡¼¥Ó¥¹¤ÎºÆµ¯Æ°¤ÏɬÍפ¢¤ê¤Þ¤»"
1375+"¤ó¡£"
1376+
1377+#. Type: string
1378+#. Description
1379+#: ../libssl0.9.7.templates:3
1380+msgid ""
1381+"If other services begin to fail mysteriously after this upgrade, it may be "
1382+"necessary to restart them too. We strongly recommend you to reboot your "
1383+"machine to avoid the SSL related trouble."
1384+msgstr ""
1385+"¾¤Î¥µ¡¼¥Ó¥¹¤¬¤³¤³¤Ç¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¸å¤Ë²¿¸Î¤«¥¨¥é¡¼¤òµ¯¤³¤·»Ï¤á¤¿¾ì¹ç¡¢¤½"
1386+"¤ì¤é¤âºÆµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£SSL ´ØÏ¢¤Î¥È¥é¥Ö¥ë¤òÈò¤±¤ë¤¿¤á¤Ë¥Þ¥·¥ó¤òºÆµ¯"
1387+"Æ°¤¹¤ë¤Î¤ò¶¯¤¯¤ª´«¤á¤·¤Þ¤¹¡£"
1388--- openssl097-0.9.7g.orig/debian/po/POTFILES.in
1389+++ openssl097-0.9.7g/debian/po/POTFILES.in
1390@@ -0,0 +1 @@
1391+[type: gettext/rfc822deb] libssl0.9.7.templates
1392--- openssl097-0.9.7g.orig/debian/po/vi.po
1393+++ openssl097-0.9.7g/debian/po/vi.po
1394@@ -0,0 +1,61 @@
1395+# Vietnamese translation for openssl.
1396+# Copyright © 2005 Free Software Foundation, Inc.
1397+# Clytie Siddall <clytie@riverland.net.au>, 2005.
1398+#
1399+msgid ""
1400+msgstr ""
1401+"Project-Id-Version: openssl 0.9.7g-1\n"
1402+"Report-Msgid-Bugs-To: \n"
1403+"POT-Creation-Date: 2004-03-22 18:34+0100\n"
1404+"PO-Revision-Date: 2005-07-03 12:49+0930\n"
1405+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
1406+"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
1407+"MIME-Version: 1.0\n"
1408+"Content-Type: text/plain; charset=utf-8\n"
1409+"Content-Transfer-Encoding: 8bit\n"
1410+"Plural-Forms: nplurals=1; plural=0\n"
1411+"X-Generator: LocFactoryEditor 1.2.2\n"
1412+
1413+#. Type: string
1414+#. Description
1415+#: ../libssl0.9.7.templates:3
1416+msgid "Which services should be restarted to make them use the new libraries?"
1417+msgstr "Äể dùng những thÆ° viên má»›i, cần phải khởi chạy lại dịch vụ nào?"
1418+
1419+#. Type: string
1420+#. Description
1421+#: ../libssl0.9.7.templates:3
1422+msgid ""
1423+"Security holes were fixed with this release. Services may not use these "
1424+"fixes until they are restarted. Note: restarting sshd should not affect any "
1425+"existing connections."
1426+msgstr ""
1427+"Phiên bản phát hành này đã sửa một số lỗ hổng bảo mật rồi. Dịch vụ sẽ dùng "
1428+"mã đã sửa chỉ sau khi khởi chạy lại thôi. Ghi chú: khởi chạy lại sshd nên "
1429+"không làm ảnh hưởng đến sá»± kết nối hiện thá»i nào."
1430+
1431+#. Type: string
1432+#. Description
1433+#: ../libssl0.9.7.templates:3
1434+msgid ""
1435+"Following is a list of detected services that need to be restarted. Please "
1436+"correct the list, if you think it is incorrect. The services names must be "
1437+"identical to the script names in /etc/init.d and must be separated by "
1438+"spaces. If you clear the list, no services will be restarted."
1439+msgstr ""
1440+"Theo đây có một danh sách dịch vụ đã phát hiện mà cần phải khởi chạy lại. "
1441+"Bạn hãy sửa danh sách nếu chưa đúng. Tên dịch vụ phải là cùng một tên với "
1442+"tên tập lệnh trong «/etc/init.d», những tên định giới bằng dấu cách. Nếu bạn "
1443+"xóa hết danh sách thì sẽ không khởi chạy lại dịch vụ nào."
1444+
1445+#. Type: string
1446+#. Description
1447+#: ../libssl0.9.7.templates:3
1448+msgid ""
1449+"If other services begin to fail mysteriously after this upgrade, it may be "
1450+"necessary to restart them too. We strongly recommend you to reboot your "
1451+"machine to avoid the SSL related trouble."
1452+msgstr ""
1453+"Nếu dịch vụ khác mới bị lỗi một cách lạ sau việc nâng cấp này, có lẽ bạn "
1454+"cũng cần phải khởi chạy lại chúng. Khuyến khích nặng bạn khởi động máy này "
1455+"để tránh lỗi liên quan đến SSL."
1456--- openssl097-0.9.7g.orig/debian/libssl0.9.7-dev.docs
1457+++ openssl097-0.9.7g/debian/libssl0.9.7-dev.docs
1458@@ -0,0 +1 @@
1459+demos
1460--- openssl097-0.9.7g.orig/debian/control
1461+++ openssl097-0.9.7g/debian/control
1462@@ -0,0 +1,27 @@
1463+Source: openssl097
1464+Build-Depends: debhelper (>= 4.2.0), binutils (>= 2.14.90.0.7), zlib1g-dev
1465+Section: utils
1466+Priority: optional
1467+Maintainer: Debian OpenSSL Team <pkg-openssl-devel@lists.alioth.debian.org>
1468+Uploaders: Christoph Martin <christoph.martin@uni-mainz.de>, Kurt Roeckx <kurt@roeckx.be>
1469+Standards-Version: 3.6.1
1470+
1471+Package: libssl0.9.7
1472+Section: oldlibs
1473+Priority: important
1474+Architecture: any
1475+Depends: ${shlibs:Depends}, ${misc:Depends}
1476+Conflicts: ssleay (<< 0.9.2b), libssl, openssl (<< 0.9.6-2), libssl096-dev (<< 0.9.6-2)
1477+Description: SSL shared libraries
1478+ libssl and libcrypto shared libraries needed by programs like
1479+ apache-ssl, telnet-ssl and openssh.
1480+ .
1481+ It is part of the OpenSSL implementation of SSL.
1482+
1483+Package: libssl0.9.7-dbg
1484+Section: libdevel
1485+Priority: extra
1486+Architecture: any
1487+Depends: libssl0.9.7 (= ${Source-Version})
1488+Description: Symbol tables for libssl and libcrypt
1489+ This package is part of the OpenSSL implementation of SSL.
1490--- openssl097-0.9.7g.orig/debian/libssl0.9.7-dev.prerm
1491+++ openssl097-0.9.7g/debian/libssl0.9.7-dev.prerm
1492@@ -0,0 +1,3 @@
1493+#!/bin/sh -e
1494+
1495+#DEBHELPER#
1496--- openssl097-0.9.7g.orig/debian/libssl0.9.7-dev.postinst
1497+++ openssl097-0.9.7g/debian/libssl0.9.7-dev.postinst
1498@@ -0,0 +1,3 @@
1499+#!/bin/sh -e
1500+
1501+#DEBHELPER#
1502--- openssl097-0.9.7g.orig/debian/libssl0.9.7-dev.files
1503+++ openssl097-0.9.7g/debian/libssl0.9.7-dev.files
1504@@ -0,0 +1,9 @@
1505+usr/lib/libssl.so
1506+usr/lib/libcrypto.so
1507+usr/lib/libssl.a
1508+usr/lib/libcrypto.a
1509+usr/lib/libssl_pic.a
1510+usr/lib/libcrypto_pic.a
1511+usr/lib/pkgconfig/openssl.pc
1512+usr/include
1513+usr/share/man/man3
1514--- openssl097-0.9.7g.orig/debian/libssl0.9.7.templates
1515+++ openssl097-0.9.7g/debian/libssl0.9.7.templates
1516@@ -0,0 +1,15 @@
1517+Template: libssl0.9.7/restart-services
1518+Type: string
1519+_Description: Which services should be restarted to make them use the new libraries?
1520+ Security holes were fixed with this release. Services may not use these
1521+ fixes until they are restarted. Note: restarting sshd should not affect any
1522+ existing connections.
1523+ .
1524+ Following is a list of detected services that need to be restarted. Please
1525+ correct the list, if you think it is incorrect. The services names must be
1526+ identical to the script names in /etc/init.d and must be separated by
1527+ spaces. If you clear the list, no services will be restarted.
1528+ .
1529+ If other services begin to fail mysteriously after this upgrade, it may be
1530+ necessary to restart them too. We strongly recommend you to reboot your
1531+ machine to avoid the SSL related trouble.
1532--- openssl097-0.9.7g.orig/debian/libssl0.9.7-dev.dirs
1533+++ openssl097-0.9.7g/debian/libssl0.9.7-dev.dirs
1534@@ -0,0 +1,3 @@
1535+usr/lib
1536+usr/share/doc/libssl0.9.7-dev
1537+usr/share/man
1538--- openssl097-0.9.7g.orig/debian/README.optimization
1539+++ openssl097-0.9.7g/debian/README.optimization
1540@@ -0,0 +1,32 @@
1541+openssl ships optimized libraries for some cpus. The loading of these
1542+libraries depends on the ability of the dynamic linker to automaticly
1543+search additional directories depending on the cpu. If you want to
1544+find out which are these directories for your computer, run the
1545+following command:
1546+
1547+LD_LIBRARY_PATH=/usr/lib strace true 2>&1 | fgrep "open(\"/usr/lib"
1548+
1549+On a Pentium III this gives:
1550+
1551+open("/usr/lib/i686/mmx/libc.so.6", O_RDONLY) = -1 ENOENT (No such file or directory)
1552+open("/usr/lib/i686/libc.so.6", O_RDONLY) = -1 ENOENT (No such file or directory)
1553+open("/usr/lib/mmx/libc.so.6", O_RDONLY) = -1 ENOENT (No such file or directory)
1554+open("/usr/lib/libc.so.6", O_RDONLY) = -1 ENOENT (No such file or directory)
1555+
1556+Following is a list of cpus, library paths and possible optimizations:
1557+
1558+486 /usr/lib/i486 -march=i486 -mcpu=i486 +asm
1559+Pentium /usr/lib/i586 -march=i586 -mcpu=i586 +asm
1560+Pentium MMX /usr/lib/i586 -march=i586 -mcpu=i586 +asm
1561+Pentium II /usr/lib/i686 -march=i686 -mcpu=i686 +asm
1562+Pentium III /usr/lib/i686 -march=i686 -mcpu=i686 +asm
1563+AMD-K6 /usr/lib/i586 -march=i586 -mcpu=i586 +asm
1564+AMD-K7 /usr/lib/i686 -march=i686 -mcpu=i686 +asm
1565+
1566+Sparc v8 /usr/lib/v8 -mcpu=v8 +asm
1567+Sparc v9 /usr/lib/v9 -mcpu=v9 -Wa,-Av8plus +asm
1568+
1569+Alpha EV4 /usr/lib/ev4 -mcpu=ev4
1570+Alpha EV5 /usr/lib/ev5 -mcpu=ev5
1571+
1572++asm means that the handcrafted 586 assembler routines can be used.
1573--- openssl097-0.9.7g.orig/debian/libssl0.9.7.dirs
1574+++ openssl097-0.9.7g/debian/libssl0.9.7.dirs
1575@@ -0,0 +1,2 @@
1576+usr/lib
1577+usr/share/doc/libssl0.9.7
1578--- openssl097-0.9.7g.orig/debian/libssl0.9.7.files
1579+++ openssl097-0.9.7g/debian/libssl0.9.7.files
1580@@ -0,0 +1,3 @@
1581+usr/lib/*.so.*.*.*
1582+usr/lib/*/*.so.*.*.*
1583+usr/lib/i686/cmov/*.so.*.*.*
1584--- openssl097-0.9.7g.orig/debian/changelog
1585+++ openssl097-0.9.7g/debian/changelog
1586@@ -0,0 +1,689 @@
1587+openssl097 (0.9.7g-5) unstable; urgency=medium
1588+
1589+ * Add the shlibs for libcrypto again, removed by accident.
1590+ * Change priority of -dbg package to extra.
1591+ * Remove the libssl0.9.7-dev package.
1592+ * Add security patch for CAN-2005-2969, setting urgency to medium.
1593+
1594+ -- Kurt Roeckx <kurt@roeckx.be> Wed, 12 Oct 2005 21:07:19 +0200
1595+
1596+openssl097 (0.9.7g-4) unstable; urgency=low
1597+
1598+ * Reintroduce openssl 0.9.7 source package to provide the old
1599+ library version. This should make packages linked against
1600+ the old version installable again. (Closes: #332892)
1601+ * Drop the openssl and libcrypto0.9.7-udeb package.
1602+ * Rename libssl-dev to libssl0.9.7-dev.
1603+ * Add myself to the Uploaders field.
1604+
1605+ -- Kurt Roeckx <kurt@roeckx.be> Mon, 10 Oct 2005 18:38:30 +0200
1606+
1607+openssl (0.9.7g-3) unstable; urgency=low
1608+
1609+ * change Configure line for debian-freebsd-i386 to debian-kfreebsd-i386
1610+ (closes: #327692)
1611+ * include -dbg version. That implies compiling with -g and without
1612+ -fomit-frame-pointer (closes: #293823, #153811)
1613+
1614+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 23 Sep 2005 13:51:57 +0200
1615+
1616+openssl (0.9.7g-2) unstable; urgency=low
1617+
1618+ * really include nl translation
1619+ * remove special ia64 code from rc4 code to make the abi compatible to
1620+ older 0.9.7 versions (closes: #310489, #309274)
1621+ * fix compile flag for debian-ppc64 (closes: #318750)
1622+ * small fix in libssl0.9.7.postinst (closes: #239956)
1623+ * fix pk7_mime.c to prevent garbled messages because of to early memory
1624+ free (closes: #310184)
1625+ * include vietnamese debconf translation (closes: #316689)
1626+ * make optimized i386 libraries have non executable stack (closes:
1627+ #321721)
1628+ * remove leftover files from ssleay
1629+ * move from dh_installmanpages to dh_installman
1630+ * change Maintainer to pkg-openssl-devel@lists.alioth.debian.org
1631+
1632+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 7 Sep 2005 15:32:54 +0200
1633+
1634+openssl (0.9.7g-1) unstable; urgency=low
1635+
1636+ * New upstream release
1637+ * Added support for proxy certificates according to RFC 3820.
1638+ Because they may be a security thread to unaware applications,
1639+ they must be explicitely allowed in run-time. See
1640+ docs/HOWTO/proxy_certificates.txt for further information.
1641+ * Prompt for pass phrases when appropriate for PKCS12 input format.
1642+ * Back-port of selected performance improvements from development
1643+ branch, as well as improved support for PowerPC platforms.
1644+ * Add lots of checks for memory allocation failure, error codes to indicate
1645+ failure and freeing up memory if a failure occurs.
1646+ * Perform some character comparisons of different types in X509_NAME_cmp:
1647+ this is needed for some certificates that reencode DNs into UTF8Strings
1648+ (in violation of RFC3280) and can't or wont issue name rollover
1649+ certificates.
1650+ * corrected watchfile
1651+ * added upstream source url (closes: #292904)
1652+ * fix typo in CA.pl.1 (closes: #290271)
1653+ * change debian-powerpc64 to debian-ppc64 and adapt the configure
1654+ options to be the same like upstream (closes: #289841)
1655+ * include -signcert option in CA.pl usage
1656+ * compile with zlib-dynamic to use system zlib (closes: #289872)
1657+
1658+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 9 May 2005 23:32:03 +0200
1659+
1660+openssl (0.9.7e-3) unstable; urgency=high
1661+
1662+ * really fix der_chop. The fix from -1 was not really included (closes:
1663+ #281212)
1664+ * still fixes security problem CAN-2004-0975 etc.
1665+ - tempfile raise condition in der_chop
1666+ - Avoid a race condition when CRLs are checked in a multi threaded
1667+ environment.
1668+
1669+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 16 Dec 2004 18:41:29 +0100
1670+
1671+openssl (0.9.7e-2) unstable; urgency=high
1672+
1673+ * fix perl path in der_chop and c_rehash (closes: #281212)
1674+ * still fixes security problem CAN-2004-0975 etc.
1675+ - tempfile raise condition in der_chop
1676+ - Avoid a race condition when CRLs are checked in a multi threaded
1677+ environment.
1678+
1679+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sun, 14 Nov 2004 20:16:21 +0100
1680+
1681+openssl (0.9.7e-1) unstable; urgency=high
1682+
1683+ * SECURITY UPDATE: fix insecure temporary file handling
1684+ * apps/der_chop:
1685+ - replaced $$-style creation of temporary files with
1686+ File::Temp::tempfile()
1687+ - removed unused temporary file name in do_certificate()
1688+ * References:
1689+ CAN-2004-0975 (closes: #278260)
1690+ * fix ASN1_STRING_to_UTF8 with UTF8 (closes: #260357)
1691+ * New upstream release with security fixes
1692+ - Avoid a race condition when CRLs are checked in a multi threaded
1693+ environment.
1694+ - Various fixes to s3_pkt.c so alerts are sent properly.
1695+ - Reduce the chances of duplicate issuer name and serial numbers (in
1696+ violation of RFC3280) using the OpenSSL certificate creation
1697+ utilities.
1698+ * depends openssl on perl-base instead of perl (closes: #280225)
1699+ * support powerpc64 in Configure (closes: #275224)
1700+ * include cs translation (closes: #273517)
1701+ * include nl translation (closes: #272479)
1702+ * Fix default dir of c_rehash (closes: #253126)
1703+
1704+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 12 Nov 2004 14:11:15 +0100
1705+
1706+openssl (0.9.7d-5) unstable; urgency=low
1707+
1708+ * Make S/MIME encrypt work again (backport from CVS) (closes: #241407,
1709+ #241386)
1710+
1711+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 26 Jul 2004 17:22:42 +0200
1712+
1713+openssl (0.9.7d-4) unstable; urgency=low
1714+
1715+ * add Catalan translation (closes: #248749)
1716+ * add Spanish translation (closes: #254561)
1717+ * include NMU fixes: see below
1718+ * decrease optimisation level for debian-arm to work around gcc bug
1719+ (closes: #253848) (thanks to Steve Langasek and Thom May)
1720+ * Add libcrypto0.9.7-udeb. (closes: #250010) (thanks to Bastian Blank)
1721+ * Add watchfile
1722+
1723+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 14 Jul 2004 14:31:02 +0200
1724+
1725+openssl (0.9.7d-3) unstable; urgency=low
1726+
1727+ * rename -pic.a libraries to _pic.a (closes: #250016)
1728+
1729+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 24 May 2004 17:02:29 +0200
1730+
1731+openssl (0.9.7d-2) unstable; urgency=low
1732+
1733+ * include PIC libs (libcrypto-pic.a and libssl-pic.a) to libssl-dev
1734+ (closes: #246928, #243999)
1735+ * add racoon to restart list (closes: #242652)
1736+ * add Brazilian, Japanese and Danish translations (closes: #242087,
1737+ #241830, #241705)
1738+
1739+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 11 May 2004 10:13:49 +0200
1740+
1741+openssl (0.9.7d-1) unstable; urgency=high
1742+
1743+ * new upstream
1744+ * fixes security holes (http://www.openssl.org/news/secadv_20040317.txt)
1745+ (closes: #238661)
1746+ * includes support for debian-amd64 (closes: #235551, #232310)
1747+ * fix typo in pem.pod (closes: #219873)
1748+ * fix typo in libssl0.9.7.templates (closes: #224690)
1749+ * openssl suggests ca-certificates (closes: #217180)
1750+ * change debconf template to gettext format (closes: #219013)
1751+ * include french debconf template (closes: #219014)
1752+
1753+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 18 Mar 2004 16:18:43 +0100
1754+
1755+openssl (0.9.7c-5) unstable; urgency=low
1756+
1757+ * include openssl.pc into libssl-dev (closes: #212545)
1758+
1759+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 16 Oct 2003 16:31:32 +0200
1760+
1761+openssl (0.9.7c-4) unstable; urgency=low
1762+
1763+ * change question to restart services to debconf (closes: #214840)
1764+ * stop using dh_undocumented (closes: #214831)
1765+
1766+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 10 Oct 2003 15:40:48 +0200
1767+
1768+openssl (0.9.7c-3) unstable; urgency=low
1769+
1770+ * fix POSIX conformance for head in libssl0.9.7.postinst (closes:
1771+ #214700)
1772+
1773+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 8 Oct 2003 14:02:38 +0200
1774+
1775+openssl (0.9.7c-2) unstable; urgency=low
1776+
1777+ * add filerc macro to libssl0.9.7.postinst (closes: #213906)
1778+ * restart spamassassins spamd on upgrade (closes: #214106)
1779+ * restart more services on upgrade
1780+ * fix EVP_BytesToKey manpage (closes: #213715)
1781+
1782+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 7 Oct 2003 15:01:32 +0200
1783+
1784+openssl (0.9.7c-1) unstable; urgency=high
1785+
1786+ * upstream security fix (closes: #213451)
1787+ - Fix various bugs revealed by running the NISCC test suite:
1788+ Stop out of bounds reads in the ASN1 code when presented with
1789+ invalid tags (CAN-2003-0543 and CAN-2003-0544).
1790+ Free up ASN1_TYPE correctly if ANY type is invalid (CAN-2003-0545).
1791+ If verify callback ignores invalid public key errors don't try to check
1792+ certificate signature with the NULL public key.
1793+ - In ssl3_accept() (ssl/s3_srvr.c) only accept a client certificate
1794+ if the server requested one: as stated in TLS 1.0 and SSL 3.0
1795+ specifications.
1796+ * more minor upstream bugfixes
1797+ * fix formatting in c_issuer (closes: #190026)
1798+ * fix Debian-FreeBSD support (closes: #200381)
1799+ * restart some services in postinst to make them use the new libraries
1800+ * remove duplicated openssl.1, crypto.3 and ssl.3 (closes: #198594)
1801+
1802+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 1 Oct 2003 08:54:27 +0200
1803+
1804+openssl (0.9.7b-2) unstable; urgency=high
1805+
1806+ * fix permission of /etc/ssl/private to 700 again
1807+ * change section of libssl-dev to libdevel
1808+
1809+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 23 Apr 2003 11:13:24 +0200
1810+
1811+openssl (0.9.7b-1) unstable; urgency=high
1812+
1813+ * upstream security fix
1814+ - Countermeasure against the Klima-Pokorny-Rosa extension of
1815+ Bleichbacher's attack on PKCS #1 v1.5 padding: treat
1816+ a protocol version number mismatch like a decryption error
1817+ in ssl3_get_client_key_exchange (ssl/s3_srvr.c). (CAN-2003-0131)
1818+ (closes: #189087)
1819+ - Turn on RSA blinding by default in the default implementation
1820+ to avoid a timing attack. Applications that don't want it can call
1821+ RSA_blinding_off() or use the new flag RSA_FLAG_NO_BLINDING.
1822+ They would be ill-advised to do so in most cases. (CAN-2003-0147)
1823+ - Change RSA blinding code so that it works when the PRNG is not
1824+ seeded (in this case, the secret RSA exponent is abused as
1825+ an unpredictable seed -- if it is not unpredictable, there
1826+ is no point in blinding anyway). Make RSA blinding thread-safe
1827+ by remembering the creator's thread ID in rsa->blinding and
1828+ having all other threads use local one-time blinding factors
1829+ (this requires more computation than sharing rsa->blinding, but
1830+ avoids excessive locking; and if an RSA object is not shared
1831+ between threads, blinding will still be very fast).
1832+ for more details see the CHANGES file
1833+
1834+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 16 Apr 2003 10:32:57 +0200
1835+
1836+openssl (0.9.7a-1) unstable; urgency=high
1837+
1838+ * upstream Security fix
1839+ - In ssl3_get_record (ssl/s3_pkt.c), minimize information leaked
1840+ via timing by performing a MAC computation even if incorrrect
1841+ block cipher padding has been found. This is a countermeasure
1842+ against active attacks where the attacker has to distinguish
1843+ between bad padding and a MAC verification error. (CAN-2003-0078)
1844+ for more details see the CHANGES file
1845+
1846+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 21 Feb 2003 22:39:40 +0100
1847+
1848+openssl (0.9.7-4) unstable; urgency=low
1849+
1850+ * use DH_COMPAT=3 to build
1851+ * move i686 to i686/cmov to fix problems on Via C3. For that to work we
1852+ have to depend on the newest libc6 on i386 (closes: #177891)
1853+ * fix bug in ui_util.c (closes: #177615)
1854+ * fix typo in md5.h (closes: #178112)
1855+
1856+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 24 Jan 2003 10:22:56 +0100
1857+
1858+openssl (0.9.7-3) unstable; urgency=low
1859+
1860+ * enable build of ultrasparc code on non ultrasparc machines (closes:
1861+ #177024)
1862+
1863+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 17 Jan 2003 08:22:13 +0100
1864+
1865+openssl (0.9.7-2) unstable; urgency=low
1866+
1867+ * include changes between 0.9.6g-9 and -10
1868+ * fix problem in build-process on i386 with libc6 version number
1869+
1870+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 13 Jan 2003 14:26:56 +0100
1871+
1872+openssl (0.9.7-1) unstable; urgency=low
1873+
1874+ * new upstream
1875+ * includes engine support
1876+ * a lot of bugfixes and enhancements, see the CHANGES file
1877+ * include AES encryption
1878+ * makes preview of certificate configurable (closes: #176059)
1879+ * fix x509 manpage (closes: #168070)
1880+ * fix declaration of ERR_load_PEM_string in pem.h (closes: #141360)
1881+
1882+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 11 Jan 2003 09:12:16 +0100
1883+
1884+openssl (0.9.6g-10) unstable; urgency=low
1885+
1886+ * fix problem in build-process on i386 with libc6 version number
1887+ (closes: #167096)
1888+
1889+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 4 Nov 2002 12:27:21 +0100
1890+
1891+openssl (0.9.6g-9) unstable; urgency=low
1892+
1893+ * fix typo in i386 libc6 depend (sigh) (closes: #163848)
1894+
1895+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 8 Oct 2002 23:29:20 +0200
1896+
1897+openssl (0.9.6g-8) unstable; urgency=low
1898+
1899+ * fix libc6 depends. Only needed for i386 (closes: #163701)
1900+ * remove SHLIB section for bsds from Configure (closes: #163585)
1901+
1902+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 8 Oct 2002 10:57:35 +0200
1903+
1904+openssl (0.9.6g-7) unstable; urgency=low
1905+
1906+ * enable i686 optimisation and depend on fixed glibc (closes: #163500)
1907+ * remove transition package ssleay
1908+ * include optimisation vor sparcv8 (closes: #139996)
1909+ * improve optimisation vor sparcv9
1910+
1911+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sun, 6 Oct 2002 14:07:12 +0200
1912+
1913+openssl (0.9.6g-6) unstable; urgency=low
1914+
1915+ * temporarily disable i686 optimisation (See bug in glibc #161788)
1916+
1917+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 21 Sep 2002 18:56:49 +0200
1918+
1919+openssl (0.9.6g-5) unstable; urgency=low
1920+
1921+ * i486 can use i586 assembler
1922+ * include set -xe in the for loops in the rules files to make it abort
1923+ on error (closes: #161768)
1924+
1925+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 21 Sep 2002 16:23:11 +0200
1926+
1927+openssl (0.9.6g-4) unstable; urgency=low
1928+
1929+ * fix optimization for alpha and sparc
1930+ * add optimization for i486
1931+
1932+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 20 Sep 2002 22:36:19 +0200
1933+
1934+openssl (0.9.6g-3) unstable; urgency=low
1935+
1936+ * add optimized libraries for i586, i686, ev4, ev5 and v9 (closes: #139783)
1937+
1938+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 19 Sep 2002 18:33:04 +0200
1939+
1940+openssl (0.9.6g-2) unstable; urgency=low
1941+
1942+ * fix manpage names (closes: #156717, #156718, #156719, #156721)
1943+
1944+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 15 Aug 2002 11:26:37 +0200
1945+
1946+openssl (0.9.6g-1) unstable; urgency=low
1947+
1948+ * new upstream version
1949+ * Use proper error handling instead of 'assertions' in buffer
1950+ overflow checks added in 0.9.6e. This prevents DoS (the
1951+ assertions could call abort()). (closes: #155985, #156495)
1952+ * Fix ASN1 checks. Check for overflow by comparing with LONG_MAX
1953+ and get fix the header length calculation.
1954+ * include support for new sh* architectures (closes: #155117)
1955+
1956+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 14 Aug 2002 13:59:22 +0200
1957+
1958+openssl (0.9.6e-1) unstable; urgency=high
1959+
1960+ * fixes remote exploits (see DSA-136-1)
1961+
1962+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 30 Jul 2002 18:32:28 +0200
1963+
1964+openssl (0.9.6d-1) unstable; urgency=low
1965+
1966+ * new upstream (minor) version
1967+ * includes Configure lines for debian-*bsd-* (closes: #130413)
1968+ * fix wrong prototype for BN_pseudo_rand_range in BN_rand(3ssl) (closes:
1969+ #144586)
1970+ * fix typos in package description (closes: #141469)
1971+ * fix typo in SSL_CTX_set_cert_store manpage (closes: #135297)
1972+
1973+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 3 Jun 2002 19:42:10 +0200
1974+
1975+openssl (0.9.6c-2) unstable; urgency=low
1976+
1977+ * moved from non-US to main
1978+
1979+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 19 Mar 2002 14:48:39 +0100
1980+
1981+openssl (0.9.6c-1) unstable; urgency=low
1982+
1983+ * new upstream version with a lot of bugfixes
1984+ * remove directory /usr/include/openssl from openssl package (closes:
1985+ bug #121226)
1986+ * remove selfdepends from libssl0.9.6
1987+ * link openssl binary shared again
1988+
1989+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 5 Jan 2002 19:04:31 +0100
1990+
1991+openssl (0.9.6b-4) unstable; urgency=low
1992+
1993+ * build with -D_REENTRANT for threads support on all architectures
1994+ (closes: #112329, #119239)
1995+
1996+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 24 Nov 2001 12:17:51 +0100
1997+
1998+openssl (0.9.6b-3) unstable; urgency=low
1999+
2000+ * disable idea, mdc2 and rc5 because they are not free (closes: #65368)
2001+ * ready to be moved from nonus to main
2002+
2003+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 21 Nov 2001 17:51:41 +0100
2004+
2005+openssl (0.9.6b-2) unstable; urgency=high
2006+
2007+ * fix definition of crypt in des.h (closes: #107533)
2008+ * fix descriptions (closes: #109503)
2009+
2010+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 17 Sep 2001 15:38:27 +0200
2011+
2012+openssl (0.9.6b-1) unstable; urgency=medium
2013+
2014+ * new upstream fixes some security issues (closes: #105835, #100146)
2015+ * added support for s390 (closes: #105681)
2016+ * added support for sh (closes: #100003)
2017+ * change priority of libssl096 to standard as ssh depends on it (closes:
2018+ #105440)
2019+ * don't optimize for i486 to support i386. (closes: #104127, #82194)
2020+
2021+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 20 Jul 2001 15:52:42 +0200
2022+
2023+openssl (0.9.6a-3) unstable; urgency=medium
2024+
2025+ * add perl-base to builddeps
2026+ * include static libraries in libssl-dev (closes: #93688)
2027+
2028+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 14 May 2001 20:16:06 +0200
2029+
2030+openssl (0.9.6a-2) unstable; urgency=medium
2031+
2032+ * change Architecture of ssleay from any to all (closes: #92913)
2033+ * depend libssl-dev on the exact same version of libssl0.9.6 (closes:
2034+ #88939)
2035+ * remove lib{crypto,ssl}.a from openssl (closes: #93666)
2036+ * rebuild with newer gcc to fix atexit problem (closes: #94036)
2037+
2038+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 2 May 2001 12:28:39 +0200
2039+
2040+openssl (0.9.6a-1) unstable; urgency=medium
2041+
2042+ * new upstream, fixes some security bugs (closes: #90584)
2043+ * fix typo in s_server manpage (closes: #89756)
2044+
2045+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 10 Apr 2001 12:13:11 +0200
2046+
2047+openssl (0.9.6-2) unstable; urgency=low
2048+
2049+ * policy: reorganisation of package names: libssl096 -> libssl0.9.6,
2050+ libssl096-dev -> libssl-dev (closes: #83426)
2051+ * libssl0.9.6 drops replaces libssl09 (Closes: #83425)
2052+ * install upstream CHANGES files (Closes: #83430)
2053+ * added support for hppa and ia64 (Closes: #88790)
2054+ * move man3 manpages to libssl-dev (Closes: #87546)
2055+ * fix formating problem in rand_add(1) (Closes: #87547)
2056+ * remove manpage duplicates (Closes: #87545, #74986)
2057+ * make package descriptions clearer (Closes: #83518, #83444)
2058+ * increase default emailAddress_max from 40 to 60 (Closes: #67238)
2059+ * removed RSAREF warning (Closes: #84122)
2060+
2061+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 8 Mar 2001 14:24:00 +0100
2062+
2063+openssl (0.9.6-1) unstable; urgency=low
2064+
2065+ * New upstream version (Thanks to Enrique Zanardi <ezanard@debian.org>)
2066+ (closes: #72388)
2067+ * Add support for debian-hurd (closes: #76032)
2068+
2069+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 13 Nov 2000 22:30:46 +0100
2070+
2071+openssl (0.9.5a-5) unstable; urgency=low
2072+
2073+ * move manpages in standard directories with section ssl (closes:
2074+ #72152, #69809)
2075+
2076+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 5 Oct 2000 19:56:20 +0200
2077+
2078+openssl (0.9.5a-4) unstable; urgency=low
2079+
2080+ * include edg_rand_bytes patch from and for apache-ssl
2081+
2082+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 23 Sep 2000 16:48:06 +0200
2083+
2084+openssl (0.9.5a-3) unstable; urgency=low
2085+
2086+ * fix call to dh_makeshlibs to create correct shlibs file and make
2087+ dependend programs link correctly (closes: Bug#61658)
2088+ * include a note in README.debian concerning the location of the
2089+ subcommand manpages (closes: Bug#69809)
2090+
2091+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 16 Sep 2000 19:10:50 +0200
2092+
2093+openssl (0.9.5a-2) unstable; urgency=low
2094+
2095+ * try to fix the sharedlib problem. change soname of library
2096+ (closes: Bug#4622, #66102, #66538, #66123)
2097+
2098+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 12 Jul 2000 03:26:30 +0200
2099+
2100+openssl (0.9.5a-1) unstable; urgency=low
2101+
2102+ * new upstream version (major changes see file NEWS) (closes: Bug#63976,
2103+ #65239, #65358)
2104+ * new library package libssl095a because of probably changed library
2105+ interface (closes: Bug#46222)
2106+ * added architecture mips and mipsel (closes: Bug#62437, #60366)
2107+ * provide shlibs.local file in build to help build if libraries are not
2108+ yet installed (closes: Bug#63984)
2109+
2110+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sun, 11 Jun 2000 15:17:35 +0200
2111+
2112+openssl (0.9.4-5) frozen unstable; urgency=medium
2113+
2114+ * cleanup of move of doc directories to /usr/share/doc (closes:
2115+ Bug#56430)
2116+ * lintian issues (closes: Bug#49358)
2117+ * move demos from openssl to libssl09-dev (closes: Bug#59201)
2118+ * move to debhelpers
2119+
2120+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 11 Mar 2000 10:38:04 +0100
2121+
2122+openssl (0.9.4-4) unstable; urgency=medium
2123+
2124+ * Added 'debian-arm' in 'Configure'. (closes: Bug#54251, #54766)
2125+ * Fixed Configure for 'debian-m68k' (closes: Bug#53636)
2126+
2127+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 15 Jan 2000 13:16:18 +0100
2128+
2129+openssl (0.9.4-3) unstable; urgency=low
2130+
2131+ * define symbol SSLeay_add_ssl_algorithms for backward compatibility
2132+ (closes: Bug#46882)
2133+ * remove manpages from /usr/doc/openssl (closes: Bug#46791)
2134+
2135+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 14 Oct 1999 16:51:08 +0200
2136+
2137+openssl (0.9.4-2) unstable; urgency=low
2138+
2139+ * include some more docu in pod format (Bug #43933)
2140+ * removed -mv8 from sparc flags (Bug #44769)
2141+
2142+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 14 Sep 1999 22:04:06 +0200
2143+
2144+openssl (0.9.4-1) unstable; urgency=low
2145+
2146+ * new upstream version (Closes: #42926)
2147+
2148+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sat, 28 Aug 1999 17:04:23 +0200
2149+
2150+openssl (0.9.3a-1) unstable; urgency=low
2151+
2152+ * new upstream version (Bug #38345, #38627)
2153+ * sparc is big-endian (Bug #39973)
2154+
2155+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 7 Jul 1999 16:03:37 +0200
2156+
2157+openssl (0.9.2b-3) unstable; urgency=low
2158+
2159+ * correct move conffiles to /etc/ssl (Bug #38570)
2160+
2161+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 31 May 1999 21:08:07 +0200
2162+
2163+openssl (0.9.2b-2) unstable; urgency=low
2164+
2165+ * added convenience package ssleay to help upgrade to openssl (Bug
2166+ #37185, #37623, #36326)
2167+ * added some missing dependencies from libssl09 (Bug #36681, #35867,
2168+ #36326)
2169+ * move lib*.so to libssl09-dev (Bug #36761)
2170+ * corrected version numbers of library files
2171+ * introduce link from /usr/lib/ssl to /etc/ssl (Bug #36710)
2172+
2173+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sun, 23 May 1999 14:57:48 +0200
2174+
2175+openssl (0.9.2b-1) unstable; urgency=medium
2176+
2177+ * First openssl version
2178+
2179+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 31 Mar 1999 15:54:26 +0200
2180+
2181+ssleay (0.9.0b-2) unstable; urgency=low
2182+
2183+ * Include message about the (not)usage of RSAREF (#24409)
2184+ * Move configfiles from /usr/lib/ssl to /etc/ssl (#26406)
2185+ * Change definitions for sparc (#26487)
2186+ * Added missing dependency (#28591)
2187+ * Make debian/libtool executable (#29708)
2188+ * /etc/ssl/lib/ssleay.cnf is now a confile (#32624)
2189+
2190+ -- Christoph Martin <christoph.martin@uni-mainz.de> Sun, 21 Mar 1999 19:41:04 +0100
2191+
2192+ssleay (0.9.0b-1) unstable; urgency=low
2193+
2194+ * new upstream version (Bug #21227, #25971)
2195+ * build shared libraries with -fPIC (Bug #20027)
2196+ * support sparc architecture (Bug #28467)
2197+
2198+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 13 Oct 1998 10:20:13 +0200
2199+
2200+ssleay (0.8.1-7) frozen unstable; urgency=high
2201+
2202+ * security fix patch to 0.8.1b (bug #24022)
2203+
2204+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 6 Jul 1998 15:42:15 +0200
2205+
2206+ssleay (0.8.1-6) frozen unstable; urgency=low
2207+
2208+ * second try to fix bug #15235 (copyright was still missing)
2209+
2210+ -- Christoph Martin <christoph.martin@uni-mainz.de> Mon, 22 Jun 1998 08:56:27 +0200
2211+
2212+ssleay (0.8.1-5) frozen unstable; urgency=high
2213+
2214+ * changed /dev/random to /dev/urandom (Bug #23169, #17817)
2215+ * copyright contains now the full licence (Bug #15235)
2216+ * fixed bug #19410 (md5sums-lists-nonexisting-file)
2217+ * added demos to /usr/doc (Bug #17372)
2218+ * fixed type in package description (Bug #18969)
2219+ * fixed bug in adding documentation (Bug #21463)
2220+ * added patch for support of debian-powerpc (Bug #21579)
2221+
2222+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 18 Jun 1998 23:09:13 +0200
2223+
2224+ssleay (0.8.1-4) unstable; urgency=low
2225+
2226+ * purged dependency from libc5
2227+
2228+ -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 11 Nov 1997 15:31:50 +0100
2229+
2230+ssleay (0.8.1-3) unstable; urgency=low
2231+
2232+ * changed packagename libssl to libssl08 to get better dependancies
2233+
2234+ -- Christoph Martin <christoph.martin@uni-mainz.de> Fri, 7 Nov 1997 14:23:17 +0100
2235+
2236+ssleay (0.8.1-2) unstable; urgency=low
2237+
2238+ * linked shared libraries against libc6
2239+ * use /dev/random for randomseed
2240+
2241+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 5 Nov 1997 11:21:40 +0100
2242+
2243+ssleay (0.8.1-1) unstable; urgency=low
2244+
2245+ * new upstream version
2246+
2247+ -- Christoph Martin <christoph.martin@uni-mainz.de> Thu, 16 Oct 1997 16:15:43 +0200
2248+
2249+ssleay (0.6.6-2) unstable; urgency=low
2250+
2251+ * cleanup in diffs
2252+ * removed INSTALL from docs (bug #13205)
2253+ * split libssl and libssl-dev (but #13735)
2254+
2255+ -- Christoph Martin <christoph.martin@uni-mainz.de> Wed, 15 Oct 1997 17:38:38 +0200
2256+
2257+ssleay (0.6.6-1) unstable; urgency=low
2258+
2259+ * New upstream version
2260+ * added shared libraries for libcrypto and libssl
2261+
2262+ -- Christoph Martin <martin@uni-mainz.de> Thu, 26 Jun 1997 19:26:14 +0200
2263+
2264+ssleay (0.6.4-2) unstable; urgency=low
2265+
2266+ * changed doc filenames from .doc to .txt to be able to read them
2267+ over with webbrowser
2268+
2269+ -- Christoph Martin <martin@uni-mainz.de> Tue, 25 Feb 1997 14:02:53 +0100
2270+
2271+ssleay (0.6.4-1) unstable; urgency=low
2272+
2273+ * Initial Release.
2274+
2275+ -- Christoph Martin <martin@uni-mainz.de> Fri, 22 Nov 1996 21:29:51 +0100
2276--- openssl097-0.9.7g.orig/debian/rules
2277+++ openssl097-0.9.7g/debian/rules
2278@@ -0,0 +1,173 @@
2279+#!/usr/bin/make -f
2280+# Sample debian.rules file - for GNU Hello (1.3).
2281+# Copyright 1994,1995 by Ian Jackson.
2282+# I hereby give you perpetual unlimited permission to copy,
2283+# modify and relicense this file, provided that you do not remove
2284+# my name from the file itself. (I assert my moral right of
2285+# paternity under the Copyright, Designs and Patents Act 1988.)
2286+# This file may have to be extensively modified
2287+#
2288+# Modified to be a prototype for debmake by Christoph Lameter <clameter@debian.org>
2289+SHELL=/bin/bash
2290+export DH_COMPAT=3
2291+
2292+package=openssl
2293+
2294+# For generating the manpages
2295+export VERSION=$(shell dpkg-parsechangelog | grep '^Version:' | sed -e 's/^.*://' -e 's/-.*//')
2296+
2297+# The binary architeture
2298+DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
2299+
2300+CONFARGS = --prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 zlib-dynamic debug
2301+OPT_alpha = ev4 ev5
2302+OPT_i386 = i486 i586 i686/cmov
2303+OPT_sparc = v8 v9
2304+ARCHOPTS = OPT_$(DEB_HOST_ARCH)
2305+OPTS = $($(ARCHOPTS))
2306+WANTED_LIBC_VERSION = 2.3.1-10
2307+
2308+build:
2309+ dh_testdir
2310+ perl util/perlpath.pl /usr/bin
2311+# perl util/ssldir.pl /usr/lib/ssl
2312+# chmod +x debian/libtool
2313+ ./Configure no-shared $(CONFARGS) debian-$(DEB_HOST_ARCH)
2314+ make -f Makefile DIRS="crypto ssl" all
2315+ mv libcrypto.a libcrypto.static
2316+ mv libssl.a libssl.static
2317+ make -f Makefile DIRS="crypto ssl" clean
2318+ test -z "$(OPTS)" || for opt in $(OPTS); \
2319+ do \
2320+ set -xe; \
2321+ ./Configure shared $(CONFARGS) debian-$(DEB_HOST_ARCH)-$$opt; \
2322+ make -f Makefile DIRS="crypto ssl" all; \
2323+ mkdir -p $$opt; \
2324+ mv libcrypto.so* libssl.so* $$opt/; \
2325+ make -f Makefile DIRS="crypto ssl" clean; \
2326+ done
2327+ ./Configure shared $(CONFARGS) debian-$(DEB_HOST_ARCH)
2328+ #make -f Makefile depend
2329+ ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
2330+# make -f Makefile linux-shared
2331+ make -f Makefile all
2332+# strip apps/openssl
2333+# make -f Makefile clean DIRS="crypto ssl"
2334+# ./Configure --prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 debian-$(DEB_HOST_ARCH)
2335+# make -f Makefile all DIRS="crypto ssl"
2336+ touch build
2337+
2338+clean:
2339+ dh_testdir
2340+ dh_testroot
2341+ -rm -f build
2342+ -perl util/perlpath.pl /usr/bin
2343+ -./Configure $(CONFARGS) debian-$(DEB_HOST_ARCH)
2344+ -make -f Makefile clean clean-shared
2345+ #-make -f Makefile dclean
2346+ -perl util/perlpath.pl /usr/local/bin/perl
2347+# perl util/ssldir.pl /usr/local/ssl
2348+ -rm -f test/.rnd test/testkey.pem test/testreq.pem test/certCA.srl
2349+ -rm -f util/mk1mf.bak Makefile.bak `find . -name Makefile.save`
2350+ -rm -f crypto/pem/ctx_size
2351+ -rm -f `find . -name "*~"`
2352+ -rm -f `find . -name "*.orig" -o -name "*.rej"`
2353+ -rm -f certs/*.0 certs/*.1
2354+# -rm -rf debian/tmp debian/files* core `find debian/* -type d`
2355+ -rm -rf core $(OPTS)
2356+ -rm doc/*.pod
2357+ -rm -f libcrypto.* libssl.*
2358+ dh_clean
2359+
2360+binary-indep: build
2361+ dh_testdir
2362+ dh_testroot
2363+# There are no architecture-independent files to be uploaded
2364+# generated by this package. If there were any they would be
2365+# made here.
2366+
2367+binary-arch: build
2368+ dh_testdir
2369+ dh_testroot
2370+ dh_clean
2371+# -rm -rf debian/tmp `find debian/* -type d`
2372+# install -d debian/tmp debian/libssl0.9.7 debian/libssl0.9.7-dev
2373+# cd debian/tmp && install -d `cat ../dirs`
2374+# cd debian/libssl09 && install -d `cat ../libssl09.dirs`
2375+# cd debian/libssl09-dev && install -d `cat ../libssl09-dev.dirs`
2376+ dh_installdirs
2377+#openssl install
2378+ make -f Makefile install INSTALL_PREFIX=`pwd`/debian/tmp
2379+ rm debian/tmp/usr/share/man/man1/openssl.1
2380+ rm debian/tmp/usr/share/man/man3/crypto.3
2381+ rm debian/tmp/usr/share/man/man3/ssl.3
2382+# rm debian/tmp/usr/lib/libcrypto.a
2383+# rm debian/tmp/usr/lib/libssl.a
2384+ mv debian/tmp/usr/lib/libcrypto.a debian/tmp/usr/lib/libcrypto_pic.a
2385+ mv debian/tmp/usr/lib/libssl.a debian/tmp/usr/lib/libssl_pic.a
2386+ cp -pf libcrypto.static debian/tmp/usr/lib/libcrypto.a
2387+ cp -pf libssl.static debian/tmp/usr/lib/libssl.a
2388+# mv debian/tmp/usr/lib/ssl/bin debian/tmp/usr/bin/ssl
2389+# (cd debian/tmp/usr/lib/ssl; ln -s /usr/bin/ssl bin)
2390+# mv debian/tmp/usr/lib/ssl/include debian/tmp/usr/include/ssl
2391+# (cd debian/tmp/usr/lib/ssl; ln -s /usr/include/ssl include)
2392+# chmod -x debian/tmp/usr/lib/*.so.*
2393+# mv debian/tmp/usr/lib/*.a debian/libssl09-dev/usr/lib/
2394+# mv debian/tmp/usr/lib/*.so debian/libssl09-dev/usr/lib/
2395+# mv debian/tmp/usr/lib/*.so.*.*.* debian/libssl09/usr/lib/
2396+# mv debian/tmp/usr/lib/*.la debian/libssl09-dev/usr/lib/
2397+# mv debian/tmp/usr/include debian/libssl09-dev/usr/
2398+ mkdir -p debian/tmp/etc/ssl
2399+ mv debian/tmp/usr/lib/ssl/{certs,openssl.cnf,private} debian/tmp/etc/ssl/
2400+ ln -s /etc/ssl/{certs,openssl.cnf,private} debian/tmp/usr/lib/ssl/
2401+ cp -auv lib*.so* debian/tmp/usr/lib/
2402+# cp -auv lib*.a debian/tmp/usr/lib/
2403+ for opt in $(OPTS); do set -xe; mkdir -p debian/tmp/usr/lib/$$opt; cp -auv $$opt/lib*.so* debian/tmp/usr/lib/$$opt/; done
2404+ install debian/copyright debian/libssl0.9.7/usr/share/doc/libssl0.9.7/
2405+ install debian/changelog debian/libssl0.9.7/usr/share/doc/libssl0.9.7/changelog.Debian
2406+# install debian/copyright debian/libssl0.9.7-dev/usr/share/doc/libssl0.9.7-dev/
2407+# install debian/changelog debian/libssl0.9.7-dev/usr/share/doc/libssl0.9.7-dev/changelog.Debian
2408+# debstd -u CHANGES* LICENSE README NEWS
2409+ dh_installdocs CHANGES.SSLeay LICENSE README NEWS debian/README.optimization
2410+ dh_installexamples
2411+ dh_installchangelogs CHANGES
2412+# dh_installmenu
2413+# dh_installcron
2414+ dh_installdebconf
2415+# dh_undocumented c_rehash.1
2416+ dh_movefiles
2417+# rmdir debian/tmp/usr/lib/ssl/lib
2418+# rmdir debian/tmp/usr/include/openssl
2419+# rmdir debian/tmp/usr/include
2420+# for opt in $(OPTS); do set -xe; rm -fr debian/tmp/usr/lib/$$opt; done
2421+ dh_compress
2422+ dh_fixperms -X etc/ssl/private
2423+ dh_strip --dbg-package=libssl0.9.7
2424+ dh_perl -d
2425+# dh_suidregister
2426+ dh_shlibdeps -l`pwd` -Xlibssl.so
2427+ # Hack, to depend on version of libc6 which supports the i686 directory
2428+ if [ "${DEB_HOST_ARCH}" == "i386" ]; \
2429+ then \
2430+ SHLIB=`cat debian/libssl0.9.7.substvars`; \
2431+ LIBC_VERSION=`echo $$SHLIB | sed s'/.*libc6 (>= \(.*\))/\1/'`; \
2432+ if dpkg --compare-versions ${WANTED_LIBC_VERSION} gt $$LIBC_VERSION; \
2433+ then \
2434+ echo $$SHLIB | sed s'/libc6 (>= \(.*\))/libc6 (>= ${WANTED_LIBC_VERSION})/' > debian/libssl0.9.7.substvars; \
2435+ fi \
2436+ fi
2437+ dh_gencontrol
2438+ dh_makeshlibs -m 0.9.7
2439+ dh_installdeb
2440+ dh_md5sums
2441+ dh_builddeb
2442+ echo -en "\a"
2443+
2444+# Below here is fairly generic really
2445+
2446+binary: binary-indep binary-arch
2447+
2448+source diff:
2449+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
2450+
2451+.PHONY: binary binary-arch binary-indep clean
2452--- openssl097-0.9.7g.orig/debian/libssl0.9.7.postinst
2453+++ openssl097-0.9.7g/debian/libssl0.9.7.postinst
2454@@ -0,0 +1,139 @@
2455+#!/bin/sh -e
2456+
2457+. /usr/share/debconf/confmodule
2458+
2459+package_name()
2460+{
2461+ echo $(basename $0 .postinst)
2462+}
2463+
2464+# element() is a helper function for file-rc:
2465+element() {
2466+ local element list IFS
2467+
2468+ element="$1"
2469+
2470+ [ "$2" = "in" ] && shift
2471+ list="$2"
2472+ [ "$list" = "-" ] && return 1
2473+ [ "$list" = "*" ] && return 0
2474+
2475+ IFS=","
2476+ set -- $list
2477+ case $element in
2478+ "$1"|"$2"|"$3"|"$4"|"$5"|"$6"|"$7"|"$8"|"$9")
2479+ return 0
2480+ esac
2481+ return 1
2482+}
2483+
2484+# filerc (runlevel, service) returns /etc/init.d/service, if service is
2485+# running in $runlevel:
2486+filerc() {
2487+ local runlevel basename
2488+ runlevel=$1
2489+ basename=$2
2490+ while read LINE
2491+ do
2492+ case $LINE in
2493+ \#*|"") continue
2494+ esac
2495+
2496+ set -- $LINE
2497+ SORT_NO="$1"; STOP="$2"; START="$3"; CMD="$4"
2498+ [ "$CMD" = "/etc/init.d/$basename" ] || continue
2499+
2500+ if element "$runlevel" in "$START" || element "S" in "$START"
2501+ then
2502+ echo "/etc/init.d/$basename"
2503+ return 0
2504+ fi
2505+ done < /etc/runlevel.conf
2506+ echo ""
2507+}
2508+
2509+if [ "$1" = "configure" ]
2510+then
2511+ if [ ! -z "$2" ]; then
2512+ if dpkg --compare-versions "$2" lt 0.9.7d-1; then
2513+ echo -n "Checking for services that may need to be restarted..."
2514+
2515+ check="sendmail ssh"
2516+ check="$check apache2-common ssh-nonfree exim4"
2517+ check="$check apache-ssl libapache-mod-ssl openvpn spamassassin"
2518+ check="$check courier-imap-ssl courier-mta-ssl courier-pop-ssl"
2519+ check="$check postfix-tls cyrus21-imapd cyrus21-pop3d"
2520+ check="$check postgresql racoon"
2521+ # Only get the ones that are installed, and configured
2522+ check=$(dpkg -s $check 2> /dev/null | sed '/^$/{N;/^\n$/D;}' | awk 'BEGIN{RS="\n\n";FS="\n"}{if ( $2 ~ /Status: .* installed$/ ) { print $1 } }' | cut -f 2 -d ' ')
2523+ # apache2 ships its init script in apache2-common, but the
2524+ # script is apache2
2525+ check=$(echo $check | sed 's/apache2-common/apache2/g')
2526+ # For mod-ssl apache has to be restarted
2527+ check=$(echo $check | sed 's/libapache-mod-ssl/apache/g')
2528+ rl=$(runlevel | awk '{print $2}')
2529+ for service in $check; do
2530+ if [ -f /usr/share/file-rc/rc -o -f /usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ]; then
2531+ idl=$(filerc $rl $service)
2532+ else
2533+ idl=$(ls /etc/rc${rl}.d/S??${service} 2> /dev/null | head -n 1)
2534+ fi
2535+ if [ -n "$idl" ] && [ -x $idl ]; then
2536+ services="$service $services"
2537+ fi
2538+ done
2539+ echo "done."
2540+ if [ -n "$services" ]; then
2541+ db_version 2.0
2542+
2543+ db_reset libssl0.9.7/restart-services
2544+ db_set libssl0.9.7/restart-services "$services"
2545+ db_input critical libssl0.9.7/restart-services || true
2546+ db_go || true
2547+ db_get libssl0.9.7/restart-services
2548+ # Arghhh, close all the stupid debconf pipes
2549+ db_stop
2550+
2551+ if [ "x$RET" != "x" ]
2552+ then
2553+ services=$RET
2554+ answer=yes
2555+ else
2556+ answer=no
2557+ fi
2558+ echo
2559+ if [ "$answer" = yes ] && [ "$services" != "" ]; then
2560+ echo "Restarting services possibly affected by the upgrade:"
2561+ failed=""
2562+ for service in $services; do
2563+ idl=$(ls /etc/rc${rl}.d/S??${service} 2> /dev/null | head -n 1)
2564+ echo -n " $service: stopping..."
2565+ $idl stop > /dev/null 2>&1 || true
2566+ sleep 1
2567+ echo -n "starting..."
2568+ if $idl start > /dev/null 2>&1; then
2569+ echo "done."
2570+ else
2571+ echo "FAILED! ($?)"
2572+ failed="$service $failed"
2573+ fi
2574+ done
2575+ echo
2576+ if [ -n "$failed" ]; then
2577+ # Ruh roh, George
2578+ echo "The following services failed to start: $failed"
2579+ echo
2580+ echo "You will need to start these manually by running \`/etc/init.d/<service> start'"
2581+ echo "If the service still fails to start, you may need to file a bug on"
2582+ echo "$(package_name) or the service involved."
2583+ else
2584+ echo "Services restarted successfully."
2585+ fi
2586+ echo
2587+ fi
2588+ fi
2589+ fi # end upgrading and $2 lt 0.9.7c-1
2590+ fi # Upgrading
2591+fi
2592+
2593+#DEBHELPER#
2594--- openssl097-0.9.7g.orig/debian/watch
2595+++ openssl097-0.9.7g/debian/watch
2596@@ -0,0 +1,2 @@
2597+version=2
2598+ftp://ftp.openssl.org/source/openssl-(\d+\.\d+\.\d+[a-z]?)\.tar\.gz debian uupdate
2599--- openssl097-0.9.7g.orig/debian/libssl0.9.7.preinst
2600+++ openssl097-0.9.7g/debian/libssl0.9.7.preinst
2601@@ -0,0 +1,3 @@
2602+#!/bin/sh -e
2603+
2604+#DEBHELPER#
2605--- openssl097-0.9.7g.orig/debian/libssl0.9.7.prerm
2606+++ openssl097-0.9.7g/debian/libssl0.9.7.prerm
2607@@ -0,0 +1,3 @@
2608+#!/bin/sh -e
2609+
2610+#DEBHELPER#
2611--- openssl097-0.9.7g.orig/debian/copyright
2612+++ openssl097-0.9.7g/debian/copyright
2613@@ -0,0 +1,135 @@
2614+This package was debianized by Christoph Martin martin@uni-mainz.de on
2615+Fri, 22 Nov 1996 21:29:51 +0100.
2616+
2617+Copyright (c) 1998-2004 The OpenSSL Project
2618+Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
2619+
2620+The upstream sources were obtained from http://www.openssl.org/
2621+
2622+
2623+ LICENSE ISSUES
2624+ ==============
2625+
2626+ The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
2627+ the OpenSSL License and the original SSLeay license apply to the toolkit.
2628+ See below for the actual license texts. Actually both licenses are BSD-style
2629+ Open Source licenses. In case of any license issues related to OpenSSL
2630+ please contact openssl-core@openssl.org.
2631+
2632+ OpenSSL License
2633+ ---------------
2634+
2635+/* ====================================================================
2636+ * Copyright (c) 1998-2004 The OpenSSL Project. All rights reserved.
2637+ *
2638+ * Redistribution and use in source and binary forms, with or without
2639+ * modification, are permitted provided that the following conditions
2640+ * are met:
2641+ *
2642+ * 1. Redistributions of source code must retain the above copyright
2643+ * notice, this list of conditions and the following disclaimer.
2644+ *
2645+ * 2. Redistributions in binary form must reproduce the above copyright
2646+ * notice, this list of conditions and the following disclaimer in
2647+ * the documentation and/or other materials provided with the
2648+ * distribution.
2649+ *
2650+ * 3. All advertising materials mentioning features or use of this
2651+ * software must display the following acknowledgment:
2652+ * "This product includes software developed by the OpenSSL Project
2653+ * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
2654+ *
2655+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
2656+ * endorse or promote products derived from this software without
2657+ * prior written permission. For written permission, please contact
2658+ * openssl-core@openssl.org.
2659+ *
2660+ * 5. Products derived from this software may not be called "OpenSSL"
2661+ * nor may "OpenSSL" appear in their names without prior written
2662+ * permission of the OpenSSL Project.
2663+ *
2664+ * 6. Redistributions of any form whatsoever must retain the following
2665+ * acknowledgment:
2666+ * "This product includes software developed by the OpenSSL Project
2667+ * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
2668+ *
2669+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
2670+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
2671+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
2672+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
2673+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
2674+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
2675+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
2676+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
2677+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
2678+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
2679+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
2680+ * OF THE POSSIBILITY OF SUCH DAMAGE.
2681+ * ====================================================================
2682+ *
2683+ * This product includes cryptographic software written by Eric Young
2684+ * (eay@cryptsoft.com). This product includes software written by Tim
2685+ * Hudson (tjh@cryptsoft.com).
2686+ *
2687+ */
2688+
2689+ Original SSLeay License
2690+ -----------------------
2691+
2692+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
2693+ * All rights reserved.
2694+ *
2695+ * This package is an SSL implementation written
2696+ * by Eric Young (eay@cryptsoft.com).
2697+ * The implementation was written so as to conform with Netscapes SSL.
2698+ *
2699+ * This library is free for commercial and non-commercial use as long as
2700+ * the following conditions are aheared to. The following conditions
2701+ * apply to all code found in this distribution, be it the RC4, RSA,
2702+ * lhash, DES, etc., code; not just the SSL code. The SSL documentation
2703+ * included with this distribution is covered by the same copyright terms
2704+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
2705+ *
2706+ * Copyright remains Eric Young's, and as such any Copyright notices in
2707+ * the code are not to be removed.
2708+ * If this package is used in a product, Eric Young should be given attribution
2709+ * as the author of the parts of the library used.
2710+ * This can be in the form of a textual message at program startup or
2711+ * in documentation (online or textual) provided with the package.
2712+ *
2713+ * Redistribution and use in source and binary forms, with or without
2714+ * modification, are permitted provided that the following conditions
2715+ * are met:
2716+ * 1. Redistributions of source code must retain the copyright
2717+ * notice, this list of conditions and the following disclaimer.
2718+ * 2. Redistributions in binary form must reproduce the above copyright
2719+ * notice, this list of conditions and the following disclaimer in the
2720+ * documentation and/or other materials provided with the distribution.
2721+ * 3. All advertising materials mentioning features or use of this software
2722+ * must display the following acknowledgement:
2723+ * "This product includes cryptographic software written by
2724+ * Eric Young (eay@cryptsoft.com)"
2725+ * The word 'cryptographic' can be left out if the rouines from the library
2726+ * being used are not cryptographic related :-).
2727+ * 4. If you include any Windows specific code (or a derivative thereof) from
2728+ * the apps directory (application code) you must include an acknowledgement:
2729+ * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
2730+ *
2731+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
2732+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
2733+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
2734+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
2735+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
2736+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
2737+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
2738+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
2739+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
2740+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
2741+ * SUCH DAMAGE.
2742+ *
2743+ * The licence and distribution terms for any publically available version or
2744+ * derivative of this code cannot be changed. i.e. this code cannot simply be
2745+ * copied and put under another distribution licence
2746+ * [including the GNU Public Licence.]
2747+ */
2748+
2749--- openssl097-0.9.7g.orig/debian/shlibs.local
2750+++ openssl097-0.9.7g/debian/shlibs.local
2751@@ -0,0 +1,2 @@
2752+libcrypto 0.9.7 libssl0.9.7
2753+libssl 0.9.7 libssl0.9.7
2754--- openssl097-0.9.7g.orig/debian/README.debian
2755+++ openssl097-0.9.7g/debian/README.debian
2756@@ -0,0 +1,52 @@
2757+openssl for DEBIAN
2758+----------------------
2759+
2760+openssl replaces ssleay.
2761+
2762+The application links to openssl like req, ca, verify and s_client
2763+have been removed.
2764+
2765+Instead of `<application>` please call now `openssl <application>`
2766+
2767+eg:
2768+instead of `req` please call `openssl req`
2769+
2770+NOTE: The libssl library version for debian-i386 is optimized for
2771+486-processors and better. It will not run on 386-processors.
2772+
2773+----
2774+Self-signed certs and webservers:
2775+
2776+If you get with a selfsigned certificate and a webserver:
2777+ > "The certificate is not approved for the attempted operation."
2778+
2779+Bodo_Moeller@public.uni-hamburg.de (Bodo Moeller) writes:
2780+>Probably you are using a CA certificate for your server; if you use
2781+>"openssl req" to generate a new key and self-signed certificate with
2782+>the default openssl.cnf, the certificate you get includes certain
2783+>X.509v3 extensions that make it unfit for use as a server certificate.
2784+>This was not so with earlier versions of the software because back
2785+>then there was far less X.509v3 support.
2786+>
2787+>To look at the certificate some HTTPS server presents to its cliens,
2788+>use "openssl s_client -port 443 -host your.server", store the output
2789+>(at least the part from "-----BEGIN CERTIFICATE-----" up to "-----END
2790+>CERTIFICATE-----", including these separators) in a file and use
2791+>"openssl x509 -in the_file_you_just_stored -text" to look at it in
2792+>readable form. If it has in the "X509v3 extensions section" any of
2793+>the following entries, it is not usable as a server certificate:
2794+>
2795+> X509v3 Basic Constraints:
2796+> CA:TRUE
2797+>
2798+> X509v3 Key Usage:
2799+> Certificate Sign, CRL Sign
2800+>
2801+>To quickly create a new server key and certificate that works with
2802+>Netscape, you can just copy the original openssl.cnf file and comment
2803+>out the "x509_extensions" entry in the "[ req ]" section.
2804+>The, use "openssl req ..." as before to create a new certificate and
2805+>key.
2806+
2807+
2808+Christoph Martin <martin@uni-mainz.de>, Wed, 31 Mar 1999 16:00:51 +0200
diff --git a/meta/packages/openssl/openssl-0.9.7g/gnueabi-arm.patch b/meta/packages/openssl/openssl-0.9.7g/gnueabi-arm.patch
deleted file mode 100644
index be0adbdea7..0000000000
--- a/meta/packages/openssl/openssl-0.9.7g/gnueabi-arm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- openssl-0.9.7e/Configure~gnueabi-arm 2006-03-19 21:04:31.000000000 +0100
7+++ openssl-0.9.7e/Configure 2006-03-19 21:07:22.000000000 +0100
8@@ -462,6 +462,7 @@
9 # Linux on ARM
10 "linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
11 "linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
12+"linux-gnueabi-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
13
14 # SCO/Caldera targets.
15 #
diff --git a/meta/packages/openssl/openssl-0.9.8g/configure-targets.patch b/meta/packages/openssl/openssl-0.9.8g/configure-targets.patch
new file mode 100644
index 0000000000..b68123a233
--- /dev/null
+++ b/meta/packages/openssl/openssl-0.9.8g/configure-targets.patch
@@ -0,0 +1,24 @@
1
2The number of colons are important :)
3
4Index: openssl-0.9.8g/Configure
5===================================================================
6--- openssl-0.9.8g.orig/Configure 2008-04-12 04:27:22.000000000 +0200
7+++ openssl-0.9.8g/Configure 2008-04-12 04:38:56.000000000 +0200
8@@ -395,6 +395,16 @@
9 "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}",
10 "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}",
11
12+ # Linux on ARM
13+"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)",
14+"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)",
15+"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)",
16+"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)",
17+"linux-uclibcgnueabi-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)",
18+"linux-uclibcgnueabi-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)",
19+
20+"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
21+
22 #### *BSD [do see comment about ${BSDthreads} above!]
23 "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)",
24 "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/packages/openssl/openssl-0.9.8g/debian.patch b/meta/packages/openssl/openssl-0.9.8g/debian.patch
new file mode 100644
index 0000000000..bf2e50b6ce
--- /dev/null
+++ b/meta/packages/openssl/openssl-0.9.8g/debian.patch
@@ -0,0 +1,1281 @@
1--- openssl-0.9.8g.orig/Makefile
2+++ openssl-0.9.8g/Makefile
3@@ -11,11 +11,11 @@
4 SHLIB_VERSION_HISTORY=
5 SHLIB_MAJOR=0
6 SHLIB_MINOR=9.8
7-SHLIB_EXT=
8-PLATFORM=dist
9-OPTIONS= no-camellia no-gmp no-krb5 no-mdc2 no-rc5 no-rfc3779 no-seed no-shared no-tlsext no-zlib no-zlib-dynamic
10-CONFIGURE_ARGS=dist
11-SHLIB_TARGET=
12+SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
13+PLATFORM=debian-amd64
14+OPTIONS=--prefix=/usr --openssldir=/usr/lib/ssl enable-zlib enable-tlsext no-camellia no-gmp no-idea no-krb5 no-mdc2 no-rc5 no-rfc3779 no-seed no-shared no-zlib-dynamic
15+CONFIGURE_ARGS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 zlib enable-tlsext debian-amd64
16+SHLIB_TARGET=linux-shared
17
18 # HERE indicates where this Makefile lives. This can be used to indicate
19 # where sub-Makefiles are expected to be. Currently has very limited usage,
20@@ -26,10 +26,10 @@
21 # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
22 # Normally it is left empty.
23 INSTALL_PREFIX=
24-INSTALLTOP=/usr/local/ssl
25+INSTALLTOP=/usr
26
27 # Do not edit this manually. Use Configure --openssldir=DIR do change this!
28-OPENSSLDIR=/usr/local/ssl
29+OPENSSLDIR=/usr/lib/ssl
30
31 # NO_IDEA - Define to build without the IDEA algorithm
32 # NO_RC4 - Define to build without the RC4 algorithm
33@@ -59,11 +59,11 @@
34 # equal 4.
35 # PKCS1_CHECK - pkcs1 tests.
36
37-CC= cc
38-CFLAG= -O
39-DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_TLSEXT
40+CC= gcc
41+CFLAG= -DZLIB -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int -DMD5_ASM
42+DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED
43 PEX_LIBS=
44-EX_LIBS=
45+EX_LIBS= -ldl -lz
46 EXE_EXT=
47 ARFLAGS=
48 AR=ar $(ARFLAGS) r
49@@ -71,7 +71,7 @@
50 PERL= /usr/bin/perl
51 TAR= tar
52 TARFLAGS= --no-recursion
53-MAKEDEPPROG=makedepend
54+MAKEDEPPROG= gcc
55
56 # We let the C compiler driver to take care of .s files. This is done in
57 # order to be excused from maintaining a separate set of architecture
58@@ -86,15 +86,15 @@
59 PROCESSOR=
60
61 # CPUID module collects small commonly used assembler snippets
62-CPUID_OBJ=
63-BN_ASM= bn_asm.o
64+CPUID_OBJ= x86_64cpuid.o
65+BN_ASM= x86_64-gcc.o
66 DES_ENC= des_enc.o fcrypt_b.o
67 AES_ASM_OBJ= aes_core.o aes_cbc.o
68 BF_ENC= bf_enc.o
69 CAST_ENC= c_enc.o
70 RC4_ENC= rc4_enc.o
71 RC5_ENC= rc5_enc.o
72-MD5_ASM_OBJ=
73+MD5_ASM_OBJ= md5-x86_64.o
74 SHA1_ASM_OBJ=
75 RMD160_ASM_OBJ=
76
77@@ -106,14 +106,14 @@
78 ZLIB_INCLUDE=
79 LIBZLIB=
80
81-DIRS= crypto ssl engines apps test tools
82+DIRS= crypto ssl engines apps tools
83 SHLIBDIRS= crypto ssl
84
85 # dirs in crypto to build
86 SDIRS= \
87 objects \
88 md2 md4 md5 sha hmac ripemd \
89- des aes rc2 rc4 idea bf cast \
90+ des aes rc2 rc4 bf cast \
91 bn ec rsa dsa ecdsa dh ecdh dso engine \
92 buffer bio stack lhash rand err \
93 evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
94@@ -127,10 +127,11 @@
95
96 MAKEFILE= Makefile
97
98-MANDIR=$(OPENSSLDIR)/man
99+MANDIR=/usr/share/man
100 MAN1=1
101 MAN3=3
102-MANSUFFIX=
103+MANSUFFIX=ssl
104+MANSECTION=SSL
105 SHELL=/bin/sh
106
107 TOP= .
108@@ -141,8 +142,8 @@
109 SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
110 SHARED_SSL=libssl$(SHLIB_EXT)
111 SHARED_LIBS=
112-SHARED_LIBS_LINK_EXTS=
113-SHARED_LDFLAGS=
114+SHARED_LIBS_LINK_EXTS=.so
115+SHARED_LDFLAGS=-m64 -Wl,--version-script=openssl.ld
116
117 GENERAL= Makefile
118 BASENAME= openssl
119@@ -310,7 +311,8 @@
120 echo 'Description: OpenSSL cryptography library'; \
121 echo 'Version: '$(VERSION); \
122 echo 'Requires: '; \
123- echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
124+ echo 'Libs: -L$${libdir} -lcrypto'; \
125+ echo 'Libs.private: $(EX_LIBS)'; \
126 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
127
128 libssl.pc: Makefile
129@@ -323,7 +325,8 @@
130 echo 'Description: Secure Sockets Layer and cryptography libraries'; \
131 echo 'Version: '$(VERSION); \
132 echo 'Requires: '; \
133- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
134+ echo 'Libs: -L$${libdir} -lssl'; \
135+ echo 'Libs.private: -lcrypto $(EX_LIBS)'; \
136 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
137
138 openssl.pc: Makefile
139@@ -336,7 +339,8 @@
140 echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
141 echo 'Version: '$(VERSION); \
142 echo 'Requires: '; \
143- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
144+ echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
145+ echo 'Libs.private: $(EX_LIBS)'; \
146 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
147
148 Makefile: Makefile.org Configure config
149@@ -480,7 +484,7 @@
150 install_sw:
151 @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
152 $(INSTALL_PREFIX)$(INSTALLTOP)/lib \
153- $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
154+ $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines \
155 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
156 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
157 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
158@@ -558,7 +562,7 @@
159 echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
160 (cd `$(PERL) util/dirname.pl $$i`; \
161 sh -c "$$pod2man \
162- --section=$$sec --center=OpenSSL \
163+ --section=$${sec}$(MANSECTION) --center=OpenSSL \
164 --release=$(VERSION) `basename $$i`") \
165 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
166 $(PERL) util/extract-names.pl < $$i | \
167@@ -575,7 +579,7 @@
168 echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
169 (cd `$(PERL) util/dirname.pl $$i`; \
170 sh -c "$$pod2man \
171- --section=$$sec --center=OpenSSL \
172+ --section=$${sec}$(MANSECTION) --center=OpenSSL \
173 --release=$(VERSION) `basename $$i`") \
174 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
175 $(PERL) util/extract-names.pl < $$i | \
176--- openssl-0.9.8g.orig/VMS/VMSify-conf.pl
177+++ openssl-0.9.8g/VMS/VMSify-conf.pl
178@@ -1,4 +1,4 @@
179-#! /usr/bin/perl
180+#!/usr/local/bin/perl
181
182 use strict;
183 use warnings;
184--- openssl-0.9.8g.orig/Netware/do_tests.pl
185+++ openssl-0.9.8g/Netware/do_tests.pl
186@@ -1,4 +1,4 @@
187-# perl script to run OpenSSL tests
188+#!/usr/local/bin/perl
189
190
191 my $base_path = "\\openssl";
192--- openssl-0.9.8g.orig/apps/CA.sh
193+++ openssl-0.9.8g/apps/CA.sh
194@@ -91,6 +91,7 @@
195 -out ${CATOP}/$CAREQ
196 $CA -out ${CATOP}/$CACERT $CADAYS -batch \
197 -keyfile ${CATOP}/private/$CAKEY -selfsign \
198+ -extensions v3_ca \
199 -infiles ${CATOP}/$CAREQ
200 RET=$?
201 fi
202--- openssl-0.9.8g.orig/apps/CA.pl.in
203+++ openssl-0.9.8g/apps/CA.pl.in
204@@ -65,6 +65,7 @@
205 foreach (@ARGV) {
206 if ( /^(-\?|-h|-help)$/ ) {
207 print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
208+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
209 exit 0;
210 } elsif (/^-newcert$/) {
211 # create a certificate
212@@ -165,6 +166,7 @@
213 } else {
214 print STDERR "Unknown arg $_\n";
215 print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
216+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
217 exit 1;
218 }
219 }
220--- openssl-0.9.8g.orig/apps/speed.c
221+++ openssl-0.9.8g/apps/speed.c
222@@ -577,7 +577,7 @@
223 #define MAX_BLOCK_SIZE 64
224 #endif
225 unsigned char DES_iv[8];
226- unsigned char iv[MAX_BLOCK_SIZE/8];
227+ unsigned char iv[2*MAX_BLOCK_SIZE/8];
228 #ifndef OPENSSL_NO_DES
229 DES_cblock *buf_as_des_cblock = NULL;
230 static DES_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};
231--- openssl-0.9.8g.orig/apps/CA.pl
232+++ openssl-0.9.8g/apps/CA.pl
233@@ -1,4 +1,4 @@
234-#!/usr/bin/perl
235+#!/usr/local/bin/perl
236 #
237 # CA - wrapper around ca to make it easier to use ... basically ca requires
238 # some setup stuff to be done before you can use it and this makes
239@@ -65,6 +65,7 @@
240 foreach (@ARGV) {
241 if ( /^(-\?|-h|-help)$/ ) {
242 print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
243+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
244 exit 0;
245 } elsif (/^-newcert$/) {
246 # create a certificate
247@@ -165,6 +166,7 @@
248 } else {
249 print STDERR "Unknown arg $_\n";
250 print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
251+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
252 exit 1;
253 }
254 }
255--- openssl-0.9.8g.orig/os2/backwardify.pl
256+++ openssl-0.9.8g/os2/backwardify.pl
257@@ -1,4 +1,4 @@
258-#!/usr/bin/perl -w
259+#!/usr/local/bin/perl
260 use strict;
261
262 # Use as $0
263--- openssl-0.9.8g.orig/Configure
264+++ openssl-0.9.8g/Configure
265@@ -1,4 +1,4 @@
266-:
267+#!/usr/local/bin/perl
268 eval 'exec perl -S $0 ${1+"$@"}'
269 if $running_under_some_shell;
270 ##
271@@ -118,7 +118,8 @@
272 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";
273 my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-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:rm86-out.o:r586-out.o";
274
275-my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::::md5-x86_64.o:::rc4-x86_64.o::";
276+#my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::::md5-x86_64.o:::rc4-x86_64.o::";
277+my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::::md5-x86_64.o:::::";
278 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::";
279
280 my $no_asm="::::::::::";
281@@ -308,6 +309,47 @@
282 "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared:::.so",
283 "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",
284
285+# Debian GNU/* (various architectures)
286+"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)",
287+"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)",
288+"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)",
289+"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)",
290+"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)",
291+"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)",
292+#"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)",
293+"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}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
294+"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)",
295+#"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)",
296+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
297+"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)",
298+"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
299+"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)",
300+#"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",
301+"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)",
302+"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)",
303+"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)",
304+"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)",
305+"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)",
306+"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)",
307+"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)",
308+"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)",
309+"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)",
310+"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)",
311+"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)",
312+"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)",
313+"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)",
314+"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)",
315+"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)",
316+"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)",
317+"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)",
318+"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)",
319+"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)",
320+"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)",
321+"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)",
322+"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)",
323+"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)",
324+"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:::md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
325+
326 ####
327 #### Variety of LINUX:-)
328 ####
329@@ -476,7 +518,7 @@
330 # Cygwin
331 "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",
332 "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
333-"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
334+-"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
335
336 # NetWare from David Ward (dsward@novell.com) - requires MetroWerks NLM development tools
337 # netware-clib => legacy CLib c-runtime support
338@@ -1300,6 +1342,8 @@
339 $shlib_minor=$2;
340 }
341
342+$shared_ldflag .= " -Wl,--version-script=openssl.ld";
343+
344 open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
345 unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
346 open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
347@@ -1371,7 +1415,8 @@
348 elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
349 {
350 my $sotmp = $1;
351- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
352+# s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
353+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
354 }
355 elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
356 {
357@@ -1490,7 +1535,7 @@
358 if (/^#define\s+OPENSSLDIR/)
359 { print OUT "#define OPENSSLDIR \"$openssldir\"\n"; }
360 elsif (/^#define\s+ENGINESDIR/)
361- { print OUT "#define ENGINESDIR \"$prefix/lib/engines\"\n"; }
362+ { print OUT "#define ENGINESDIR \"$prefix/lib/ssl/engines\"\n"; }
363 elsif (/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/)
364 { printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n"
365 if $export_var_as_fn;
366--- openssl-0.9.8g.orig/engines/Makefile
367+++ openssl-0.9.8g/engines/Makefile
368@@ -97,13 +97,13 @@
369 *DSO_DL*) sfx="sl";; \
370 *) sfx="bad";; \
371 esac; \
372- cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
373+ cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx.new; \
374 else \
375 sfx="so"; \
376 cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
377 fi; \
378- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
379- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx ); \
380+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx.new; \
381+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx ); \
382 done; \
383 fi
384
385--- openssl-0.9.8g.orig/engines/openssl.ld
386+++ openssl-0.9.8g/engines/openssl.ld
387@@ -0,0 +1,5 @@
388+OPENSSL_0.9.8 {
389+ global:
390+ *;
391+};
392+
393--- openssl-0.9.8g.orig/tools/c_rehash
394+++ openssl-0.9.8g/tools/c_rehash
395@@ -6,7 +6,7 @@
396
397 my $openssl;
398
399-my $dir = "/usr/local/ssl";
400+my $dir = "/usr/lib/ssl";
401
402 if(defined $ENV{OPENSSL}) {
403 $openssl = $ENV{OPENSSL};
404@@ -59,12 +59,15 @@
405 }
406 }
407 closedir DIR;
408- FILE: foreach $fname (grep {/\.pem$/} @flist) {
409+ FILE: foreach $fname (grep {/\.pem$|\.crt$/} @flist) {
410 # Check to see if certificates and/or CRLs present.
411 my ($cert, $crl) = check_file($fname);
412 if(!$cert && !$crl) {
413- print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
414- next;
415+ ($cert, $crl) = check_file("$openssl x509 -in \"$fname\" -inform der -outform pem | ");
416+ if(!$cert && !$crl) {
417+ print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
418+ next;
419+ }
420 }
421 link_hash_cert($fname) if($cert);
422 link_hash_crl($fname) if($crl);
423@@ -102,6 +105,9 @@
424 my $fname = $_[0];
425 $fname =~ s/'/'\\''/g;
426 my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname'`;
427+ if(!$hash || !fprint) {
428+ ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname' -inform der`;
429+ }
430 chomp $hash;
431 chomp $fprint;
432 $fprint =~ s/^.*=//;
433--- openssl-0.9.8g.orig/tools/c_rehash.in
434+++ openssl-0.9.8g/tools/c_rehash.in
435@@ -59,12 +59,15 @@
436 }
437 }
438 closedir DIR;
439- FILE: foreach $fname (grep {/\.pem$/} @flist) {
440+ FILE: foreach $fname (grep {/\.pem$|\.crt$/} @flist) {
441 # Check to see if certificates and/or CRLs present.
442 my ($cert, $crl) = check_file($fname);
443 if(!$cert && !$crl) {
444- print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
445- next;
446+ ($cert, $crl) = check_file("$openssl x509 -in \"$fname\" -inform der -outform pem | ");
447+ if(!$cert && !$crl) {
448+ print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
449+ next;
450+ }
451 }
452 link_hash_cert($fname) if($cert);
453 link_hash_crl($fname) if($crl);
454@@ -102,6 +105,9 @@
455 my $fname = $_[0];
456 $fname =~ s/'/'\\''/g;
457 my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname'`;
458+ if(!$hash || !fprint) {
459+ ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname' -inform der`;
460+ }
461 chomp $hash;
462 chomp $fprint;
463 $fprint =~ s/^.*=//;
464--- openssl-0.9.8g.orig/Makefile.shared
465+++ openssl-0.9.8g/Makefile.shared
466@@ -151,9 +151,9 @@
467 SHLIB_SUFFIX=; \
468 ALLSYMSFLAGS='-Wl,--whole-archive'; \
469 NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
470- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
471+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
472
473-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
474+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
475
476 #This is rather special. It's a special target with which one can link
477 #applications without bothering with any features that have anything to
478--- openssl-0.9.8g.orig/ssl/t1_lib.c
479+++ openssl-0.9.8g/ssl/t1_lib.c
480@@ -132,6 +132,10 @@
481 int extdatalen=0;
482 unsigned char *ret = p;
483
484+ /* don't add extensions for SSLv3 */
485+ if (s->client_version == SSL3_VERSION)
486+ return p;
487+
488 ret+=2;
489
490 if (ret>=limit) return NULL; /* this really never occurs, but ... */
491@@ -202,6 +206,10 @@
492 int extdatalen=0;
493 unsigned char *ret = p;
494
495+ /* don't add extensions for SSLv3 */
496+ if (s->version == SSL3_VERSION)
497+ return p;
498+
499 ret+=2;
500 if (ret>=limit) return NULL; /* this really never occurs, but ... */
501
502--- openssl-0.9.8g.orig/ms/uplink.pl
503+++ openssl-0.9.8g/ms/uplink.pl
504@@ -1,4 +1,4 @@
505-#!/usr/bin/env perl
506+#!/usr/local/bin/perl
507 #
508 # For Microsoft CL this is implemented as inline assembler. So that
509 # even though this script can generate even Win32 code, we'll be
510--- openssl-0.9.8g.orig/config
511+++ openssl-0.9.8g/config
512@@ -162,8 +162,8 @@
513 echo "${MACHINE}-whatever-linux1"; exit 0
514 ;;
515
516- GNU*)
517- echo "hurd-x86"; exit 0;
518+ GNU:*|GNU/*:*)
519+ echo "${MACHINE}-gnuish"; exit 0;
520 ;;
521
522 LynxOS:*)
523--- openssl-0.9.8g.orig/demos/tunala/configure.in
524+++ openssl-0.9.8g/demos/tunala/configure.in
525@@ -1,4 +1,4 @@
526-dnl Process this file with autoconf to produce a configure script.
527+#!/usr/local/bin/perl
528 AC_INIT(tunala.c)
529 AM_CONFIG_HEADER(config.h)
530 AM_INIT_AUTOMAKE(tunala, 0.0.1-dev)
531--- openssl-0.9.8g.orig/doc/Makefile
532+++ openssl-0.9.8g/doc/Makefile
533@@ -0,0 +1,40 @@
534+VERSION =
535+
536+#PODS = $(wildcard *.pod)
537+#MANS = $(addsuffix .man, $(basename $(PODS)))
538+
539+MANS = openssl.1 ssl.3 crypto.3
540+
541+P2M = pod2man --center='OpenSSL Documentation' --release="OpenSSL $(VERSION)"
542+
543+all: manpages
544+
545+.PHONY: manpages
546+
547+manpages: openssl.1 crypto.3 ssl.3
548+
549+openssl.1:
550+ $(P2M) --section=1 openssl.pod > openssl.1
551+
552+crypto.3:
553+ $(P2M) --section=3 crypto.pod > crypto.3
554+
555+ssl.3:
556+ $(P2M) --section=3 ssl.pod > ssl.3
557+
558+.PHONY: install
559+install:
560+ mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1
561+ mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
562+ install -m 644 -p openssl.1 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1
563+ install -m 644 -p crypto.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
564+ install -m 644 -p ssl.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
565+ rm -f $(MANS)
566+
567+.PHONY: clean
568+clean:
569+ rm -f $(MANS)
570+
571+.PHONY: realclean
572+realclean:
573+ -$(MAKE) clean
574--- openssl-0.9.8g.orig/doc/apps/c_rehash.pod
575+++ openssl-0.9.8g/doc/apps/c_rehash.pod
576@@ -0,0 +1,55 @@
577+
578+=pod
579+
580+=head1 NAME
581+
582+c_rehash - Create symbolic links to files named by the hash values
583+
584+=head1 SYNOPSIS
585+
586+B<c_rehash>
587+[directory] ...
588+
589+=head1 DESCRIPTION
590+
591+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.
592+
593+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.
594+
595+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.
596+
597+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.
598+
599+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.
600+
601+The program will also warn if there are files with extension .pem which are not certificate or CRL files.
602+
603+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 (=).
604+
605+=head1 OPTIONS
606+
607+None
608+
609+=head1 ENVIRONMENT
610+
611+=over 4
612+
613+=item B<OPENSSL>
614+
615+The name (and path) of an executable to use to generate hashes and fingerprints (see above).
616+
617+=item B<SSL_CERT_DIR>
618+
619+Colon separated list of directories to operate on. Ignored if directories are listed on the command line.
620+
621+=head1 SEE ALSO
622+
623+L<openssl(1)|openssl(1)>, L<x509(1)|x509(1)>
624+
625+=back
626+
627+=head1 BUGS
628+
629+No known bugs
630+
631+=cut
632--- openssl-0.9.8g.orig/Makefile.org
633+++ openssl-0.9.8g/Makefile.org
634@@ -104,7 +104,7 @@
635 ZLIB_INCLUDE=
636 LIBZLIB=
637
638-DIRS= crypto ssl engines apps test tools
639+DIRS= crypto ssl engines apps tools
640 SHLIBDIRS= crypto ssl
641
642 # dirs in crypto to build
643@@ -125,10 +125,11 @@
644
645 MAKEFILE= Makefile
646
647-MANDIR=$(OPENSSLDIR)/man
648+MANDIR=/usr/share/man
649 MAN1=1
650 MAN3=3
651-MANSUFFIX=
652+MANSUFFIX=ssl
653+MANSECTION=SSL
654 SHELL=/bin/sh
655
656 TOP= .
657@@ -308,7 +309,8 @@
658 echo 'Description: OpenSSL cryptography library'; \
659 echo 'Version: '$(VERSION); \
660 echo 'Requires: '; \
661- echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
662+ echo 'Libs: -L$${libdir} -lcrypto'; \
663+ echo 'Libs.private: $(EX_LIBS)'; \
664 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
665
666 libssl.pc: Makefile
667@@ -321,7 +323,8 @@
668 echo 'Description: Secure Sockets Layer and cryptography libraries'; \
669 echo 'Version: '$(VERSION); \
670 echo 'Requires: '; \
671- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
672+ echo 'Libs: -L$${libdir} -lssl'; \
673+ echo 'Libs.private: -lcrypto $(EX_LIBS)'; \
674 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
675
676 openssl.pc: Makefile
677@@ -334,7 +337,8 @@
678 echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
679 echo 'Version: '$(VERSION); \
680 echo 'Requires: '; \
681- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
682+ echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
683+ echo 'Libs.private: $(EX_LIBS)'; \
684 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
685
686 Makefile: Makefile.org Configure config
687@@ -478,7 +482,7 @@
688 install_sw:
689 @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
690 $(INSTALL_PREFIX)$(INSTALLTOP)/lib \
691- $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
692+ $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines \
693 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
694 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
695 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
696@@ -556,7 +560,7 @@
697 echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
698 (cd `$(PERL) util/dirname.pl $$i`; \
699 sh -c "$$pod2man \
700- --section=$$sec --center=OpenSSL \
701+ --section=$${sec}$(MANSECTION) --center=OpenSSL \
702 --release=$(VERSION) `basename $$i`") \
703 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
704 $(PERL) util/extract-names.pl < $$i | \
705@@ -573,7 +577,7 @@
706 echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
707 (cd `$(PERL) util/dirname.pl $$i`; \
708 sh -c "$$pod2man \
709- --section=$$sec --center=OpenSSL \
710+ --section=$${sec}$(MANSECTION) --center=OpenSSL \
711 --release=$(VERSION) `basename $$i`") \
712 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
713 $(PERL) util/extract-names.pl < $$i | \
714--- openssl-0.9.8g.orig/openssl.ld
715+++ openssl-0.9.8g/openssl.ld
716@@ -0,0 +1,5 @@
717+OPENSSL_0.9.8 {
718+ global:
719+ *;
720+};
721+
722--- openssl-0.9.8g.orig/crypto/md5/asm/md5-x86_64.pl
723+++ openssl-0.9.8g/crypto/md5/asm/md5-x86_64.pl
724@@ -1,4 +1,4 @@
725-#!/usr/bin/perl -w
726+#!/usr/local/bin/perl
727 #
728 # MD5 optimized for AMD64.
729 #
730--- openssl-0.9.8g.orig/crypto/md5/asm/md5-sparcv9.S
731+++ openssl-0.9.8g/crypto/md5/asm/md5-sparcv9.S
732@@ -74,14 +74,14 @@
733 #define Dval R8
734
735 #if defined(MD5_BLOCK_DATA_ORDER)
736-# if defined(OPENSSL_SYSNAME_ULTRASPARC)
737+/*# if defined(OPENSSL_SYSNAME_ULTRASPARC)*/
738 # define LOAD lda
739 # define X(i) [%i1+i*4]%asi
740 # define md5_block md5_block_asm_data_order_aligned
741 # define ASI_PRIMARY_LITTLE 0x88
742-# else
743+/*# else
744 # error "MD5_BLOCK_DATA_ORDER is supported only on UltraSPARC!"
745-# endif
746+# endif*/
747 #else
748 # define LOAD ld
749 # define X(i) [%i1+i*4]
750--- openssl-0.9.8g.orig/crypto/Makefile
751+++ openssl-0.9.8g/crypto/Makefile
752@@ -57,7 +57,7 @@
753 echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
754 echo '#endif' ) >buildinf.h
755
756-x86cpuid-elf.s: x86cpuid.pl perlasm/x86asm.pl
757+x86cpuid-elf.S: x86cpuid.pl perlasm/x86asm.pl
758 $(PERL) x86cpuid.pl elf $(CFLAGS) $(PROCESSOR) > $@
759 x86cpuid-cof.s: x86cpuid.pl perlasm/x86asm.pl
760 $(PERL) x86cpuid.pl coff $(CFLAGS) $(PROCESSOR) > $@
761@@ -70,7 +70,7 @@
762 uplink-cof.s: ../ms/uplink.pl
763 $(PERL) ../ms/uplink.pl coff > $@
764
765-x86_64cpuid.s: x86_64cpuid.pl
766+x86_64cpuid.S: x86_64cpuid.pl
767 $(PERL) x86_64cpuid.pl $@
768 ia64cpuid.s: ia64cpuid.S
769 $(CC) $(CFLAGS) -E ia64cpuid.S > $@
770--- openssl-0.9.8g.orig/crypto/sha/asm/sha1-ia64.pl
771+++ openssl-0.9.8g/crypto/sha/asm/sha1-ia64.pl
772@@ -1,4 +1,4 @@
773-#!/usr/bin/env perl
774+#!/usr/local/bin/perl
775 #
776 # ====================================================================
777 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
778--- openssl-0.9.8g.orig/crypto/sha/asm/sha512-sse2.pl
779+++ openssl-0.9.8g/crypto/sha/asm/sha512-sse2.pl
780@@ -1,4 +1,4 @@
781-#!/usr/bin/env perl
782+#!/usr/local/bin/perl
783 #
784 # ====================================================================
785 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
786--- openssl-0.9.8g.orig/crypto/sha/asm/sha512-ia64.pl
787+++ openssl-0.9.8g/crypto/sha/asm/sha512-ia64.pl
788@@ -1,4 +1,4 @@
789-#!/usr/bin/env perl
790+#!/usr/local/bin/perl
791 #
792 # ====================================================================
793 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
794--- openssl-0.9.8g.orig/crypto/sha/sha.h
795+++ openssl-0.9.8g/crypto/sha/sha.h
796@@ -59,6 +59,7 @@
797 #ifndef HEADER_SHA_H
798 #define HEADER_SHA_H
799
800+#include <stddef.h>
801 #include <openssl/e_os2.h>
802 #include <stddef.h>
803
804--- openssl-0.9.8g.orig/crypto/rand/md_rand.c
805+++ openssl-0.9.8g/crypto/rand/md_rand.c
806@@ -271,7 +271,10 @@
807 else
808 MD_Update(&m,&(state[st_idx]),j);
809
810+/*
811+ * Don't add uninitialised data.
812 MD_Update(&m,buf,j);
813+*/
814 MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c));
815 MD_Final(&m,local_md);
816 md_c[1]++;
817@@ -465,8 +468,10 @@
818 MD_Update(&m,local_md,MD_DIGEST_LENGTH);
819 MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c));
820 #ifndef PURIFY
821+#if 0 /* Don't add uninitialised data. */
822 MD_Update(&m,buf,j); /* purify complains */
823 #endif
824+#endif
825 k=(st_idx+MD_DIGEST_LENGTH/2)-st_num;
826 if (k > 0)
827 {
828--- openssl-0.9.8g.orig/crypto/des/asm/desboth.pl
829+++ openssl-0.9.8g/crypto/des/asm/desboth.pl
830@@ -16,6 +16,11 @@
831
832 &push("edi");
833
834+ &call (&label("pic_point0"));
835+ &set_label("pic_point0");
836+ &blindpop("ebp");
837+ &add ("ebp", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
838+
839 &comment("");
840 &comment("Load the data words");
841 &mov($L,&DWP(0,"ebx","",0));
842@@ -47,15 +52,21 @@
843 &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
844 &mov(&swtmp(1), "eax");
845 &mov(&swtmp(0), "ebx");
846- &call("DES_encrypt2");
847+ &exch("ebx", "ebp");
848+ &call("DES_encrypt2\@PLT");
849+ &exch("ebx", "ebp");
850 &mov(&swtmp(2), (DWC(($enc)?"0":"1")));
851 &mov(&swtmp(1), "edi");
852 &mov(&swtmp(0), "ebx");
853- &call("DES_encrypt2");
854+ &exch("ebx", "ebp");
855+ &call("DES_encrypt2\@PLT");
856+ &exch("ebx", "ebp");
857 &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
858 &mov(&swtmp(1), "esi");
859 &mov(&swtmp(0), "ebx");
860- &call("DES_encrypt2");
861+ &exch("ebx", "ebp");
862+ &call("DES_encrypt2\@PLT");
863+ &exch("ebx", "ebp");
864
865 &stack_pop(3);
866 &mov($L,&DWP(0,"ebx","",0));
867--- openssl-0.9.8g.orig/crypto/x86cpuid.pl
868+++ openssl-0.9.8g/crypto/x86cpuid.pl
869@@ -1,4 +1,4 @@
870-#!/usr/bin/env perl
871+#!/usr/local/bin/perl
872
873 push(@INC,"perlasm");
874 require "x86asm.pl";
875--- openssl-0.9.8g.orig/crypto/rc4/asm/rc4-x86_64.pl
876+++ openssl-0.9.8g/crypto/rc4/asm/rc4-x86_64.pl
877@@ -1,4 +1,4 @@
878-#!/usr/bin/env perl
879+#!/usr/local/bin/perl
880 #
881 # ====================================================================
882 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
883--- openssl-0.9.8g.orig/crypto/perlasm/x86unix.pl
884+++ openssl-0.9.8g/crypto/perlasm/x86unix.pl
885@@ -399,6 +399,29 @@
886 $stack=4;
887 }
888
889+sub main'function_begin_B_static
890+ {
891+ local($func,$extra)=@_;
892+
893+ &main'external_label($func);
894+ $func=$under.$func;
895+
896+ local($tmp)=<<"EOF";
897+.text
898+EOF
899+ push(@out,$tmp);
900+ if ($main'cpp)
901+ { push(@out,"TYPE($func,\@function)\n"); }
902+ elsif ($main'coff)
903+ { $tmp=push(@out,".def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
904+ elsif ($main'aout and !$main'pic)
905+ { }
906+ else { push(@out,".type $func,\@function\n"); }
907+ push(@out,".align\t$align\n");
908+ push(@out,"$func:\n");
909+ $stack=4;
910+ }
911+
912 sub main'function_end
913 {
914 local($func)=@_;
915@@ -730,7 +753,17 @@
916 {
917 $tmp=<<___;
918 .section .init
919+#ifdef OPENSSL_PIC
920+ pushl %ebx
921+ call .pic_point0
922+.pic_point0:
923+ popl %ebx
924+ addl \$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx
925+ call $under$f\@PLT
926+ popl %ebx
927+#else
928 call $under$f
929+#endif
930 jmp .Linitalign
931 .align $align
932 .Linitalign:
933--- openssl-0.9.8g.orig/crypto/perlasm/cbc.pl
934+++ openssl-0.9.8g/crypto/perlasm/cbc.pl
935@@ -122,7 +122,11 @@
936 &mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call
937 &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
938
939- &call($enc_func);
940+ &call (&label("pic_point0"));
941+ &set_label("pic_point0");
942+ &blindpop("ebx");
943+ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
944+ &call("$enc_func\@PLT");
945
946 &mov("eax", &DWP($data_off,"esp","",0));
947 &mov("ebx", &DWP($data_off+4,"esp","",0));
948@@ -187,7 +191,11 @@
949 &mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call
950 &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
951
952- &call($enc_func);
953+ &call (&label("pic_point1"));
954+ &set_label("pic_point1");
955+ &blindpop("ebx");
956+ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point1") . "]");
957+ &call("$enc_func\@PLT");
958
959 &mov("eax", &DWP($data_off,"esp","",0));
960 &mov("ebx", &DWP($data_off+4,"esp","",0));
961@@ -220,7 +228,11 @@
962 &mov(&DWP($data_off,"esp","",0), "eax"); # put back
963 &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
964
965- &call($dec_func);
966+ &call (&label("pic_point2"));
967+ &set_label("pic_point2");
968+ &blindpop("ebx");
969+ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point2") . "]");
970+ &call("$dec_func\@PLT");
971
972 &mov("eax", &DWP($data_off,"esp","",0)); # get return
973 &mov("ebx", &DWP($data_off+4,"esp","",0)); #
974@@ -263,7 +275,11 @@
975 &mov(&DWP($data_off,"esp","",0), "eax"); # put back
976 &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
977
978- &call($dec_func);
979+ &call (&label("pic_point3"));
980+ &set_label("pic_point3");
981+ &blindpop("ebx");
982+ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point3") . "]");
983+ &call("$dec_func\@PLT");
984
985 &mov("eax", &DWP($data_off,"esp","",0)); # get return
986 &mov("ebx", &DWP($data_off+4,"esp","",0)); #
987--- openssl-0.9.8g.orig/crypto/perlasm/x86_64-xlate.pl
988+++ openssl-0.9.8g/crypto/perlasm/x86_64-xlate.pl
989@@ -1,4 +1,4 @@
990-#!/usr/bin/env perl
991+#!/usr/local/bin/perl
992
993 # Ascetic x86_64 AT&T to MASM assembler translator by <appro>.
994 #
995--- openssl-0.9.8g.orig/crypto/opensslconf.h
996+++ openssl-0.9.8g/crypto/opensslconf.h
997@@ -10,6 +10,9 @@
998 #ifndef OPENSSL_NO_GMP
999 # define OPENSSL_NO_GMP
1000 #endif
1001+#ifndef OPENSSL_NO_IDEA
1002+# define OPENSSL_NO_IDEA
1003+#endif
1004 #ifndef OPENSSL_NO_KRB5
1005 # define OPENSSL_NO_KRB5
1006 #endif
1007@@ -25,11 +28,11 @@
1008 #ifndef OPENSSL_NO_SEED
1009 # define OPENSSL_NO_SEED
1010 #endif
1011-#ifndef OPENSSL_NO_TLSEXT
1012-# define OPENSSL_NO_TLSEXT
1013-#endif
1014
1015 #endif /* OPENSSL_DOING_MAKEDEPEND */
1016+#ifndef OPENSSL_THREADS
1017+# define OPENSSL_THREADS
1018+#endif
1019 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
1020 # define OPENSSL_NO_DYNAMIC_ENGINE
1021 #endif
1022@@ -45,6 +48,9 @@
1023 # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
1024 # define NO_GMP
1025 # endif
1026+# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
1027+# define NO_IDEA
1028+# endif
1029 # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
1030 # define NO_KRB5
1031 # endif
1032@@ -60,11 +66,10 @@
1033 # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
1034 # define NO_SEED
1035 # endif
1036-# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
1037-# define NO_TLSEXT
1038-# endif
1039 #endif
1040
1041+#define OPENSSL_CPUID_OBJ
1042+
1043 /* crypto/opensslconf.h.in */
1044
1045 /* Generate 80386 code? */
1046@@ -72,8 +77,8 @@
1047
1048 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
1049 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
1050-#define ENGINESDIR "/usr/local/ssl/lib/engines"
1051-#define OPENSSLDIR "/usr/local/ssl"
1052+#define ENGINESDIR "/usr/lib/ssl/engines"
1053+#define OPENSSLDIR "/usr/lib/ssl"
1054 #endif
1055 #endif
1056
1057@@ -104,14 +109,14 @@
1058 * - Intel P6 because partial register stalls are very expensive;
1059 * - elder Alpha because it lacks byte load/store instructions;
1060 */
1061-#define RC4_INT unsigned int
1062+#define RC4_INT unsigned char
1063 #endif
1064 #if !defined(RC4_CHUNK)
1065 /*
1066 * This enables code handling data aligned at natural CPU word
1067 * boundary. See crypto/rc4/rc4_enc.c for further details.
1068 */
1069-#undef RC4_CHUNK
1070+#define RC4_CHUNK unsigned long
1071 #endif
1072 #endif
1073
1074@@ -119,7 +124,7 @@
1075 /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
1076 * %20 speed up (longs are 8 bytes, int's are 4). */
1077 #ifndef DES_LONG
1078-#define DES_LONG unsigned long
1079+#define DES_LONG unsigned int
1080 #endif
1081 #endif
1082
1083@@ -133,9 +138,9 @@
1084 /* The prime number generation stuff may not work when
1085 * EIGHT_BIT but I don't care since I've only used this mode
1086 * for debuging the bignum libraries */
1087-#undef SIXTY_FOUR_BIT_LONG
1088+#define SIXTY_FOUR_BIT_LONG
1089 #undef SIXTY_FOUR_BIT
1090-#define THIRTY_TWO_BIT
1091+#undef THIRTY_TWO_BIT
1092 #undef SIXTEEN_BIT
1093 #undef EIGHT_BIT
1094 #endif
1095@@ -149,7 +154,7 @@
1096
1097 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
1098 #define CONFIG_HEADER_BF_LOCL_H
1099-#undef BF_PTR
1100+#define BF_PTR2
1101 #endif /* HEADER_BF_LOCL_H */
1102
1103 #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
1104@@ -179,7 +184,7 @@
1105 /* Unroll the inner loop, this sometimes helps, sometimes hinders.
1106 * Very mucy CPU dependant */
1107 #ifndef DES_UNROLL
1108-#undef DES_UNROLL
1109+#define DES_UNROLL
1110 #endif
1111
1112 /* These default values were supplied by
1113--- openssl-0.9.8g.orig/crypto/pkcs7/pk7_mime.c
1114+++ openssl-0.9.8g/crypto/pkcs7/pk7_mime.c
1115@@ -335,9 +335,9 @@
1116
1117 if(strcmp(hdr->value, "application/x-pkcs7-signature") &&
1118 strcmp(hdr->value, "application/pkcs7-signature")) {
1119- sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
1120 PKCS7err(PKCS7_F_SMIME_READ_PKCS7,PKCS7_R_SIG_INVALID_MIME_TYPE);
1121 ERR_add_error_data(2, "type: ", hdr->value);
1122+ sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
1123 sk_BIO_pop_free(parts, BIO_vfree);
1124 return NULL;
1125 }
1126--- openssl-0.9.8g.orig/crypto/bn/asm/ppc.pl
1127+++ openssl-0.9.8g/crypto/bn/asm/ppc.pl
1128@@ -1,4 +1,4 @@
1129-#!/usr/bin/env perl
1130+#!/usr/local/bin/perl
1131 #
1132 # Implemented as a Perl wrapper as we want to support several different
1133 # architectures with single file. We pick up the target based on the
1134--- openssl-0.9.8g.orig/crypto/x86_64cpuid.pl
1135+++ openssl-0.9.8g/crypto/x86_64cpuid.pl
1136@@ -1,4 +1,4 @@
1137-#!/usr/bin/env perl
1138+#!/usr/local/bin/perl
1139
1140 $output=shift;
1141 $win64a=1 if ($output =~ /win64a\.[s|asm]/);
1142@@ -134,5 +134,9 @@
1143 .size OPENSSL_ia32_cpuid,.-OPENSSL_ia32_cpuid
1144
1145 .section .init
1146+#ifdef OPENSSL_PIC
1147+ call OPENSSL_cpuid_setup\@PLT
1148+#else
1149 call OPENSSL_cpuid_setup
1150+#endif
1151 ___
1152--- openssl-0.9.8g.orig/crypto/aes/asm/aes-586.pl
1153+++ openssl-0.9.8g/crypto/aes/asm/aes-586.pl
1154@@ -1,4 +1,4 @@
1155-#!/usr/bin/env perl
1156+#!/usr/local/bin/perl
1157 #
1158 # ====================================================================
1159 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
1160@@ -250,7 +250,7 @@
1161 sub _data_word() { my $i; while(defined($i=shift)) { &data_word($i,$i); } }
1162
1163 &public_label("AES_Te");
1164-&function_begin_B("_x86_AES_encrypt");
1165+&function_begin_B_static("_x86_AES_encrypt");
1166 if ($vertical_spin) {
1167 # I need high parts of volatile registers to be accessible...
1168 &exch ($s1="edi",$key="ebx");
1169@@ -539,7 +539,7 @@
1170 }
1171
1172 &public_label("AES_Td");
1173-&function_begin_B("_x86_AES_decrypt");
1174+&function_begin_B_static("_x86_AES_decrypt");
1175 # note that caller is expected to allocate stack frame for me!
1176 &mov (&DWP(12,"esp"),$key); # save key
1177
1178@@ -1460,15 +1460,22 @@
1179 &public_label("AES_Td");
1180 &public_label("AES_Te");
1181 &function_begin_B("AES_set_decrypt_key");
1182+ &push ("ebx");
1183 &mov ("eax",&wparam(0));
1184 &mov ("ecx",&wparam(1));
1185 &mov ("edx",&wparam(2));
1186 &sub ("esp",12);
1187+
1188+ &call (&label("pic_point0"));
1189+ &set_label("pic_point0");
1190+ &blindpop("ebx");
1191+ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
1192 &mov (&DWP(0,"esp"),"eax");
1193 &mov (&DWP(4,"esp"),"ecx");
1194 &mov (&DWP(8,"esp"),"edx");
1195- &call ("AES_set_encrypt_key");
1196+ &call ("AES_set_encrypt_key\@PLT");
1197 &add ("esp",12);
1198+ &pop ("ebx");
1199 &cmp ("eax",0);
1200 &je (&label("proceed"));
1201 &ret ();
1202--- openssl-0.9.8g.orig/crypto/asn1/charmap.pl
1203+++ openssl-0.9.8g/crypto/asn1/charmap.pl
1204@@ -1,4 +1,4 @@
1205-#!/usr/local/bin/perl -w
1206+#!/usr/local/bin/perl
1207
1208 use strict;
1209
1210--- openssl-0.9.8g.orig/util/mkerr.pl
1211+++ openssl-0.9.8g/util/mkerr.pl
1212@@ -1,4 +1,4 @@
1213-#!/usr/local/bin/perl -w
1214+#!/usr/local/bin/perl
1215
1216 my $config = "crypto/err/openssl.ec";
1217 my $debug = 0;
1218--- openssl-0.9.8g.orig/util/clean-depend.pl
1219+++ openssl-0.9.8g/util/clean-depend.pl
1220@@ -1,4 +1,4 @@
1221-#!/usr/local/bin/perl -w
1222+#!/usr/local/bin/perl
1223 # Clean the dependency list in a makefile of standard includes...
1224 # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
1225
1226--- openssl-0.9.8g.orig/util/extract-names.pl
1227+++ openssl-0.9.8g/util/extract-names.pl
1228@@ -1,4 +1,4 @@
1229-#!/usr/bin/perl
1230+#!/usr/local/bin/perl
1231
1232 $/ = ""; # Eat a paragraph at once.
1233 while(<STDIN>) {
1234--- openssl-0.9.8g.orig/util/pod2man.pl
1235+++ openssl-0.9.8g/util/pod2man.pl
1236@@ -1,4 +1,4 @@
1237-: #!/usr/bin/perl-5.005
1238+#!/usr/local/bin/perl
1239 eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
1240 if $running_under_some_shell;
1241
1242--- openssl-0.9.8g.orig/util/mkstack.pl
1243+++ openssl-0.9.8g/util/mkstack.pl
1244@@ -1,4 +1,4 @@
1245-#!/usr/local/bin/perl -w
1246+#!/usr/local/bin/perl
1247
1248 # This is a utility that searches out "DECLARE_STACK_OF()"
1249 # declarations in .h and .c files, and updates/creates/replaces
1250--- openssl-0.9.8g.orig/util/selftest.pl
1251+++ openssl-0.9.8g/util/selftest.pl
1252@@ -1,4 +1,4 @@
1253-#!/usr/local/bin/perl -w
1254+#!/usr/local/bin/perl
1255 #
1256 # Run the test suite and generate a report
1257 #
1258--- openssl-0.9.8g.orig/util/extract-section.pl
1259+++ openssl-0.9.8g/util/extract-section.pl
1260@@ -1,4 +1,4 @@
1261-#!/usr/bin/perl
1262+#!/usr/local/bin/perl
1263
1264 while(<STDIN>) {
1265 if (/=for\s+comment\s+openssl_manual_section:(\S+)/)
1266--- openssl-0.9.8g.orig/util/pl/netware.pl
1267+++ openssl-0.9.8g/util/pl/netware.pl
1268@@ -1,4 +1,4 @@
1269-# Metrowerks Codewarrior for NetWare
1270+#!/usr/local/bin/perl
1271 #
1272
1273 # The import files and other misc imports needed to link
1274--- openssl-0.9.8g.orig/util/mkdef.pl
1275+++ openssl-0.9.8g/util/mkdef.pl
1276@@ -1,4 +1,4 @@
1277-#!/usr/local/bin/perl -w
1278+#!/usr/local/bin/perl
1279 #
1280 # generate a .def file
1281 #
diff --git a/meta/packages/openssl/openssl-0.9.8g/shared-libs.patch b/meta/packages/openssl/openssl-0.9.8g/shared-libs.patch
new file mode 100644
index 0000000000..db98582443
--- /dev/null
+++ b/meta/packages/openssl/openssl-0.9.8g/shared-libs.patch
@@ -0,0 +1,45 @@
1diff -urN openssl-0.9.8g.orig/crypto/Makefile openssl-0.9.8g/crypto/Makefile
2--- openssl-0.9.8g.orig/crypto/Makefile 2006-02-04 02:48:41.000000000 +0100
3+++ openssl-0.9.8g/crypto/Makefile 2008-05-12 15:17:03.000000000 +0200
4@@ -103,7 +103,7 @@
5
6 shared: buildinf.h lib subdirs
7 if [ -n "$(SHARED_LIBS)" ]; then \
8- (cd ..; $(MAKE) $(SHARED_LIB)); \
9+ (cd ..; $(MAKE) -e $(SHARED_LIB)); \
10 fi
11
12 libs:
13diff -urN openssl-0.9.8g.orig/Makefile.org openssl-0.9.8g/Makefile.org
14--- openssl-0.9.8g.orig/Makefile.org 2007-04-24 01:49:54.000000000 +0200
15+++ openssl-0.9.8g/Makefile.org 2008-05-12 15:16:34.000000000 +0200
16@@ -246,7 +246,7 @@
17
18 libcrypto$(SHLIB_EXT): libcrypto.a
19 @if [ "$(SHLIB_TARGET)" != "" ]; then \
20- $(MAKE) SHLIBDIRS=crypto build-shared; \
21+ $(MAKE) -e SHLIBDIRS=crypto build-shared; \
22 else \
23 echo "There's no support for shared libraries on this platform" >&2; \
24 exit 1; \
25@@ -254,7 +254,7 @@
26
27 libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
28 @if [ "$(SHLIB_TARGET)" != "" ]; then \
29- $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
30+ $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
31 else \
32 echo "There's no support for shared libraries on this platform" >&2; \
33 exit 1; \
34diff -urN openssl-0.9.8g.orig/ssl/Makefile openssl-0.9.8g/ssl/Makefile
35--- openssl-0.9.8g.orig/ssl/Makefile 2007-10-11 16:36:59.000000000 +0200
36+++ openssl-0.9.8g/ssl/Makefile 2008-05-12 15:17:26.000000000 +0200
37@@ -62,7 +62,7 @@
38
39 shared: lib
40 if [ -n "$(SHARED_LIBS)" ]; then \
41- (cd ..; $(MAKE) $(SHARED_LIB)); \
42+ (cd ..; $(MAKE) -e $(SHARED_LIB)); \
43 fi
44
45 files:
diff --git a/meta/packages/openssl/openssl-native_0.9.7g.bb b/meta/packages/openssl/openssl-native_0.9.8g.bb
index dd4ba1a5ef..e491cc0e18 100644
--- a/meta/packages/openssl/openssl-native_0.9.7g.bb
+++ b/meta/packages/openssl/openssl-native_0.9.8g.bb
@@ -2,11 +2,11 @@ inherit pkgconfig native
2 2
3require openssl.inc 3require openssl.inc
4 4
5PR = "r0"
6
7SRC_URI += "file://debian.patch;patch=1 \ 5SRC_URI += "file://debian.patch;patch=1 \
8 file://armeb.patch;patch=1;pnum=0 \ 6 file://configure-targets.patch;patch=1 \
9 file://gnueabi-arm.patch;patch=1" 7 file://shared-libs.patch;patch=1"
8
9PARALLEL_MAKE = ""
10 10
11FILESPATH = "${@base_set_filespath( ['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" 11FILESPATH = "${@base_set_filespath( ['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
12 12
diff --git a/meta/packages/openssl/openssl.inc b/meta/packages/openssl/openssl.inc
index c621371574..b77fda9a5b 100644
--- a/meta/packages/openssl/openssl.inc
+++ b/meta/packages/openssl/openssl.inc
@@ -7,11 +7,12 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz"
7S = "${WORKDIR}/openssl-${PV}" 7S = "${WORKDIR}/openssl-${PV}"
8 8
9AR_append = " r" 9AR_append = " r"
10export CFLAG = "-fPIC -DTHREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DTERMIO -Wall ${FULL_OPTIMIZATION}" 10CFLAG = "${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
11 -DTERMIO ${FULL_OPTIMIZATION} -Wall"
11 12
12# -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom 13# -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom
13export CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}" 14CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}"
14export CFLAG_mtx-2 := "${@'${CFLAG}'.replace('-O2', '')}" 15CFLAG_mtx-2 := "${@'${CFLAG}'.replace('-O2', '')}"
15 16
16export DIRS = "crypto ssl apps" 17export DIRS = "crypto ssl apps"
17export EX_LIBS = "-lgcc -ldl" 18export EX_LIBS = "-lgcc -ldl"
@@ -21,15 +22,12 @@ PACKAGES =+ "libcrypto libssl"
21FILES_libcrypto = "${libdir}/libcrypto.so.*" 22FILES_libcrypto = "${libdir}/libcrypto.so.*"
22FILES_libssl = "${libdir}/libssl.so.*" 23FILES_libssl = "${libdir}/libssl.so.*"
23 24
24do_compile () { 25do_configure () {
25 cd util 26 cd util
26 perl perlpath.pl ${bindir} 27 perl perlpath.pl ${bindir}
27 cd .. 28 cd ..
28 ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/ 29 ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
29 30
30 # Additional flag based on target endiness (see siteinfo.bbclass)
31 CFLAG="${CFLAG} ${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)}"
32
33 os=${HOST_OS} 31 os=${HOST_OS}
34 if [ "x$os" = "xlinux-uclibc" ]; then 32 if [ "x$os" = "xlinux-uclibc" ]; then
35 os=linux 33 os=linux
@@ -49,27 +47,35 @@ do_compile () {
49 target=debian-sh4 47 target=debian-sh4
50 ;; 48 ;;
51 linux-i486) 49 linux-i486)
52 target=linux-pentium 50 target=debian-i386-i486
53 ;; 51 ;;
54 linux-i586) 52 linux-i586)
55 target=linux-pentium 53 target=debian-i386-i586
56 ;; 54 ;;
57 linux-i686) 55 linux-i686)
58 target=linux-ppro 56 target=debian-i386-i686/cmov
59 ;; 57 ;;
60 linux-powerpc) 58 linux-powerpc)
61 target=linux-ppc 59 target=linux-ppc
62 ;; 60 ;;
61 linux-supersparc)
62 target=linux-sparcv8
63 ;;
64 linux-sparc)
65 target=linux-sparcv8
66 ;;
63 esac 67 esac
68 # inject machine-specific flags
69 sed -i -e "s|^\(\"$target\",\s*\"[^:]\+\):\([^:]\+\)|\1:${CFLAG}|g" Configure
64 perl ./Configure shared --prefix=${prefix} --openssldir=${libdir}/ssl $target 70 perl ./Configure shared --prefix=${prefix} --openssldir=${libdir}/ssl $target
71}
72
73do_compile () {
65 oe_runmake 74 oe_runmake
66} 75}
67 76
68do_stage () { 77do_stage () {
69 install -d ${STAGING_INCDIR}
70 install -d ${STAGING_LIBDIR}/pkgconfig/
71 cp --dereference -R include/openssl ${STAGING_INCDIR}/ 78 cp --dereference -R include/openssl ${STAGING_INCDIR}/
72 cp --dereference openssl.pc ${STAGING_LIBDIR}/pkgconfig/
73 oe_libinstall -a -so libcrypto ${STAGING_LIBDIR} 79 oe_libinstall -a -so libcrypto ${STAGING_LIBDIR}
74 oe_libinstall -a -so libssl ${STAGING_LIBDIR} 80 oe_libinstall -a -so libssl ${STAGING_LIBDIR}
75} 81}
diff --git a/meta/packages/openssl/openssl_0.9.7e.bb b/meta/packages/openssl/openssl_0.9.7e.bb
deleted file mode 100644
index d9b8d91cdc..0000000000
--- a/meta/packages/openssl/openssl_0.9.7e.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require openssl.inc
2
3PR = "r4"
4
5SRC_URI += "file://debian.patch;patch=1 \
6 file://armeb.patch;patch=1 \
7 file://gnueabi-arm.patch;patch=1"
diff --git a/meta/packages/openssl/openssl_0.9.7g.bb b/meta/packages/openssl/openssl_0.9.7g.bb
deleted file mode 100644
index cc9162c1cf..0000000000
--- a/meta/packages/openssl/openssl_0.9.7g.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1inherit pkgconfig
2
3require openssl.inc
4
5PR = "r3"
6
7SRC_URI += "file://debian.patch;patch=1 \
8 file://armeb.patch;patch=1;pnum=0 \
9 file://gnueabi-arm.patch;patch=1"
diff --git a/meta/packages/openssl/openssl_0.9.8g.bb b/meta/packages/openssl/openssl_0.9.8g.bb
new file mode 100644
index 0000000000..ed99d264f4
--- /dev/null
+++ b/meta/packages/openssl/openssl_0.9.8g.bb
@@ -0,0 +1,11 @@
1inherit pkgconfig
2
3require openssl.inc
4
5PR = "r8"
6
7SRC_URI += "file://debian.patch;patch=1 \
8 file://configure-targets.patch;patch=1 \
9 file://shared-libs.patch;patch=1"
10
11PARALLEL_MAKE = ""
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 02:52:12 +0000