[Pkg-openssl-changes] r504 - openssl/trunk/debian/patches

[Kurt Roeckx]

Author: kroeckx
Date: 2011-06-13 10:51:36 +0000 (Mon, 13 Jun 2011)
New Revision: 504

Modified:
   openssl/trunk/debian/patches/pkcs12-doc.patch
Log:
Make the patch actually apply.


Modified: openssl/trunk/debian/patches/pkcs12-doc.patch
===================================================================
--- openssl/trunk/debian/patches/pkcs12-doc.patch	2011-06-13 10:42:27 UTC (rev 503)
+++ openssl/trunk/debian/patches/pkcs12-doc.patch	2011-06-13 10:51:36 UTC (rev 504)
@@ -9,34 +9,28 @@
 below makes this explicit.
 
 
-diff --git a/doc/apps/pkcs12.pod b/doc/apps/pkcs12.pod
---- a/doc/apps/pkcs12.pod
-+++ b/doc/apps/pkcs12.pod
+Index: openssl-1.0.0d/doc/apps/pkcs12.pod
+===================================================================
+--- openssl-1.0.0d.orig/doc/apps/pkcs12.pod	2011-06-13 10:46:06.000000000 +0000
++++ openssl-1.0.0d/doc/apps/pkcs12.pod	2011-06-13 10:47:36.000000000 +0000
 @@ -67,7 +67,7 @@
-  The filename to write certificates and private keys to, standard output by
-  default.  They are all written in PEM format.
-
+ The filename to write certificates and private keys to, standard output by
+ default.  They are all written in PEM format.
+ 
 -=item B<-pass arg>, B<-passin arg>
 +=item B<-passin arg>
-
-  the PKCS#12 file (i.e. input file) password source. For more 
-information about
-  the format of B<arg> see the B<PASS PHRASE ARGUMENTS> section in
+ 
+ the PKCS#12 file (i.e. input file) password source. For more information about
+ the format of B<arg> see the B<PASS PHRASE ARGUMENTS> section in
 @@ -79,6 +79,11 @@
-  information about the format of B<arg> see the B<PASS PHRASE 
-ARGUMENTS> section
-  in L<openssl(1)|openssl(1)>.
-
+ information about the format of B<arg> see the B<PASS PHRASE ARGUMENTS> section
+ in L<openssl(1)|openssl(1)>.
+ 
 +=item B<-password arg>
 +
 +With -export, -password is equivalent to -passout.
 +Otherwise, -password is equivalent to -passin.
 +
-  =item B<-noout>
-
-  this option inhibits output of the keys and certificates to the output 
-file
-
-
-
-
+ =item B<-noout>
+ 
+ this option inhibits output of the keys and certificates to the output file