diff options
Diffstat (limited to 'package/openssl/patches')
| -rw-r--r-- | package/openssl/patches/110-optimize-for-size.patch | 7 | ||||
| -rw-r--r-- | package/openssl/patches/120-makedepend.patch | 9 | ||||
| -rw-r--r-- | package/openssl/patches/130-perl-path.patch | 56 | ||||
| -rw-r--r-- | package/openssl/patches/140-makefile-dirs.patch | 12 | ||||
| -rw-r--r-- | package/openssl/patches/150-no_engines.patch | 16 | ||||
| -rw-r--r-- | package/openssl/patches/160-disable_doc_tests.patch | 28 | ||||
| -rw-r--r-- | package/openssl/patches/170-bash_path.patch | 6 |
7 files changed, 76 insertions, 58 deletions
diff --git a/package/openssl/patches/110-optimize-for-size.patch b/package/openssl/patches/110-optimize-for-size.patch index 8c78b6a..e0a1952 100644 --- a/package/openssl/patches/110-optimize-for-size.patch +++ b/package/openssl/patches/110-optimize-for-size.patch @@ -1,6 +1,7 @@ -diff -ur openssl-0.9.8a/Configure openssl-0.9.8a-owrt/Configure ---- openssl-0.9.8a/Configure 2005-08-02 12:59:42.000000000 +0200 -+++ openssl-0.9.8a-owrt/Configure 2006-03-23 14:16:35.000000000 +0100 +Index: openssl-0.9.8e/Configure +=================================================================== +--- openssl-0.9.8e.orig/Configure 2007-06-04 13:23:32.150846224 +0200 ++++ openssl-0.9.8e/Configure 2007-06-04 13:23:32.217836040 +0200 @@ -353,6 +353,8 @@ "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "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}", diff --git a/package/openssl/patches/120-makedepend.patch b/package/openssl/patches/120-makedepend.patch index c802fe4..d256dd8 100644 --- a/package/openssl/patches/120-makedepend.patch +++ b/package/openssl/patches/120-makedepend.patch @@ -1,12 +1,13 @@ -diff -ruN openssl-0.9.7g-old/util/domd openssl-0.9.7g-new/util/domd ---- openssl-0.9.7g-old/util/domd 2004-05-11 14:46:18.000000000 +0200 -+++ openssl-0.9.7g-new/util/domd 2005-05-30 20:20:04.000000000 +0200 +Index: openssl-0.9.8e/util/domd +=================================================================== +--- openssl-0.9.8e.orig/util/domd 2007-06-04 13:23:32.130849264 +0200 ++++ openssl-0.9.8e/util/domd 2007-06-04 13:23:32.408807008 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Do a makedepend, only leave out the standard headers # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999 - + @@ -14,7 +14,8 @@ cp Makefile Makefile.save # fake the presence of Kerberos diff --git a/package/openssl/patches/130-perl-path.patch b/package/openssl/patches/130-perl-path.patch index 42467b8..3edc796 100644 --- a/package/openssl/patches/130-perl-path.patch +++ b/package/openssl/patches/130-perl-path.patch @@ -1,69 +1,77 @@ -diff -Nur openssl-0.9.7f/Configure openssl-0.9.7f.new/Configure ---- openssl-0.9.7f/Configure 2005-03-12 12:28:21.000000000 +0100 -+++ openssl-0.9.7f.new/Configure 2005-04-03 20:32:00.000000000 +0200 +Index: openssl-0.9.8e/Configure +=================================================================== +--- openssl-0.9.8e.orig/Configure 2007-06-04 13:23:32.217836040 +0200 ++++ openssl-0.9.8e/Configure 2007-06-04 13:23:32.598778128 +0200 @@ -1,4 +1,4 @@ -: +#!/usr/bin/perl eval 'exec perl -S $0 ${1+"$@"}' if $running_under_some_shell; ## -diff -Nur openssl-0.9.7f/tools/c_rehash.in openssl-0.9.7f.new/tools/c_rehash.in ---- openssl-0.9.7f/tools/c_rehash.in 2002-10-11 22:35:45.000000000 +0200 -+++ openssl-0.9.7f.new/tools/c_rehash.in 2005-04-03 20:41:17.000000000 +0200 +Index: openssl-0.9.8e/tools/c_rehash.in +=================================================================== +--- openssl-0.9.8e.orig/tools/c_rehash.in 2007-06-04 13:23:32.074857776 +0200 ++++ openssl-0.9.8e/tools/c_rehash.in 2007-06-04 13:23:32.598778128 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # Perl c_rehash script, scan all files in a directory -diff -Nur openssl-0.9.7f/util/clean-depend.pl openssl-0.9.7f.new/util/clean-depend.pl ---- openssl-0.9.7f/util/clean-depend.pl 2001-10-10 10:27:28.000000000 +0200 -+++ openssl-0.9.7f.new/util/clean-depend.pl 2005-04-03 20:41:38.000000000 +0200 +Index: openssl-0.9.8e/util/clean-depend.pl +=================================================================== +--- openssl-0.9.8e.orig/util/clean-depend.pl 2007-06-04 13:23:32.080856864 +0200 ++++ openssl-0.9.8e/util/clean-depend.pl 2007-06-04 13:23:32.598778128 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl -w # Clean the dependency list in a makefile of standard includes... # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999 -diff -Nur openssl-0.9.7f/util/mkdef.pl openssl-0.9.7f.new/util/mkdef.pl ---- openssl-0.9.7f/util/mkdef.pl 2005-02-05 18:19:23.000000000 +0100 -+++ openssl-0.9.7f.new/util/mkdef.pl 2005-04-03 20:42:49.000000000 +0200 +Index: openssl-0.9.8e/util/mkdef.pl +=================================================================== +--- openssl-0.9.8e.orig/util/mkdef.pl 2007-06-04 13:23:32.085856104 +0200 ++++ openssl-0.9.8e/util/mkdef.pl 2007-06-04 13:23:32.599777976 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl # # generate a .def file # -diff -Nur openssl-0.9.7f/util/mkerr.pl openssl-0.9.7f.new/util/mkerr.pl ---- openssl-0.9.7f/util/mkerr.pl 2005-01-31 02:28:17.000000000 +0100 -+++ openssl-0.9.7f.new/util/mkerr.pl 2005-04-03 20:43:02.000000000 +0200 +Index: openssl-0.9.8e/util/mkerr.pl +=================================================================== +--- openssl-0.9.8e.orig/util/mkerr.pl 2007-06-04 13:23:32.091855192 +0200 ++++ openssl-0.9.8e/util/mkerr.pl 2007-06-04 13:23:32.599777976 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl my $config = "crypto/err/openssl.ec"; my $debug = 0; -diff -Nur openssl-0.9.7f/util/mkstack.pl openssl-0.9.7f.new/util/mkstack.pl ---- openssl-0.9.7f/util/mkstack.pl 2004-10-04 18:27:36.000000000 +0200 -+++ openssl-0.9.7f.new/util/mkstack.pl 2005-04-03 20:43:18.000000000 +0200 +Index: openssl-0.9.8e/util/mkstack.pl +=================================================================== +--- openssl-0.9.8e.orig/util/mkstack.pl 2007-06-04 13:23:32.096854432 +0200 ++++ openssl-0.9.8e/util/mkstack.pl 2007-06-04 13:23:32.600777824 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl # This is a utility that searches out "DECLARE_STACK_OF()" # declarations in .h and .c files, and updates/creates/replaces -diff -Nur openssl-0.9.7f/util/pod2man.pl openssl-0.9.7f.new/util/pod2man.pl ---- openssl-0.9.7f/util/pod2man.pl 2002-05-30 17:30:21.000000000 +0200 -+++ openssl-0.9.7f.new/util/pod2man.pl 2005-04-03 20:43:52.000000000 +0200 +Index: openssl-0.9.8e/util/pod2man.pl +=================================================================== +--- openssl-0.9.8e.orig/util/pod2man.pl 2007-06-04 13:23:32.102853520 +0200 ++++ openssl-0.9.8e/util/pod2man.pl 2007-06-04 13:23:32.600777824 +0200 @@ -1,4 +1,4 @@ -: #!/usr/bin/perl-5.005 +#!/usr/bin/perl eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' if $running_under_some_shell; -diff -Nur openssl-0.9.7f/util/selftest.pl openssl-0.9.7f.new/util/selftest.pl ---- openssl-0.9.7f/util/selftest.pl 2004-05-11 14:46:19.000000000 +0200 -+++ openssl-0.9.7f.new/util/selftest.pl 2005-04-03 20:44:10.000000000 +0200 +Index: openssl-0.9.8e/util/selftest.pl +=================================================================== +--- openssl-0.9.8e.orig/util/selftest.pl 2007-06-04 13:23:32.109852456 +0200 ++++ openssl-0.9.8e/util/selftest.pl 2007-06-04 13:23:32.600777824 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl diff --git a/package/openssl/patches/140-makefile-dirs.patch b/package/openssl/patches/140-makefile-dirs.patch index 89022e0..b35c8de 100644 --- a/package/openssl/patches/140-makefile-dirs.patch +++ b/package/openssl/patches/140-makefile-dirs.patch @@ -1,8 +1,10 @@ ---- openssl-0.9.8a/Makefile.org 2006-02-21 20:57:45.000000000 -0800 -+++ openssl-0.9.8a-new/Makefile.org 2006-02-21 21:37:11.000000000 -0800 -@@ -100,7 +100,7 @@ - KRB5_INCLUDES= - LIBKRB5= +Index: openssl-0.9.8e/Makefile.org +=================================================================== +--- openssl-0.9.8e.orig/Makefile.org 2007-06-04 13:23:32.048861728 +0200 ++++ openssl-0.9.8e/Makefile.org 2007-06-04 13:23:32.857738760 +0200 +@@ -104,7 +104,7 @@ + ZLIB_INCLUDE= + LIBZLIB= -DIRS= crypto ssl engines apps test tools +DIRS= crypto ssl apps diff --git a/package/openssl/patches/150-no_engines.patch b/package/openssl/patches/150-no_engines.patch index b928fbc..104cba0 100644 --- a/package/openssl/patches/150-no_engines.patch +++ b/package/openssl/patches/150-no_engines.patch @@ -1,6 +1,7 @@ -diff -udrNP openssl-0.9.8-stable-SNAP-20050703.orig/util/libeay.num openssl-0.9.8-stable-SNAP-20050703/util/libeay.num ---- openssl-0.9.8-stable-SNAP-20050703.orig/util/libeay.num 2005-07-04 00:27:14.653639088 +0200 -+++ openssl-0.9.8-stable-SNAP-20050703/util/libeay.num 2005-07-04 22:50:07.986576664 +0200 +Index: openssl-0.9.8e/util/libeay.num +=================================================================== +--- openssl-0.9.8e.orig/util/libeay.num 2007-06-04 13:23:32.021865832 +0200 ++++ openssl-0.9.8e/util/libeay.num 2007-06-04 13:23:33.045710184 +0200 @@ -2071,7 +2071,6 @@ UI_add_error_string 2633 EXIST::FUNCTION: KRB5_CHECKSUM_free 2634 EXIST::FUNCTION: @@ -66,10 +67,11 @@ diff -udrNP openssl-0.9.8-stable-SNAP-20050703.orig/util/libeay.num openssl-0.9. EC_GROUP_set_curve_name 3533 EXIST::FUNCTION:EC X509_CERT_PAIR_it 3534 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: X509_CERT_PAIR_it 3534 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: -diff -udrNP openssl-0.9.8-stable-SNAP-20050703.orig/Configure openssl-0.9.8-stable-SNAP-20050703/Configure ---- openssl-0.9.8-stable-SNAP-20050703.orig/Configure 2005-07-04 00:27:11.169168808 +0200 -+++ openssl-0.9.8-stable-SNAP-20050703/Configure 2005-07-05 00:02:12.590136992 +0200 -@@ -1623,6 +1624,11 @@ +Index: openssl-0.9.8e/Configure +=================================================================== +--- openssl-0.9.8e.orig/Configure 2007-06-04 13:23:32.598778128 +0200 ++++ openssl-0.9.8e/Configure 2007-06-04 13:23:33.046710032 +0200 +@@ -1644,6 +1644,11 @@ close(OUT); } diff --git a/package/openssl/patches/160-disable_doc_tests.patch b/package/openssl/patches/160-disable_doc_tests.patch index 27e2033..9706a0b 100644 --- a/package/openssl/patches/160-disable_doc_tests.patch +++ b/package/openssl/patches/160-disable_doc_tests.patch @@ -1,16 +1,17 @@ -diff -urN openssl-0.9.8a/Makefile openssl-0.9.8a.new/Makefile ---- openssl-0.9.8a/Makefile 2005-10-11 12:21:48.000000000 +0200 -+++ openssl-0.9.8a.new/Makefile 2006-03-29 15:23:28.107586680 +0200 -@@ -102,7 +102,7 @@ - KRB5_INCLUDES= - LIBKRB5= +Index: openssl-0.9.8e/Makefile +=================================================================== +--- openssl-0.9.8e.orig/Makefile 2007-06-04 13:23:31.995869784 +0200 ++++ openssl-0.9.8e/Makefile 2007-06-04 13:23:33.246679632 +0200 +@@ -106,7 +106,7 @@ + ZLIB_INCLUDE= + LIBZLIB= -DIRS= crypto ssl engines apps test tools +DIRS= crypto ssl engines apps tools SHLIBDIRS= crypto ssl # dirs in crypto to build -@@ -119,7 +119,7 @@ +@@ -123,7 +123,7 @@ # tests to perform. "alltests" is a special word indicating that all tests # should be performed. @@ -19,7 +20,7 @@ diff -urN openssl-0.9.8a/Makefile openssl-0.9.8a.new/Makefile MAKEFILE= Makefile -@@ -131,7 +131,7 @@ +@@ -135,7 +135,7 @@ TOP= . ONEDIRS=out tmp @@ -28,7 +29,7 @@ diff -urN openssl-0.9.8a/Makefile openssl-0.9.8a.new/Makefile WDIRS= windows LIBS= libcrypto.a libssl.a SHARED_CRYPTO=libcrypto$(SHLIB_EXT) -@@ -204,7 +204,7 @@ +@@ -225,7 +225,7 @@ @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV) sub_all: build_all @@ -37,7 +38,7 @@ diff -urN openssl-0.9.8a/Makefile openssl-0.9.8a.new/Makefile build_libs: build_crypto build_ssl build_engines -@@ -454,7 +454,7 @@ +@@ -475,7 +475,7 @@ dist_pem_h: (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) @@ -46,9 +47,10 @@ diff -urN openssl-0.9.8a/Makefile openssl-0.9.8a.new/Makefile install_sw: @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ -diff -urN openssl-0.9.8b/Makefile.org openssl-0.9.8b.new/Makefile.org ---- openssl-0.9.8b/Makefile.org 2006-09-01 19:34:51.000000000 +0200 -+++ openssl-0.9.8b.new/Makefile.org 2006-09-01 19:36:38.000000000 +0200 +Index: openssl-0.9.8e/Makefile.org +=================================================================== +--- openssl-0.9.8e.orig/Makefile.org 2007-06-04 13:23:32.857738760 +0200 ++++ openssl-0.9.8e/Makefile.org 2007-06-04 13:23:33.246679632 +0200 @@ -473,7 +473,7 @@ dist_pem_h: (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) diff --git a/package/openssl/patches/170-bash_path.patch b/package/openssl/patches/170-bash_path.patch index b6dc27e..45b6269 100644 --- a/package/openssl/patches/170-bash_path.patch +++ b/package/openssl/patches/170-bash_path.patch @@ -1,5 +1,7 @@ ---- openssl.old/util/domd Sun Oct 15 01:04:33 2006 -+++ openssl.dev/util/domd Sun Oct 15 01:04:44 2006 +Index: openssl-0.9.8e/util/domd +=================================================================== +--- openssl-0.9.8e.orig/util/domd 2007-06-04 13:23:32.408807008 +0200 ++++ openssl-0.9.8e/util/domd 2007-06-04 13:23:33.442649840 +0200 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash |