diff mbox

[3/4] openssl: Remove version 1.0.1g

Message ID 3ec9d29eafe2a468b304b4cdcb2c3043b28205fd.1412253708.git.sean.nyekjaer@prevas.dk
State Under Review
Delegated to: Kim
Headers show

Commit Message

Sean Nyekjær Oct. 2, 2014, 12:53 p.m. UTC 
No need for fix-pod-errors with perl newer than 5.18

Signed-off-by: Sean Nyekjaer <sean.nyekjaer@prevas.dk>
---
 recipes/openssl/openssl-1.0.1/fix-pod-errors.patch | 114 ++++++++++-----------
 recipes/openssl/openssl.inc                        |   1 -
 recipes/openssl/openssl_1.0.1g.oe                  |  11 --
 recipes/openssl/openssl_1.0.1g.oe.sig              |   1 -
 4 files changed, 57 insertions(+), 70 deletions(-)
 delete mode 100644 recipes/openssl/openssl_1.0.1g.oe
 delete mode 100644 recipes/openssl/openssl_1.0.1g.oe.sig
diff mbox

Patch

diff --git a/recipes/openssl/openssl-1.0.1/fix-pod-errors.patch b/recipes/openssl/openssl-1.0.1/fix-pod-errors.patch
index b5b72ed..57de54d 100644
--- a/recipes/openssl/openssl-1.0.1/fix-pod-errors.patch
+++ b/recipes/openssl/openssl-1.0.1/fix-pod-errors.patch
@@ -7,10 +7,10 @@  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
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/apps/smime.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/apps/smime.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -308,28 +308,28 @@
  
  =over 4
@@ -46,10 +46,10 @@  Index: openssl-1.0.1g/doc/apps/smime.pod
  
  the message was verified correctly but an error occurred writing out
  the signers certificates.
-Index: openssl-1.0.1g/doc/apps/cms.pod
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/apps/cms.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/apps/cms.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -450,28 +450,28 @@
  
  =over 4
@@ -85,10 +85,10 @@  Index: openssl-1.0.1g/doc/apps/cms.pod
  
  the message was verified correctly but an error occurred writing out
  the signers certificates.
-Index: openssl-1.0.1g/doc/ssl/SSL_clear.pod
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_clear.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/ssl/SSL_clear.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -56,12 +56,12 @@
  
  =over 4
@@ -104,10 +104,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_clear.pod
  
  The SSL_clear() operation was successful.
  
-Index: openssl-1.0.1g/doc/ssl/SSL_session_reused.pod
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_session_reused.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/ssl/SSL_session_reused.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -27,11 +27,11 @@
  
  =over 4
@@ -122,10 +122,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_session_reused.pod
  
  A session was reused.
  
-Index: openssl-1.0.1g/doc/ssl/SSL_set_session.pod
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_set_session.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/ssl/SSL_set_session.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -37,11 +37,11 @@
  
  =over 4
@@ -140,10 +140,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_set_session.pod
  
  The operation succeeded.
  
-Index: openssl-1.0.1g/doc/ssl/SSL_connect.pod
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_connect.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/ssl/SSL_connect.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -41,13 +41,13 @@
  
  =over 4
@@ -160,10 +160,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_connect.pod
  
  The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
  established.
-Index: openssl-1.0.1g/doc/ssl/SSL_shutdown.pod
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_shutdown.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/ssl/SSL_shutdown.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -92,14 +92,14 @@
  
  =over 4
@@ -181,10 +181,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_shutdown.pod
  
  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
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_CTX_set_client_CA_list.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/ssl/SSL_CTX_set_client_CA_list.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -66,13 +66,13 @@
  
  =over 4
@@ -201,10 +201,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_CTX_set_client_CA_list.pod
  
  The operation succeeded.
  
-Index: openssl-1.0.1g/doc/ssl/SSL_accept.pod
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_accept.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/ssl/SSL_accept.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -44,13 +44,13 @@
  
  =over 4
@@ -221,10 +221,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_accept.pod
  
  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
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_CTX_set_session_id_context.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/ssl/SSL_CTX_set_session_id_context.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -64,13 +64,13 @@
  
  =over 4
@@ -241,10 +241,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_CTX_set_session_id_context.pod
  
  The operation succeeded.
  
-Index: openssl-1.0.1g/doc/ssl/SSL_write.pod
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_write.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/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.
@@ -254,10 +254,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_write.pod
  
  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
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_CTX_load_verify_locations.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/ssl/SSL_CTX_load_verify_locations.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -100,13 +100,13 @@
  
  =over 4
@@ -274,10 +274,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_CTX_load_verify_locations.pod
  
  The operation succeeded.
  
-Index: openssl-1.0.1g/doc/ssl/SSL_set_fd.pod
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_set_fd.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/ssl/SSL_set_fd.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -35,11 +35,11 @@
  
  =over 4
@@ -292,10 +292,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_set_fd.pod
  
  The operation succeeded.
  
-Index: openssl-1.0.1g/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_CTX_use_psk_identity_hint.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/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.
@@ -305,10 +305,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
  
  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
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_read.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/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.
@@ -318,10 +318,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_read.pod
  
  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
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_CTX_add_session.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/ssl/SSL_CTX_add_session.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -52,13 +52,13 @@
  
  =over 4
@@ -338,10 +338,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_CTX_add_session.pod
   
   The operation succeeded.
  
-Index: openssl-1.0.1g/doc/ssl/SSL_do_handshake.pod
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_do_handshake.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/ssl/SSL_do_handshake.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -45,13 +45,13 @@
  
  =over 4
@@ -358,10 +358,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_do_handshake.pod
  
  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
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_COMP_add_compression_method.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/ssl/SSL_COMP_add_compression_method.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -53,11 +53,11 @@
  
  =over 4
@@ -376,10 +376,10 @@  Index: openssl-1.0.1g/doc/ssl/SSL_COMP_add_compression_method.pod
  
  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
+Index: openssl-1.0.1i/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
+--- openssl-1.0.1i.orig/doc/ssl/SSL_CTX_set_ssl_version.pod	2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1i/doc/ssl/SSL_CTX_set_ssl_version.pod	2014-04-07 23:21:03.985184135 +0200
 @@ -42,11 +42,11 @@
  
  =over 4
diff --git a/recipes/openssl/openssl.inc b/recipes/openssl/openssl.inc
index 01ea702..02fdf47 100644
--- a/recipes/openssl/openssl.inc
+++ b/recipes/openssl/openssl.inc
@@ -122,7 +122,6 @@  FILES_${PN}-doc =+ "${libdir}/ssl/man"
 
 SRC_URI += "file://engines-install-in-libdir-ssl.patch"
 SRC_URI += "file://mingw.patch"
-SRC_URI += "file://fix-pod-errors.patch"
 SRC_URI += "file://oe-ldflags.patch file://shared-libs.patch"
 SRC_URI += "file://no-librpath-rpath.patch"
 
diff --git a/recipes/openssl/openssl_1.0.1g.oe b/recipes/openssl/openssl_1.0.1g.oe
deleted file mode 100644
index 492d649..0000000
--- a/recipes/openssl/openssl_1.0.1g.oe
+++ /dev/null
@@ -1,11 +0,0 @@ 
-require openssl.inc
-
-# Parallel make is simply broken for now.
-PARALLEL_MAKE = ""
-
-# Fixup to get openssl to respect ${LDFLAGS}.  From OpenEmbedded, thanks :-)
-export OE_LDFLAGS="${LDFLAGS}"
-
-SRC_URI += "file://wincrypt.patch"
-
-LIBRARY_VERSION = "1"
diff --git a/recipes/openssl/openssl_1.0.1g.oe.sig b/recipes/openssl/openssl_1.0.1g.oe.sig
deleted file mode 100644
index f6e8990..0000000
--- a/recipes/openssl/openssl_1.0.1g.oe.sig
+++ /dev/null
@@ -1 +0,0 @@ 
-b28b3bcb1dc3ee7b55024c9f795be60eb3183e3c  openssl-1.0.1g.tar.gz