Imported Debian patch 1.0.1c-3ubuntu2.5~linaro2debian/1.0.1c-3ubuntu2.5_linaro2

1 files changed, 35 insertions, 40 deletions

diff --git a/debian/patches/openssl-pod-misspell.patch b/debian/patches/openssl-pod-misspell.patch
index a15c364..e3088ac 100644
--- a/debian/patches/openssl-pod-misspell.patch
+++ b/debian/patches/openssl-pod-misspell.patch
@@ -1,7 +1,16 @@
-Index: openssl-1.0.1/apps/ca.c
-===================================================================
---- openssl-1.0.1.orig/apps/ca.c	2012-01-12 16:28:02.000000000 +0000
-+++ openssl-1.0.1/apps/ca.c	2012-03-17 09:31:48.000000000 +0000
+---
+ apps/ca.c                  |    2 +-
+ apps/ecparam.c             |    4 ++--
+ crypto/evp/encode.c        |    2 +-
+ doc/apps/config.pod        |    2 +-
+ doc/apps/req.pod           |    2 +-
+ doc/apps/ts.pod            |    4 ++--
+ doc/apps/tsget.pod         |    2 +-
+ doc/apps/x509v3_config.pod |    2 +-
+ 8 files changed, 10 insertions(+), 10 deletions(-)
+
+--- a/apps/ca.c
++++ b/apps/ca.c
 @@ -148,7 +148,7 @@
  static const char *ca_usage[]={
  "usage: ca args\n",
@@ -11,10 +20,8 @@ Index: openssl-1.0.1/apps/ca.c
  " -config file    - A config file\n",
  " -name arg       - The particular CA definition to use\n",
  " -gencrl         - Generate a new CRL\n",
-Index: openssl-1.0.1/apps/ecparam.c
-===================================================================
---- openssl-1.0.1.orig/apps/ecparam.c	2010-06-15 17:25:02.000000000 +0000
-+++ openssl-1.0.1/apps/ecparam.c	2012-03-17 09:31:48.000000000 +0000
+--- a/apps/ecparam.c
++++ b/apps/ecparam.c
 @@ -105,7 +105,7 @@
   *                    in the asn1 der encoding
   *                    possible values: named_curve (default)
@@ -24,7 +31,7 @@ Index: openssl-1.0.1/apps/ecparam.c
   * -genkey          - generate ec key
   * -rand file       - files to use for random number input
   * -engine e        - use engine e, possibly a hardware device
-@@ -286,7 +286,7 @@
+@@ -286,7 +286,7 @@ bad:
  		BIO_printf(bio_err, "                                   "
  				" explicit\n");
  		BIO_printf(bio_err, " -no_seed          if 'explicit'"
@@ -33,11 +40,9 @@ Index: openssl-1.0.1/apps/ecparam.c
  				" use the seed\n");
  		BIO_printf(bio_err, " -genkey           generate ec"
  				" key\n");
-Index: openssl-1.0.1/crypto/evp/encode.c
-===================================================================
---- openssl-1.0.1.orig/crypto/evp/encode.c	2010-06-15 17:25:09.000000000 +0000
-+++ openssl-1.0.1/crypto/evp/encode.c	2012-03-17 09:31:48.000000000 +0000
-@@ -250,7 +250,7 @@
+--- a/crypto/evp/encode.c
++++ b/crypto/evp/encode.c
+@@ -250,7 +250,7 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx
  	/* We parse the input data */
  	for (i=0; i<inl; i++)
  		{
@@ -46,11 +51,9 @@ Index: openssl-1.0.1/crypto/evp/encode.c
  		if (ln >= 80) { rv= -1; goto end; }
  
  		/* Get char and put it into the buffer */
-Index: openssl-1.0.1/doc/apps/config.pod
-===================================================================
---- openssl-1.0.1.orig/doc/apps/config.pod	2004-11-25 17:47:29.000000000 +0000
-+++ openssl-1.0.1/doc/apps/config.pod	2012-03-17 09:31:48.000000000 +0000
-@@ -119,7 +119,7 @@
+--- a/doc/apps/config.pod
++++ b/doc/apps/config.pod
+@@ -119,7 +119,7 @@ variable points to a section containing
  information.
  
  The section pointed to by B<engines> is a table of engine names (though see
@@ -59,11 +62,9 @@ Index: openssl-1.0.1/doc/apps/config.pod
  specific to each ENGINE.
  
  Each ENGINE specific section is used to set default algorithms, load
-Index: openssl-1.0.1/doc/apps/req.pod
-===================================================================
---- openssl-1.0.1.orig/doc/apps/req.pod	2009-04-10 16:42:28.000000000 +0000
-+++ openssl-1.0.1/doc/apps/req.pod	2012-03-17 09:31:48.000000000 +0000
-@@ -159,7 +159,7 @@
+--- a/doc/apps/req.pod
++++ b/doc/apps/req.pod
+@@ -159,7 +159,7 @@ B<param:file> generates a key using the
  the algorithm is determined by the parameters. B<algname:file> use algorithm
  B<algname> and parameter file B<file>: the two algorithms must match or an
  error occurs. B<algname> just uses algorithm B<algname>, and parameters,
@@ -72,11 +73,9 @@ Index: openssl-1.0.1/doc/apps/req.pod
  
  B<dsa:filename> generates a DSA key using the parameters
  in the file B<filename>. B<ec:filename> generates EC key (usable both with
-Index: openssl-1.0.1/doc/apps/ts.pod
-===================================================================
---- openssl-1.0.1.orig/doc/apps/ts.pod	2009-04-10 11:25:54.000000000 +0000
-+++ openssl-1.0.1/doc/apps/ts.pod	2012-03-17 09:31:48.000000000 +0000
-@@ -352,7 +352,7 @@
+--- a/doc/apps/ts.pod
++++ b/doc/apps/ts.pod
+@@ -352,7 +352,7 @@ switch always overrides the settings in
  
  This is the main section and it specifies the name of another section
  that contains all the options for the B<-reply> command. This default
@@ -85,7 +84,7 @@ Index: openssl-1.0.1/doc/apps/ts.pod
  
  =item B<oid_file>
  
-@@ -453,7 +453,7 @@
+@@ -453,7 +453,7 @@ included. Default is no. (Optional)
  =head1 ENVIRONMENT VARIABLES
  
  B<OPENSSL_CONF> contains the path of the configuration file and can be
@@ -94,11 +93,9 @@ Index: openssl-1.0.1/doc/apps/ts.pod
  
  =head1 EXAMPLES
  
-Index: openssl-1.0.1/doc/apps/tsget.pod
-===================================================================
---- openssl-1.0.1.orig/doc/apps/tsget.pod	2010-01-05 17:17:20.000000000 +0000
-+++ openssl-1.0.1/doc/apps/tsget.pod	2012-03-17 09:31:48.000000000 +0000
-@@ -124,7 +124,7 @@
+--- a/doc/apps/tsget.pod
++++ b/doc/apps/tsget.pod
+@@ -124,7 +124,7 @@ The name of an EGD socket to get random
  =item [request]...
  
  List of files containing B<RFC 3161> DER-encoded time stamp requests. If no
@@ -107,11 +104,9 @@ Index: openssl-1.0.1/doc/apps/tsget.pod
  read from the standard input. (Optional)
  
  =back
-Index: openssl-1.0.1/doc/apps/x509v3_config.pod
-===================================================================
---- openssl-1.0.1.orig/doc/apps/x509v3_config.pod	2006-11-07 13:44:03.000000000 +0000
-+++ openssl-1.0.1/doc/apps/x509v3_config.pod	2012-03-17 09:31:48.000000000 +0000
-@@ -174,7 +174,7 @@
+--- a/doc/apps/x509v3_config.pod
++++ b/doc/apps/x509v3_config.pod
+@@ -174,7 +174,7 @@ The IP address used in the B<IP> options
  
  The value of B<dirName> should point to a section containing the distinguished
  name to use as a set of name value pairs. Multi values AVAs can be formed by