Fix FTBFS against latest pod2man
This commit is contained in:
Erik van Pienbroek
parent
b47ab2b5e9
commit
d919b36d21
@ -24,7 +24,7 @@
|
||||
|
||||
Name: mingw-openssl
|
||||
Version: 1.0.1c
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: MinGW port of the OpenSSL toolkit
|
||||
|
||||
License: OpenSSL
|
||||
@ -52,6 +52,9 @@ Patch6: openssl-0.9.8b-test-use-localhost.patch
|
||||
Patch7: openssl-1.0.0-timezone.patch
|
||||
Patch8: openssl-1.0.1c-perlfind.patch
|
||||
Patch9: openssl-1.0.1c-aliasing.patch
|
||||
# Fix FTBFS against latest pod2man
|
||||
# Patch found at http://www.mail-archive.com/openssl-dev@openssl.org/msg29210.html
|
||||
Patch10: openssl-fix-pod2man-failure.patch
|
||||
# Bug fixes
|
||||
Patch23: openssl-1.0.0-beta4-default-paths.patch
|
||||
# Functionality changes
|
||||
@ -196,7 +199,7 @@ Static version of the MinGW port of the OpenSSL toolkit.
|
||||
%patch7 -p1 -b .timezone
|
||||
%patch8 -p1 -b .perlfind
|
||||
%patch9 -p1 -b .aliasing
|
||||
|
||||
%patch10 -p1 -b .pod2man
|
||||
%patch23 -p1 -b .default-paths
|
||||
|
||||
%patch33 -p1 -b .ca-dir
|
||||
@ -472,6 +475,9 @@ mkdir -m700 $RPM_BUILD_ROOT%{mingw64_sysconfdir}/pki/CA/private
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jan 11 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.0.1c-2
|
||||
- Fix FTBFS against latest pod2man
|
||||
|
||||
* Fri Nov 9 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.0.1c-1
|
||||
- Update to 1.0.1c
|
||||
- Synced patches with native openssl-1.0.1c-7.fc19
|
||||
|
||||
211
openssl-fix-pod2man-failure.patch
Normal file
211
openssl-fix-pod2man-failure.patch
Normal file
@ -0,0 +1,211 @@
|
||||
--- a/doc/ssl/SSL_CTX_set_client_CA_list.pod
|
||||
+++ b/doc/ssl/SSL_CTX_set_client_CA_list.pod
|
||||
@@ -66,16 +66,16 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 1
|
||||
-
|
||||
-The operation succeeded.
|
||||
-
|
||||
=item 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
|
||||
+
|
||||
+The operation succeeded.
|
||||
+
|
||||
=back
|
||||
|
||||
=head1 EXAMPLES
|
||||
|
||||
--- a/doc/ssl/SSL_accept.pod
|
||||
+++ b/doc/ssl/SSL_accept.pod
|
||||
@@ -44,10 +44,13 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 1
|
||||
+=item E<lt>0
|
||||
|
||||
-The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
|
||||
-established.
|
||||
+The TLS/SSL handshake was not successful because a fatal error occurred either
|
||||
+at the protocol level or a connection failure occurred. The shutdown was
|
||||
+not clean. It can also occur of action is need to continue the operation
|
||||
+for non-blocking BIOs. Call SSL_get_error() with the return value B<ret>
|
||||
+to find out the reason.
|
||||
|
||||
=item 0
|
||||
|
||||
@@ -55,13 +58,10 @@
|
||||
by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
|
||||
return value B<ret> to find out the reason.
|
||||
|
||||
-=item E<lt>0
|
||||
+=item 1
|
||||
|
||||
-The TLS/SSL handshake was not successful because a fatal error occurred either
|
||||
-at the protocol level or a connection failure occurred. The shutdown was
|
||||
-not clean. It can also occur of action is need to continue the operation
|
||||
-for non-blocking BIOs. Call SSL_get_error() with the return value B<ret>
|
||||
-to find out the reason.
|
||||
+The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
|
||||
+established.
|
||||
|
||||
=back
|
||||
|
||||
|
||||
--- a/doc/ssl/SSL_connect.pod
|
||||
+++ b/doc/ssl/SSL_connect.pod
|
||||
@@ -41,10 +41,13 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 1
|
||||
+=item E<lt>0
|
||||
|
||||
-The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
|
||||
-established.
|
||||
+The TLS/SSL handshake was not successful, because a fatal error occurred either
|
||||
+at the protocol level or a connection failure occurred. The shutdown was
|
||||
+not clean. It can also occur of action is need to continue the operation
|
||||
+for non-blocking BIOs. Call SSL_get_error() with the return value B<ret>
|
||||
+to find out the reason.
|
||||
|
||||
=item 0
|
||||
|
||||
@@ -52,13 +55,10 @@
|
||||
by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
|
||||
return value B<ret> to find out the reason.
|
||||
|
||||
-=item E<lt>0
|
||||
+=item 1
|
||||
|
||||
-The TLS/SSL handshake was not successful, because a fatal error occurred either
|
||||
-at the protocol level or a connection failure occurred. The shutdown was
|
||||
-not clean. It can also occur of action is need to continue the operation
|
||||
-for non-blocking BIOs. Call SSL_get_error() with the return value B<ret>
|
||||
-to find out the reason.
|
||||
+The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
|
||||
+established.
|
||||
|
||||
=back
|
||||
|
||||
|
||||
--- a/doc/ssl/SSL_do_handshake.pod
|
||||
+++ b/doc/ssl/SSL_do_handshake.pod
|
||||
@@ -45,10 +45,13 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 1
|
||||
+=item E<lt>0
|
||||
|
||||
-The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
|
||||
-established.
|
||||
+The TLS/SSL handshake was not successful because a fatal error occurred either
|
||||
+at the protocol level or a connection failure occurred. The shutdown was
|
||||
+not clean. It can also occur of action is need to continue the operation
|
||||
+for non-blocking BIOs. Call SSL_get_error() with the return value B<ret>
|
||||
+to find out the reason.
|
||||
|
||||
=item 0
|
||||
|
||||
@@ -56,13 +59,10 @@
|
||||
by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
|
||||
return value B<ret> to find out the reason.
|
||||
|
||||
-=item E<lt>0
|
||||
+=item 1
|
||||
|
||||
-The TLS/SSL handshake was not successful because a fatal error occurred either
|
||||
-at the protocol level or a connection failure occurred. The shutdown was
|
||||
-not clean. It can also occur of action is need to continue the operation
|
||||
-for non-blocking BIOs. Call SSL_get_error() with the return value B<ret>
|
||||
-to find out the reason.
|
||||
+The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
|
||||
+established.
|
||||
|
||||
=back
|
||||
|
||||
|
||||
--- a/doc/ssl/SSL_shutdown.pod
|
||||
+++ b/doc/ssl/SSL_shutdown.pod
|
||||
@@ -92,10 +92,13 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 1
|
||||
+=item -1
|
||||
|
||||
-The shutdown was successfully completed. The "close notify" alert was sent
|
||||
-and the peer's "close notify" alert was received.
|
||||
+The shutdown was not successful because a fatal error occurred either
|
||||
+at the protocol level or a connection failure occurred. It can also occur if
|
||||
+action is need to continue the operation for non-blocking BIOs.
|
||||
+Call L<SSL_get_error(3)|SSL_get_error(3)> with the return value B<ret>
|
||||
+to find out the reason.
|
||||
|
||||
=item 0
|
||||
|
||||
@@ -104,13 +107,10 @@
|
||||
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 1
|
||||
|
||||
-The shutdown was not successful because a fatal error occurred either
|
||||
-at the protocol level or a connection failure occurred. It can also occur if
|
||||
-action is need to continue the operation for non-blocking BIOs.
|
||||
-Call L<SSL_get_error(3)|SSL_get_error(3)> with the return value B<ret>
|
||||
-to find out the reason.
|
||||
+The shutdown was successfully completed. The "close notify" alert was sent
|
||||
+and the peer's "close notify" alert was received.
|
||||
|
||||
=back
|
||||
|
||||
|
||||
--- a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
|
||||
+++ b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
|
||||
@@ -81,6 +81,13 @@
|
||||
|
||||
Return values from the server callback are interpreted as follows:
|
||||
|
||||
+=over 4
|
||||
+
|
||||
+=item 0
|
||||
+
|
||||
+PSK identity was not found. An "unknown_psk_identity" alert message
|
||||
+will be sent and the connection setup fails.
|
||||
+
|
||||
=item > 0
|
||||
|
||||
PSK identity was found and the server callback has provided the PSK
|
||||
@@ -94,9 +101,6 @@
|
||||
connection will fail with decryption_error before it will be finished
|
||||
completely.
|
||||
|
||||
-=item 0
|
||||
-
|
||||
-PSK identity was not found. An "unknown_psk_identity" alert message
|
||||
-will be sent and the connection setup fails.
|
||||
+=back
|
||||
|
||||
=cut
|
||||
|
||||
--- a/doc/crypto/X509_STORE_CTX_get_error.pod
|
||||
+++ b/doc/crypto/X509_STORE_CTX_get_error.pod
|
||||
@@ -278,6 +278,8 @@
|
||||
an application specific error. This will never be returned unless explicitly
|
||||
set by an application.
|
||||
|
||||
+=back
|
||||
+
|
||||
=head1 NOTES
|
||||
|
||||
The above functions should be used instead of directly referencing the fields
|
||||
Loading…
Reference in New Issue
Block a user