diff mbox

[7/7] openssl: Fix do_install on systems with pod from perl 5.18

Message ID c86635d4df7044be49659b814c4e945a0fa0eacc.1398257704.git.Morten.ThunbergSvendsen@prevas.dk
State Accepted
Delegated to: Esben Haabendal
Headers show

Commit Message

Morten Svendsen April 23, 2014, 1:02 p.m. UTC 
Fixes do_install error:
  cms.pod around line ...: Expected text after =item, not a number
  ...
  POD document had syntax errors at /usr/bin/pod2man line 71.
---
 .../openssl/openssl-1.0.1g/fix-pod-errors.patch    | 396 +++++++++++++++++++++
 recipes/openssl/openssl_1.0.1g.oe                  |   2 +-
 2 files changed, 397 insertions(+), 1 deletion(-)
 create mode 100644 recipes/openssl/openssl-1.0.1g/fix-pod-errors.patch
diff mbox

Patch

diff --git a/recipes/openssl/openssl-1.0.1g/fix-pod-errors.patch b/recipes/openssl/openssl-1.0.1g/fix-pod-errors.patch
new file mode 100644
index 0000000..b5b72ed
--- /dev/null
+++ b/recipes/openssl/openssl-1.0.1g/fix-pod-errors.patch
@@ -0,0 +1,396 @@ 
+Description: Fix pod errors
+ The version of pod from perl 5.18 is fussier than previous versions changing
+ thigs that were previously warnings into errors. This patch fixes the errors
+ and makes the package build but I have not checked the correctness of the
+ output.
+Author: Peter Michael Green <plugwash@raspbian.org>
+Bug-Debian: http://bugs.debian.org/723954
+Bug: http://rt.openssl.org/Ticket/Display.html?id=3146&user=guest&pass=guest
+
+Index: openssl-1.0.1g/doc/apps/smime.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/apps/smime.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/apps/smime.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -308,28 +308,28 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ the operation was completely successfully.
+ 
+-=item 1 
++=item C<1> 
+ 
+ an error occurred parsing the command options.
+ 
+-=item 2
++=item C<2>
+ 
+ one of the input files could not be read.
+ 
+-=item 3
++=item C<3>
+ 
+ an error occurred creating the PKCS#7 file or when reading the MIME
+ message.
+ 
+-=item 4
++=item C<4>
+ 
+ an error occurred decrypting or verifying the message.
+ 
+-=item 5
++=item C<5>
+ 
+ the message was verified correctly but an error occurred writing out
+ the signers certificates.
+Index: openssl-1.0.1g/doc/apps/cms.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/apps/cms.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/apps/cms.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -450,28 +450,28 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ the operation was completely successfully.
+ 
+-=item 1 
++=item C<1> 
+ 
+ an error occurred parsing the command options.
+ 
+-=item 2
++=item C<2>
+ 
+ one of the input files could not be read.
+ 
+-=item 3
++=item C<3>
+ 
+ an error occurred creating the CMS file or when reading the MIME
+ message.
+ 
+-=item 4
++=item C<4>
+ 
+ an error occurred decrypting or verifying the message.
+ 
+-=item 5
++=item C<5>
+ 
+ the message was verified correctly but an error occurred writing out
+ the signers certificates.
+Index: openssl-1.0.1g/doc/ssl/SSL_clear.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_clear.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_clear.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -56,12 +56,12 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The SSL_clear() operation could not be performed. Check the error stack to
+ find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The SSL_clear() operation was successful.
+ 
+Index: openssl-1.0.1g/doc/ssl/SSL_session_reused.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_session_reused.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_session_reused.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -27,11 +27,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ A new session was negotiated.
+ 
+-=item 1
++=item C<1>
+ 
+ A session was reused.
+ 
+Index: openssl-1.0.1g/doc/ssl/SSL_set_session.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_set_session.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_set_session.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -37,11 +37,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation failed; check the error stack to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+Index: openssl-1.0.1g/doc/ssl/SSL_connect.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_connect.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_connect.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -41,13 +41,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+Index: openssl-1.0.1g/doc/ssl/SSL_shutdown.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_shutdown.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_shutdown.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -92,14 +92,14 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The shutdown is not yet finished. Call SSL_shutdown() for a second time,
+ if a bidirectional shutdown shall be performed.
+ The output of L<SSL_get_error(3)|SSL_get_error(3)> may be misleading, as an
+ erroneous SSL_ERROR_SYSCALL may be flagged even though no error occurred.
+ 
+-=item 1
++=item C<1>
+ 
+ The shutdown was successfully completed. The "close notify" alert was sent
+ and the peer's "close notify" alert was received.
+Index: openssl-1.0.1g/doc/ssl/SSL_CTX_set_client_CA_list.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_set_client_CA_list.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_CTX_set_client_CA_list.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -66,13 +66,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ A failure while manipulating the STACK_OF(X509_NAME) object occurred or
+ the X509_NAME could not be extracted from B<cacert>. Check the error stack
+ to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+Index: openssl-1.0.1g/doc/ssl/SSL_accept.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_accept.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_accept.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -44,13 +44,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+Index: openssl-1.0.1g/doc/ssl/SSL_CTX_set_session_id_context.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_set_session_id_context.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_CTX_set_session_id_context.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -64,13 +64,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The length B<sid_ctx_len> of the session id context B<sid_ctx> exceeded
+ the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error
+ is logged to the error stack.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+Index: openssl-1.0.1g/doc/ssl/SSL_write.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_write.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_write.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -79,7 +79,7 @@
+ The write operation was successful, the return value is the number of
+ bytes actually written to the TLS/SSL connection.
+ 
+-=item 0
++=item C<0>
+ 
+ The write operation was not successful. Probably the underlying connection
+ was closed. Call SSL_get_error() with the return value B<ret> to find out,
+Index: openssl-1.0.1g/doc/ssl/SSL_CTX_load_verify_locations.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_load_verify_locations.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_CTX_load_verify_locations.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -100,13 +100,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation failed because B<CAfile> and B<CApath> are NULL or the
+ processing at one of the locations specified failed. Check the error
+ stack to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+Index: openssl-1.0.1g/doc/ssl/SSL_set_fd.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_set_fd.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_set_fd.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -35,11 +35,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation failed. Check the error stack to find out why.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+Index: openssl-1.0.1g/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_use_psk_identity_hint.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_CTX_use_psk_identity_hint.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -96,7 +96,7 @@
+ connection will fail with decryption_error before it will be finished
+ completely.
+ 
+-=item 0
++=item C<0>
+ 
+ PSK identity was not found. An "unknown_psk_identity" alert message
+ will be sent and the connection setup fails.
+Index: openssl-1.0.1g/doc/ssl/SSL_read.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_read.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_read.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -86,7 +86,7 @@
+ The read operation was successful; the return value is the number of
+ bytes actually read from the TLS/SSL connection.
+ 
+-=item 0
++=item C<0>
+ 
+ The read operation was not successful. The reason may either be a clean
+ shutdown due to a "close notify" alert sent by the peer (in which case
+Index: openssl-1.0.1g/doc/ssl/SSL_CTX_add_session.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_add_session.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_CTX_add_session.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -52,13 +52,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+  The operation failed. In case of the add operation, it was tried to add
+  the same (identical) session twice. In case of the remove operation, the
+  session was not found in the cache.
+ 
+-=item 1
++=item C<1>
+  
+  The operation succeeded.
+ 
+Index: openssl-1.0.1g/doc/ssl/SSL_do_handshake.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_do_handshake.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_do_handshake.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -45,13 +45,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+Index: openssl-1.0.1g/doc/ssl/SSL_COMP_add_compression_method.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_COMP_add_compression_method.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_COMP_add_compression_method.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -53,11 +53,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation succeeded.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation failed. Check the error queue to find out the reason.
+ 
+Index: openssl-1.0.1g/doc/ssl/SSL_CTX_set_ssl_version.pod
+===================================================================
+--- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_set_ssl_version.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_CTX_set_ssl_version.pod	2014-04-07 23:21:03.985184135 +0200
+@@ -42,11 +42,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The new choice failed, check the error stack to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
diff --git a/recipes/openssl/openssl_1.0.1g.oe b/recipes/openssl/openssl_1.0.1g.oe
index 0f2c2b9..76f6c36 100644
--- a/recipes/openssl/openssl_1.0.1g.oe
+++ b/recipes/openssl/openssl_1.0.1g.oe
@@ -2,6 +2,7 @@  require openssl.inc
 
 SRC_URI += "file://engines-install-in-libdir-ssl.patch"
 SRC_URI += "file://mingw.patch"
+SRC_URI += "file://fix-pod-errors.patch"
 
 # Parallel make is simply broken for now.
 PARALLEL_MAKE = ""
@@ -10,7 +11,6 @@  PARALLEL_MAKE = ""
 SRC_URI += "file://oe-ldflags.patch file://shared-libs.patch"
 export OE_LDFLAGS="${LDFLAGS}"
 SRC_URI += "file://no-librpath-rpath.patch"
-
 SRC_URI += "file://wincrypt.patch"
 
 LIBRARY_VERSION = "1"