summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/openssl/openssl-0.9.8g/debian.patch775
-rw-r--r--meta/packages/openssl/openssl-native_0.9.8g.bb6
-rw-r--r--meta/packages/openssl/openssl.inc6
-rw-r--r--meta/packages/openssl/openssl_0.9.8g.bb2
4 files changed, 400 insertions, 389 deletions
diff --git a/meta/packages/openssl/openssl-0.9.8g/debian.patch b/meta/packages/openssl/openssl-0.9.8g/debian.patch
index bf2e50b6ce..b7d571a7fd 100644
--- a/meta/packages/openssl/openssl-0.9.8g/debian.patch
+++ b/meta/packages/openssl/openssl-0.9.8g/debian.patch
@@ -173,93 +173,6 @@
173 --release=$(VERSION) `basename $$i`") \ 173 --release=$(VERSION) `basename $$i`") \
174 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ 174 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
175 $(PERL) util/extract-names.pl < $$i | \ 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 176--- openssl-0.9.8g.orig/Configure
264+++ openssl-0.9.8g/Configure 177+++ openssl-0.9.8g/Configure
265@@ -1,4 +1,4 @@ 178@@ -1,4 +1,4 @@
@@ -363,6 +276,220 @@
363 elsif (/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/) 276 elsif (/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/)
364 { printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n" 277 { printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n"
365 if $export_var_as_fn; 278 if $export_var_as_fn;
279--- openssl-0.9.8g.orig/Makefile.shared
280+++ openssl-0.9.8g/Makefile.shared
281@@ -151,9 +151,9 @@
282 SHLIB_SUFFIX=; \
283 ALLSYMSFLAGS='-Wl,--whole-archive'; \
284 NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
285- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
286+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
287
288-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
289+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
290
291 #This is rather special. It's a special target with which one can link
292 #applications without bothering with any features that have anything to
293--- openssl-0.9.8g.orig/config
294+++ openssl-0.9.8g/config
295@@ -162,8 +162,8 @@
296 echo "${MACHINE}-whatever-linux1"; exit 0
297 ;;
298
299- GNU*)
300- echo "hurd-x86"; exit 0;
301+ GNU:*|GNU/*:*)
302+ echo "${MACHINE}-gnuish"; exit 0;
303 ;;
304
305 LynxOS:*)
306--- openssl-0.9.8g.orig/Makefile.org
307+++ openssl-0.9.8g/Makefile.org
308@@ -104,7 +104,7 @@
309 ZLIB_INCLUDE=
310 LIBZLIB=
311
312-DIRS= crypto ssl engines apps test tools
313+DIRS= crypto ssl engines apps tools
314 SHLIBDIRS= crypto ssl
315
316 # dirs in crypto to build
317@@ -125,10 +125,11 @@
318
319 MAKEFILE= Makefile
320
321-MANDIR=$(OPENSSLDIR)/man
322+MANDIR=/usr/share/man
323 MAN1=1
324 MAN3=3
325-MANSUFFIX=
326+MANSUFFIX=ssl
327+MANSECTION=SSL
328 SHELL=/bin/sh
329
330 TOP= .
331@@ -308,7 +309,8 @@
332 echo 'Description: OpenSSL cryptography library'; \
333 echo 'Version: '$(VERSION); \
334 echo 'Requires: '; \
335- echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
336+ echo 'Libs: -L$${libdir} -lcrypto'; \
337+ echo 'Libs.private: $(EX_LIBS)'; \
338 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
339
340 libssl.pc: Makefile
341@@ -321,7 +323,8 @@
342 echo 'Description: Secure Sockets Layer and cryptography libraries'; \
343 echo 'Version: '$(VERSION); \
344 echo 'Requires: '; \
345- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
346+ echo 'Libs: -L$${libdir} -lssl'; \
347+ echo 'Libs.private: -lcrypto $(EX_LIBS)'; \
348 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
349
350 openssl.pc: Makefile
351@@ -334,7 +337,8 @@
352 echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
353 echo 'Version: '$(VERSION); \
354 echo 'Requires: '; \
355- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
356+ echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
357+ echo 'Libs.private: $(EX_LIBS)'; \
358 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
359
360 Makefile: Makefile.org Configure config
361@@ -478,7 +482,7 @@
362 install_sw:
363 @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
364 $(INSTALL_PREFIX)$(INSTALLTOP)/lib \
365- $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
366+ $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines \
367 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
368 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
369 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
370@@ -556,7 +560,7 @@
371 echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
372 (cd `$(PERL) util/dirname.pl $$i`; \
373 sh -c "$$pod2man \
374- --section=$$sec --center=OpenSSL \
375+ --section=$${sec}$(MANSECTION) --center=OpenSSL \
376 --release=$(VERSION) `basename $$i`") \
377 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
378 $(PERL) util/extract-names.pl < $$i | \
379@@ -573,7 +577,7 @@
380 echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
381 (cd `$(PERL) util/dirname.pl $$i`; \
382 sh -c "$$pod2man \
383- --section=$$sec --center=OpenSSL \
384+ --section=$${sec}$(MANSECTION) --center=OpenSSL \
385 --release=$(VERSION) `basename $$i`") \
386 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
387 $(PERL) util/extract-names.pl < $$i | \
388--- openssl-0.9.8g.orig/openssl.ld
389+++ openssl-0.9.8g/openssl.ld
390@@ -0,0 +1,5 @@
391+OPENSSL_0.9.8 {
392+ global:
393+ *;
394+};
395+
396--- openssl-0.9.8g.orig/VMS/VMSify-conf.pl
397+++ openssl-0.9.8g/VMS/VMSify-conf.pl
398@@ -1,4 +1,4 @@
399-#! /usr/bin/perl
400+#!/usr/local/bin/perl
401
402 use strict;
403 use warnings;
404--- openssl-0.9.8g.orig/Netware/do_tests.pl
405+++ openssl-0.9.8g/Netware/do_tests.pl
406@@ -1,4 +1,4 @@
407-# perl script to run OpenSSL tests
408+#!/usr/local/bin/perl
409
410
411 my $base_path = "\\openssl";
412--- openssl-0.9.8g.orig/apps/s_time.c
413+++ openssl-0.9.8g/apps/s_time.c
414@@ -117,6 +117,7 @@
415
416 /* The following if from times(3) man page. It may need to be changed
417 */
418+#undef HZ
419 #ifndef HZ
420 # ifdef _SC_CLK_TCK
421 # define HZ ((double)sysconf(_SC_CLK_TCK))
422--- openssl-0.9.8g.orig/apps/CA.sh
423+++ openssl-0.9.8g/apps/CA.sh
424@@ -91,6 +91,7 @@
425 -out ${CATOP}/$CAREQ
426 $CA -out ${CATOP}/$CACERT $CADAYS -batch \
427 -keyfile ${CATOP}/private/$CAKEY -selfsign \
428+ -extensions v3_ca \
429 -infiles ${CATOP}/$CAREQ
430 RET=$?
431 fi
432--- openssl-0.9.8g.orig/apps/CA.pl.in
433+++ openssl-0.9.8g/apps/CA.pl.in
434@@ -65,6 +65,7 @@
435 foreach (@ARGV) {
436 if ( /^(-\?|-h|-help)$/ ) {
437 print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
438+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
439 exit 0;
440 } elsif (/^-newcert$/) {
441 # create a certificate
442@@ -165,6 +166,7 @@
443 } else {
444 print STDERR "Unknown arg $_\n";
445 print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
446+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
447 exit 1;
448 }
449 }
450--- openssl-0.9.8g.orig/apps/speed.c
451+++ openssl-0.9.8g/apps/speed.c
452@@ -577,7 +577,7 @@
453 #define MAX_BLOCK_SIZE 64
454 #endif
455 unsigned char DES_iv[8];
456- unsigned char iv[MAX_BLOCK_SIZE/8];
457+ unsigned char iv[2*MAX_BLOCK_SIZE/8];
458 #ifndef OPENSSL_NO_DES
459 DES_cblock *buf_as_des_cblock = NULL;
460 static DES_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};
461--- openssl-0.9.8g.orig/apps/CA.pl
462+++ openssl-0.9.8g/apps/CA.pl
463@@ -1,4 +1,4 @@
464-#!/usr/bin/perl
465+#!/usr/local/bin/perl
466 #
467 # CA - wrapper around ca to make it easier to use ... basically ca requires
468 # some setup stuff to be done before you can use it and this makes
469@@ -65,6 +65,7 @@
470 foreach (@ARGV) {
471 if ( /^(-\?|-h|-help)$/ ) {
472 print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
473+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
474 exit 0;
475 } elsif (/^-newcert$/) {
476 # create a certificate
477@@ -165,6 +166,7 @@
478 } else {
479 print STDERR "Unknown arg $_\n";
480 print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
481+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
482 exit 1;
483 }
484 }
485--- openssl-0.9.8g.orig/os2/backwardify.pl
486+++ openssl-0.9.8g/os2/backwardify.pl
487@@ -1,4 +1,4 @@
488-#!/usr/bin/perl -w
489+#!/usr/local/bin/perl
490 use strict;
491
492 # Use as $0
366--- openssl-0.9.8g.orig/engines/Makefile 493--- openssl-0.9.8g.orig/engines/Makefile
367+++ openssl-0.9.8g/engines/Makefile 494+++ openssl-0.9.8g/engines/Makefile
368@@ -97,13 +97,13 @@ 495@@ -97,13 +97,13 @@
@@ -461,20 +588,6 @@
461 chomp $hash; 588 chomp $hash;
462 chomp $fprint; 589 chomp $fprint;
463 $fprint =~ s/^.*=//; 590 $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 591--- openssl-0.9.8g.orig/ssl/t1_lib.c
479+++ openssl-0.9.8g/ssl/t1_lib.c 592+++ openssl-0.9.8g/ssl/t1_lib.c
480@@ -132,6 +132,10 @@ 593@@ -132,6 +132,10 @@
@@ -507,19 +620,6 @@
507 # 620 #
508 # For Microsoft CL this is implemented as inline assembler. So that 621 # For Microsoft CL this is implemented as inline assembler. So that
509 # even though this script can generate even Win32 code, we'll be 622 # 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 623--- openssl-0.9.8g.orig/demos/tunala/configure.in
524+++ openssl-0.9.8g/demos/tunala/configure.in 624+++ openssl-0.9.8g/demos/tunala/configure.in
525@@ -1,4 +1,4 @@ 625@@ -1,4 +1,4 @@
@@ -629,96 +729,170 @@
629+No known bugs 729+No known bugs
630+ 730+
631+=cut 731+=cut
632--- openssl-0.9.8g.orig/Makefile.org 732--- openssl-0.9.8g.orig/crypto/Makefile
633+++ openssl-0.9.8g/Makefile.org 733+++ openssl-0.9.8g/crypto/Makefile
634@@ -104,7 +104,7 @@ 734@@ -57,7 +57,7 @@
635 ZLIB_INCLUDE= 735 echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
636 LIBZLIB= 736 echo '#endif' ) >buildinf.h
637 737
638-DIRS= crypto ssl engines apps test tools 738-x86cpuid-elf.s: x86cpuid.pl perlasm/x86asm.pl
639+DIRS= crypto ssl engines apps tools 739+x86cpuid-elf.S: x86cpuid.pl perlasm/x86asm.pl
640 SHLIBDIRS= crypto ssl 740 $(PERL) x86cpuid.pl elf $(CFLAGS) $(PROCESSOR) > $@
741 x86cpuid-cof.s: x86cpuid.pl perlasm/x86asm.pl
742 $(PERL) x86cpuid.pl coff $(CFLAGS) $(PROCESSOR) > $@
743@@ -70,7 +70,7 @@
744 uplink-cof.s: ../ms/uplink.pl
745 $(PERL) ../ms/uplink.pl coff > $@
641 746
642 # dirs in crypto to build 747-x86_64cpuid.s: x86_64cpuid.pl
643@@ -125,10 +125,11 @@ 748+x86_64cpuid.S: x86_64cpuid.pl
749 $(PERL) x86_64cpuid.pl $@
750 ia64cpuid.s: ia64cpuid.S
751 $(CC) $(CFLAGS) -E ia64cpuid.S > $@
752--- openssl-0.9.8g.orig/crypto/x86cpuid.pl
753+++ openssl-0.9.8g/crypto/x86cpuid.pl
754@@ -1,4 +1,4 @@
755-#!/usr/bin/env perl
756+#!/usr/local/bin/perl
644 757
645 MAKEFILE= Makefile 758 push(@INC,"perlasm");
759 require "x86asm.pl";
760--- openssl-0.9.8g.orig/crypto/opensslconf.h
761+++ openssl-0.9.8g/crypto/opensslconf.h
762@@ -10,6 +10,9 @@
763 #ifndef OPENSSL_NO_GMP
764 # define OPENSSL_NO_GMP
765 #endif
766+#ifndef OPENSSL_NO_IDEA
767+# define OPENSSL_NO_IDEA
768+#endif
769 #ifndef OPENSSL_NO_KRB5
770 # define OPENSSL_NO_KRB5
771 #endif
772@@ -25,11 +28,11 @@
773 #ifndef OPENSSL_NO_SEED
774 # define OPENSSL_NO_SEED
775 #endif
776-#ifndef OPENSSL_NO_TLSEXT
777-# define OPENSSL_NO_TLSEXT
778-#endif
646 779
647-MANDIR=$(OPENSSLDIR)/man 780 #endif /* OPENSSL_DOING_MAKEDEPEND */
648+MANDIR=/usr/share/man 781+#ifndef OPENSSL_THREADS
649 MAN1=1 782+# define OPENSSL_THREADS
650 MAN3=3 783+#endif
651-MANSUFFIX= 784 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
652+MANSUFFIX=ssl 785 # define OPENSSL_NO_DYNAMIC_ENGINE
653+MANSECTION=SSL 786 #endif
654 SHELL=/bin/sh 787@@ -45,6 +48,9 @@
788 # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
789 # define NO_GMP
790 # endif
791+# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
792+# define NO_IDEA
793+# endif
794 # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
795 # define NO_KRB5
796 # endif
797@@ -60,11 +66,10 @@
798 # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
799 # define NO_SEED
800 # endif
801-# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
802-# define NO_TLSEXT
803-# endif
804 #endif
655 805
656 TOP= . 806+#define OPENSSL_CPUID_OBJ
657@@ -308,7 +309,8 @@ 807+
658 echo 'Description: OpenSSL cryptography library'; \ 808 /* crypto/opensslconf.h.in */
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 809
666 libssl.pc: Makefile 810 /* Generate 80386 code? */
667@@ -321,7 +323,8 @@ 811@@ -72,8 +77,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 812
676 openssl.pc: Makefile 813 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
677@@ -334,7 +337,8 @@ 814 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
678 echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \ 815-#define ENGINESDIR "/usr/local/ssl/lib/engines"
679 echo 'Version: '$(VERSION); \ 816-#define OPENSSLDIR "/usr/local/ssl"
680 echo 'Requires: '; \ 817+#define ENGINESDIR "/usr/lib/ssl/engines"
681- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ 818+#define OPENSSLDIR "/usr/lib/ssl"
682+ echo 'Libs: -L$${libdir} -lssl -lcrypto'; \ 819 #endif
683+ echo 'Libs.private: $(EX_LIBS)'; \ 820 #endif
684 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
685 821
686 Makefile: Makefile.org Configure config 822@@ -104,14 +109,14 @@
687@@ -478,7 +482,7 @@ 823 * - Intel P6 because partial register stalls are very expensive;
688 install_sw: 824 * - elder Alpha because it lacks byte load/store instructions;
689 @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ 825 */
690 $(INSTALL_PREFIX)$(INSTALLTOP)/lib \ 826-#define RC4_INT unsigned int
691- $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \ 827+#define RC4_INT unsigned char
692+ $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines \ 828 #endif
693 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \ 829 #if !defined(RC4_CHUNK)
694 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ 830 /*
695 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ 831 * This enables code handling data aligned at natural CPU word
696@@ -556,7 +560,7 @@ 832 * boundary. See crypto/rc4/rc4_enc.c for further details.
697 echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ 833 */
698 (cd `$(PERL) util/dirname.pl $$i`; \ 834-#undef RC4_CHUNK
699 sh -c "$$pod2man \ 835+#define RC4_CHUNK unsigned long
700- --section=$$sec --center=OpenSSL \ 836 #endif
701+ --section=$${sec}$(MANSECTION) --center=OpenSSL \ 837 #endif
702 --release=$(VERSION) `basename $$i`") \ 838
703 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ 839@@ -119,7 +124,7 @@
704 $(PERL) util/extract-names.pl < $$i | \ 840 /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
705@@ -573,7 +577,7 @@ 841 * %20 speed up (longs are 8 bytes, int's are 4). */
706 echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ 842 #ifndef DES_LONG
707 (cd `$(PERL) util/dirname.pl $$i`; \ 843-#define DES_LONG unsigned long
708 sh -c "$$pod2man \ 844+#define DES_LONG unsigned int
709- --section=$$sec --center=OpenSSL \ 845 #endif
710+ --section=$${sec}$(MANSECTION) --center=OpenSSL \ 846 #endif
711 --release=$(VERSION) `basename $$i`") \ 847
712 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ 848@@ -133,9 +138,9 @@
713 $(PERL) util/extract-names.pl < $$i | \ 849 /* The prime number generation stuff may not work when
714--- openssl-0.9.8g.orig/openssl.ld 850 * EIGHT_BIT but I don't care since I've only used this mode
715+++ openssl-0.9.8g/openssl.ld 851 * for debuging the bignum libraries */
716@@ -0,0 +1,5 @@ 852-#undef SIXTY_FOUR_BIT_LONG
717+OPENSSL_0.9.8 { 853+#define SIXTY_FOUR_BIT_LONG
718+ global: 854 #undef SIXTY_FOUR_BIT
719+ *; 855-#define THIRTY_TWO_BIT
720+}; 856+#undef THIRTY_TWO_BIT
721+ 857 #undef SIXTEEN_BIT
858 #undef EIGHT_BIT
859 #endif
860@@ -149,7 +154,7 @@
861
862 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
863 #define CONFIG_HEADER_BF_LOCL_H
864-#undef BF_PTR
865+#define BF_PTR2
866 #endif /* HEADER_BF_LOCL_H */
867
868 #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
869@@ -179,7 +184,7 @@
870 /* Unroll the inner loop, this sometimes helps, sometimes hinders.
871 * Very mucy CPU dependant */
872 #ifndef DES_UNROLL
873-#undef DES_UNROLL
874+#define DES_UNROLL
875 #endif
876
877 /* These default values were supplied by
878--- openssl-0.9.8g.orig/crypto/x86_64cpuid.pl
879+++ openssl-0.9.8g/crypto/x86_64cpuid.pl
880@@ -1,4 +1,4 @@
881-#!/usr/bin/env perl
882+#!/usr/local/bin/perl
883
884 $output=shift;
885 $win64a=1 if ($output =~ /win64a\.[s|asm]/);
886@@ -134,5 +134,9 @@
887 .size OPENSSL_ia32_cpuid,.-OPENSSL_ia32_cpuid
888
889 .section .init
890+#ifdef OPENSSL_PIC
891+ call OPENSSL_cpuid_setup\@PLT
892+#else
893 call OPENSSL_cpuid_setup
894+#endif
895 ___
722--- openssl-0.9.8g.orig/crypto/md5/asm/md5-x86_64.pl 896--- openssl-0.9.8g.orig/crypto/md5/asm/md5-x86_64.pl
723+++ openssl-0.9.8g/crypto/md5/asm/md5-x86_64.pl 897+++ openssl-0.9.8g/crypto/md5/asm/md5-x86_64.pl
724@@ -1,4 +1,4 @@ 898@@ -1,4 +1,4 @@
@@ -747,26 +921,16 @@
747 #else 921 #else
748 # define LOAD ld 922 # define LOAD ld
749 # define X(i) [%i1+i*4] 923 # define X(i) [%i1+i*4]
750--- openssl-0.9.8g.orig/crypto/Makefile 924--- openssl-0.9.8g.orig/crypto/sha/sha.h
751+++ openssl-0.9.8g/crypto/Makefile 925+++ openssl-0.9.8g/crypto/sha/sha.h
752@@ -57,7 +57,7 @@ 926@@ -59,6 +59,7 @@
753 echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \ 927 #ifndef HEADER_SHA_H
754 echo '#endif' ) >buildinf.h 928 #define HEADER_SHA_H
755 929
756-x86cpuid-elf.s: x86cpuid.pl perlasm/x86asm.pl 930+#include <stddef.h>
757+x86cpuid-elf.S: x86cpuid.pl perlasm/x86asm.pl 931 #include <openssl/e_os2.h>
758 $(PERL) x86cpuid.pl elf $(CFLAGS) $(PROCESSOR) > $@ 932 #include <stddef.h>
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 933
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 934--- openssl-0.9.8g.orig/crypto/sha/asm/sha1-ia64.pl
771+++ openssl-0.9.8g/crypto/sha/asm/sha1-ia64.pl 935+++ openssl-0.9.8g/crypto/sha/asm/sha1-ia64.pl
772@@ -1,4 +1,4 @@ 936@@ -1,4 +1,4 @@
@@ -791,30 +955,9 @@
791 # 955 #
792 # ==================================================================== 956 # ====================================================================
793 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL 957 # 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 958--- openssl-0.9.8g.orig/crypto/rand/md_rand.c
805+++ openssl-0.9.8g/crypto/rand/md_rand.c 959+++ openssl-0.9.8g/crypto/rand/md_rand.c
806@@ -271,7 +271,10 @@ 960@@ -465,8 +465,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); 961 MD_Update(&m,local_md,MD_DIGEST_LENGTH);
819 MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c)); 962 MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c));
820 #ifndef PURIFY 963 #ifndef PURIFY
@@ -864,14 +1007,6 @@
864 1007
865 &stack_pop(3); 1008 &stack_pop(3);
866 &mov($L,&DWP(0,"ebx","",0)); 1009 &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 1010--- openssl-0.9.8g.orig/crypto/rc4/asm/rc4-x86_64.pl
876+++ openssl-0.9.8g/crypto/rc4/asm/rc4-x86_64.pl 1011+++ openssl-0.9.8g/crypto/rc4/asm/rc4-x86_64.pl
877@@ -1,4 +1,4 @@ 1012@@ -1,4 +1,4 @@
@@ -992,124 +1127,6 @@
992 1127
993 # Ascetic x86_64 AT&T to MASM assembler translator by <appro>. 1128 # Ascetic x86_64 AT&T to MASM assembler translator by <appro>.
994 # 1129 #
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 1130--- openssl-0.9.8g.orig/crypto/pkcs7/pk7_mime.c
1114+++ openssl-0.9.8g/crypto/pkcs7/pk7_mime.c 1131+++ openssl-0.9.8g/crypto/pkcs7/pk7_mime.c
1115@@ -335,9 +335,9 @@ 1132@@ -335,9 +335,9 @@
@@ -1131,24 +1148,6 @@
1131 # 1148 #
1132 # Implemented as a Perl wrapper as we want to support several different 1149 # 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 1150 # 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 1151--- openssl-0.9.8g.orig/crypto/aes/asm/aes-586.pl
1153+++ openssl-0.9.8g/crypto/aes/asm/aes-586.pl 1152+++ openssl-0.9.8g/crypto/aes/asm/aes-586.pl
1154@@ -1,4 +1,4 @@ 1153@@ -1,4 +1,4 @@
@@ -1263,14 +1262,6 @@
1263 1262
1264 while(<STDIN>) { 1263 while(<STDIN>) {
1265 if (/=for\s+comment\s+openssl_manual_section:(\S+)/) 1264 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 1265--- openssl-0.9.8g.orig/util/mkdef.pl
1275+++ openssl-0.9.8g/util/mkdef.pl 1266+++ openssl-0.9.8g/util/mkdef.pl
1276@@ -1,4 +1,4 @@ 1267@@ -1,4 +1,4 @@
@@ -1279,3 +1270,11 @@
1279 # 1270 #
1280 # generate a .def file 1271 # generate a .def file
1281 # 1272 #
1273--- openssl-0.9.8g.orig/util/pl/netware.pl
1274+++ openssl-0.9.8g/util/pl/netware.pl
1275@@ -1,4 +1,4 @@
1276-# Metrowerks Codewarrior for NetWare
1277+#!/usr/local/bin/perl
1278 #
1279
1280 # The import files and other misc imports needed to link
diff --git a/meta/packages/openssl/openssl-native_0.9.8g.bb b/meta/packages/openssl/openssl-native_0.9.8g.bb
index e491cc0e18..4a017d3fac 100644
--- a/meta/packages/openssl/openssl-native_0.9.8g.bb
+++ b/meta/packages/openssl/openssl-native_0.9.8g.bb
@@ -2,6 +2,12 @@ inherit pkgconfig native
2 2
3require openssl.inc 3require openssl.inc
4 4
5PR = "r1"
6
7# This flag can contain target options (e.g -mfpu=neon for armv7-a systems)
8export FULL_OPTIMIZATION = " "
9export BUILD_OPTIMIZATION = " "
10
5SRC_URI += "file://debian.patch;patch=1 \ 11SRC_URI += "file://debian.patch;patch=1 \
6 file://configure-targets.patch;patch=1 \ 12 file://configure-targets.patch;patch=1 \
7 file://shared-libs.patch;patch=1" 13 file://shared-libs.patch;patch=1"
diff --git a/meta/packages/openssl/openssl.inc b/meta/packages/openssl/openssl.inc
index b77fda9a5b..2ec1d91e7a 100644
--- a/meta/packages/openssl/openssl.inc
+++ b/meta/packages/openssl/openssl.inc
@@ -55,6 +55,12 @@ do_configure () {
55 linux-i686) 55 linux-i686)
56 target=debian-i386-i686/cmov 56 target=debian-i386-i686/cmov
57 ;; 57 ;;
58 linux-mips)
59 target=debian-mips
60 ;;
61 linux-mipsel)
62 target=debian-mipsel
63 ;;
58 linux-powerpc) 64 linux-powerpc)
59 target=linux-ppc 65 target=linux-ppc
60 ;; 66 ;;
diff --git a/meta/packages/openssl/openssl_0.9.8g.bb b/meta/packages/openssl/openssl_0.9.8g.bb
index ed99d264f4..1cb360f967 100644
--- a/meta/packages/openssl/openssl_0.9.8g.bb
+++ b/meta/packages/openssl/openssl_0.9.8g.bb
@@ -2,7 +2,7 @@ inherit pkgconfig
2 2
3require openssl.inc 3require openssl.inc
4 4
5PR = "r8" 5PR = "r9"
6 6
7SRC_URI += "file://debian.patch;patch=1 \ 7SRC_URI += "file://debian.patch;patch=1 \
8 file://configure-targets.patch;patch=1 \ 8 file://configure-targets.patch;patch=1 \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 02:52:28 +0000