diff options
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/debian')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/debian/man-section.patch | 17 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/debian/version-script.patch | 80 |
2 files changed, 49 insertions, 48 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/debian/man-section.patch b/meta/recipes-connectivity/openssl/openssl/debian/man-section.patch index 21c1d1a4eb..1bd42efc9c 100644 --- a/meta/recipes-connectivity/openssl/openssl/debian/man-section.patch +++ b/meta/recipes-connectivity/openssl/openssl/debian/man-section.patch | |||
@@ -1,9 +1,10 @@ | |||
1 | Upstream-Status: Backport [debian] | 1 | Upstream-Status: Backport [debian] |
2 | 2 | ||
3 | Index: openssl-1.0.0c/Makefile.org | 3 | Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> |
4 | =================================================================== | 4 | --- |
5 | --- openssl-1.0.0c.orig/Makefile.org 2010-12-12 16:11:37.000000000 +0100 | 5 | diff -ruN a/Makefile.org b/Makefile.org |
6 | +++ openssl-1.0.0c/Makefile.org 2010-12-12 16:13:28.000000000 +0100 | 6 | --- a/Makefile.org 2016-05-04 08:24:51.982013676 +0200 |
7 | +++ b/Makefile.org 2016-05-04 08:35:43.581929188 +0200 | ||
7 | @@ -160,7 +160,8 @@ | 8 | @@ -160,7 +160,8 @@ |
8 | MANDIR=/usr/share/man | 9 | MANDIR=/usr/share/man |
9 | MAN1=1 | 10 | MAN1=1 |
@@ -14,21 +15,21 @@ Index: openssl-1.0.0c/Makefile.org | |||
14 | HTMLSUFFIX=html | 15 | HTMLSUFFIX=html |
15 | HTMLDIR=$(OPENSSLDIR)/html | 16 | HTMLDIR=$(OPENSSLDIR)/html |
16 | SHELL=/bin/sh | 17 | SHELL=/bin/sh |
17 | @@ -651,7 +652,7 @@ | 18 | @@ -650,7 +651,7 @@ |
18 | echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ | 19 | echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ |
19 | (cd `$(PERL) util/dirname.pl $$i`; \ | 20 | (cd `$(PERL) util/dirname.pl $$i`; \ |
20 | sh -c "$$pod2man \ | 21 | sh -c "$$pod2man \ |
21 | - --section=$$sec --center=OpenSSL \ | 22 | - --section=$$sec --center=OpenSSL \ |
22 | + --section=$${sec}$(MANSECTION) --center=OpenSSL \ | 23 | + --section=$${sec}$(MANSECTION) --center=OpenSSL \ |
23 | --release=$(VERSION) `basename $$i`") \ | 24 | --release=$(VERSION) `basename $$i`") \ |
24 | > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ | 25 | > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ |
25 | $(PERL) util/extract-names.pl < $$i | \ | 26 | $(PERL) util/extract-names.pl < $$i | \ |
26 | @@ -668,7 +669,7 @@ | 27 | @@ -667,7 +668,7 @@ |
27 | echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ | 28 | echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ |
28 | (cd `$(PERL) util/dirname.pl $$i`; \ | 29 | (cd `$(PERL) util/dirname.pl $$i`; \ |
29 | sh -c "$$pod2man \ | 30 | sh -c "$$pod2man \ |
30 | - --section=$$sec --center=OpenSSL \ | 31 | - --section=$$sec --center=OpenSSL \ |
31 | + --section=$${sec}$(MANSECTION) --center=OpenSSL \ | 32 | + --section=$${sec}$(MANSECTION) --center=OpenSSL \ |
32 | --release=$(VERSION) `basename $$i`") \ | 33 | --release=$(VERSION) `basename $$i`") \ |
33 | > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ | 34 | > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ |
34 | $(PERL) util/extract-names.pl < $$i | \ | 35 | $(PERL) util/extract-names.pl < $$i | \ |
diff --git a/meta/recipes-connectivity/openssl/openssl/debian/version-script.patch b/meta/recipes-connectivity/openssl/openssl/debian/version-script.patch index ece8b9b46c..ac78adb802 100644 --- a/meta/recipes-connectivity/openssl/openssl/debian/version-script.patch +++ b/meta/recipes-connectivity/openssl/openssl/debian/version-script.patch | |||
@@ -1,10 +1,11 @@ | |||
1 | Upstream-Status: Backport [debian] | 1 | Upstream-Status: Backport [debian] |
2 | 2 | ||
3 | Index: openssl-1.0.1d/Configure | 3 | Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> |
4 | =================================================================== | 4 | --- |
5 | --- openssl-1.0.1d.orig/Configure 2013-02-06 19:41:43.000000000 +0100 | 5 | diff -ruN a/Configure b/Configure |
6 | +++ openssl-1.0.1d/Configure 2013-02-06 19:41:43.000000000 +0100 | 6 | --- a/Configure 2016-05-09 12:05:53.135685172 +0200 |
7 | @@ -1621,6 +1621,8 @@ | 7 | +++ b/Configure 2016-05-09 12:07:43.962952937 +0200 |
8 | @@ -1667,6 +1667,8 @@ | ||
8 | } | 9 | } |
9 | } | 10 | } |
10 | 11 | ||
@@ -13,11 +14,38 @@ Index: openssl-1.0.1d/Configure | |||
13 | open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n"; | 14 | open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n"; |
14 | unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new"; | 15 | unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new"; |
15 | open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n"; | 16 | open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n"; |
16 | Index: openssl-1.0.1d/openssl.ld | 17 | diff -ruN a/engines/ccgost/openssl.ld b/engines/ccgost/openssl.ld |
17 | =================================================================== | 18 | --- a/engines/ccgost/openssl.ld 1970-01-01 01:00:00.000000000 +0100 |
18 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | 19 | +++ b/engines/ccgost/openssl.ld 2016-05-09 12:07:44.034949863 +0200 |
19 | +++ openssl-1.0.1d/openssl.ld 2013-02-06 19:44:25.000000000 +0100 | 20 | @@ -0,0 +1,10 @@ |
20 | @@ -0,0 +1,4620 @@ | 21 | +OPENSSL_1.0.0 { |
22 | + global: | ||
23 | + bind_engine; | ||
24 | + v_check; | ||
25 | + OPENSSL_init; | ||
26 | + OPENSSL_finish; | ||
27 | + local: | ||
28 | + *; | ||
29 | +}; | ||
30 | + | ||
31 | diff -ruN a/engines/openssl.ld b/engines/openssl.ld | ||
32 | --- a/engines/openssl.ld 1970-01-01 01:00:00.000000000 +0100 | ||
33 | +++ b/engines/openssl.ld 2016-05-09 12:07:43.990951742 +0200 | ||
34 | @@ -0,0 +1,10 @@ | ||
35 | +OPENSSL_1.0.0 { | ||
36 | + global: | ||
37 | + bind_engine; | ||
38 | + v_check; | ||
39 | + OPENSSL_init; | ||
40 | + OPENSSL_finish; | ||
41 | + local: | ||
42 | + *; | ||
43 | +}; | ||
44 | + | ||
45 | diff -ruN a/openssl.ld b/openssl.ld | ||
46 | --- a/openssl.ld 1970-01-01 01:00:00.000000000 +0100 | ||
47 | +++ b/openssl.ld 2016-05-09 12:34:19.174771028 +0200 | ||
48 | @@ -0,0 +1,4622 @@ | ||
21 | +OPENSSL_1.0.0 { | 49 | +OPENSSL_1.0.0 { |
22 | + global: | 50 | + global: |
23 | + BIO_f_ssl; | 51 | + BIO_f_ssl; |
@@ -4526,6 +4554,8 @@ Index: openssl-1.0.1d/openssl.ld | |||
4526 | + SSL_SESSION_get_compress_id; | 4554 | + SSL_SESSION_get_compress_id; |
4527 | + | 4555 | + |
4528 | + SRP_VBASE_get_by_user; | 4556 | + SRP_VBASE_get_by_user; |
4557 | + SRP_VBASE_get1_by_user; | ||
4558 | + SRP_user_pwd_free; | ||
4529 | + SRP_Calc_server_key; | 4559 | + SRP_Calc_server_key; |
4530 | + SRP_create_verifier; | 4560 | + SRP_create_verifier; |
4531 | + SRP_create_verifier_BN; | 4561 | + SRP_create_verifier_BN; |
@@ -4638,33 +4668,3 @@ Index: openssl-1.0.1d/openssl.ld | |||
4638 | + CRYPTO_memcmp; | 4668 | + CRYPTO_memcmp; |
4639 | +} OPENSSL_1.0.1; | 4669 | +} OPENSSL_1.0.1; |
4640 | + | 4670 | + |
4641 | Index: openssl-1.0.1d/engines/openssl.ld | ||
4642 | =================================================================== | ||
4643 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
4644 | +++ openssl-1.0.1d/engines/openssl.ld 2013-02-06 19:41:43.000000000 +0100 | ||
4645 | @@ -0,0 +1,10 @@ | ||
4646 | +OPENSSL_1.0.0 { | ||
4647 | + global: | ||
4648 | + bind_engine; | ||
4649 | + v_check; | ||
4650 | + OPENSSL_init; | ||
4651 | + OPENSSL_finish; | ||
4652 | + local: | ||
4653 | + *; | ||
4654 | +}; | ||
4655 | + | ||
4656 | Index: openssl-1.0.1d/engines/ccgost/openssl.ld | ||
4657 | =================================================================== | ||
4658 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
4659 | +++ openssl-1.0.1d/engines/ccgost/openssl.ld 2013-02-06 19:41:43.000000000 +0100 | ||
4660 | @@ -0,0 +1,10 @@ | ||
4661 | +OPENSSL_1.0.0 { | ||
4662 | + global: | ||
4663 | + bind_engine; | ||
4664 | + v_check; | ||
4665 | + OPENSSL_init; | ||
4666 | + OPENSSL_finish; | ||
4667 | + local: | ||
4668 | + *; | ||
4669 | +}; | ||
4670 | + | ||