[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Rich Salz]

The branch OpenSSL_1_0_1-stable has been updated
       via  2df0ba9b4f20f07f7d5bead4d2107d29d62b1798 (commit)
      from  76b49a8ad7759c2b702376d1ebc90008bdc26373 (commit)


- Log -----------------------------------------------------------------
commit 2df0ba9b4f20f07f7d5bead4d2107d29d62b1798
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Jul 15 13:40:04 2012 +0000

    mk1mf.pl: replace chop for windows.
    
    Backport old patch to make it work in mixture of perls for Windows.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Cherry-picked from 7bb98eee3c9e4694dfc2217001d5075ce8d2906e
    
    (cherry picked from commit 051b41df4105355a5a9c7f1c0bd00cc70b2d324c)

-----------------------------------------------------------------------

Summary of changes:
 util/mk1mf.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 550ef9f..1eee7aa 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -326,7 +326,7 @@ open(IN,"<$infile") || die "unable to open $infile:$!\n";
 $_=<IN>;
 for (;;)
 	{
-	chop;
+	s/\s*$//; # was chop, didn't work in mixture of perls for Windows...
 
 	($key,$val)=/^([^=]+)=(.*)/;
 	if ($key eq "RELATIVE_DIRECTORY")