summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl
diff options
context:
space:
mode:
authorBaogen Shang <baogen.shang@windriver.com>2014-03-28 17:42:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-01 23:37:01 +0100
commitc48aff883aeb28703c03ab9415c1c2c8adc3b9b4 (patch)
tree34239ecb440d1c9171edc7e1a070c9f7c6c98a5f /meta/recipes-connectivity/openssl
parent3d456fcb7f111c9350c512b71b26f05bd9821e0a (diff)
downloadpoky-c48aff883aeb28703c03ab9415c1c2c8adc3b9b4.tar.gz
openssl: Fix pod2man des.pod error on Ubuntu 12.04
This is a formatting fix, '=back' is required before '=head1' on Ubuntu 12.04. (From OE-Core rev: 362d20e04e64a7437d7f61761057c721066e805f) Signed-off-by: Baogen Shang <baogen.shang@windriver.com> Signed-off-by: Jeff Polk <jeff.polk@windriver.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-fix-des.pod-error.patch19
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.1e.bb1
2 files changed, 20 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-fix-des.pod-error.patch b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-fix-des.pod-error.patch
new file mode 100644
index 0000000000..de49729e5e
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-fix-des.pod-error.patch
@@ -0,0 +1,19 @@
1openssl: Fix pod2man des.pod error on Ubuntu 12.04
2
3This is a formatting fix, '=back' is required before
4'=head1' on Ubuntu 12.04.
5
6Upstream-Status: Pending
7Signed-off-by: Baogen Shang <baogen.shang@windriver.com>
8diff -urpN a_origin/des.pod b_modify/des.pod
9--- a_origin/crypto/des/des.pod 2013-08-15 15:02:56.211674589 +0800
10+++ b_modify/crypto/des/des.pod 2013-08-15 15:04:14.439674580 +0800
11@@ -181,6 +181,8 @@ the uuencoded file to embed in the begin
12 output. If there is no name specified after the B<-u>, the name text.des
13 will be embedded in the header.
14
15+=back
16+
17 =head1 SEE ALSO
18
19 ps(1),
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
index 2c3885c002..618ba681a6 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
@@ -35,6 +35,7 @@ SRC_URI += "file://configure-targets.patch \
35 file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \ 35 file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \
36 file://initial-aarch64-bits.patch \ 36 file://initial-aarch64-bits.patch \
37 file://find.pl \ 37 file://find.pl \
38 file://openssl-fix-des.pod-error.patch \
38 file://0001-Fix-for-TLS-record-tampering-bug-CVE-2013-4353.patch \ 39 file://0001-Fix-for-TLS-record-tampering-bug-CVE-2013-4353.patch \
39 file://0001-Fix-DTLS-retransmission-from-previous-session.patch \ 40 file://0001-Fix-DTLS-retransmission-from-previous-session.patch \
40 file://0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch \ 41 file://0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch \