gitolite: update to 3.6.13

[feed/packages.git] / net / gitolite / patches / 0100-avoid-ssh-keygen.patch

diff --git a/net/gitolite/patches/0100-avoid-ssh-keygen.patch b/net/gitolite/patches/0100-avoid-ssh-keygen.patch
index 253e0f9f01e7ee6cc03d6c8da8c014d6b02ed39d..cf8cd5f2fe5dcfbfe333ccff18426b2b9c48399e 100644 (file)
--- a/net/gitolite/patches/0100-avoid-ssh-keygen.patch
+++ b/net/gitolite/patches/0100-avoid-ssh-keygen.patch
@@ -43,7 +43,7 @@ Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
 +    while ( $pos <= length($keydata) ) {
 +        $partlen = unpack('N',  substr $keydata, $pos, 4) or last;
 +        $data = unpack('s>*',  substr $keydata, $pos + 4, 4) or last;
-+      $pos = $pos + 4 + $partlen;
++    $pos = $pos + 4 + $partlen;
 +        push @keyparts, $data;
 +    }
 +    return ( $algorithm, @keyparts );
@@ -54,18 +54,18 @@ Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
 +# If the file cannot be parsed it will be undef
 +# Returns (restrictions, algorithm, PEMkey, comment)
 +sub ssh_parse_line($) {
-+   my $ssh_line = shift;
-+   my @ssh_parts = split / /, $ssh_line, 5;
-+   if (scalar @ssh_parts < 4)  {
-+      @ssh_parts = ('', @ssh_parts);
-+   }
-+   if (scalar @ssh_parts > 4) {
-+      @ssh_parts = @ssh_parts[0,3]
-+   }
-+   if (scalar @ssh_parts < 4) {
-+      @ssh_parts = undef;
-+   }
-+   return ( @ssh_parts );
++    my $ssh_line = shift;
++    my @ssh_parts = split / /, $ssh_line, 5;
++    if (scalar @ssh_parts < 4)  {
++        @ssh_parts = ('', @ssh_parts);
++    }
++    if (scalar @ssh_parts > 4) {
++        @ssh_parts = @ssh_parts[0,3]
++    }
++    if (scalar @ssh_parts < 4) {
++        @ssh_parts = undef;
++    }
++    return ( @ssh_parts );
 +}
 +
 +# ----------------------------------------------------------------------
@@ -95,7 +95,7 @@ Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
      my $in = shift;
      -f $in or die "file not found: $in\n";
      my $fh;
--    open( $fh, "ssh-keygen -l -f $in |" ) or die "could not fork: $!\n";
+-    open( $fh, "ssh-keygen -l -f $in 2>&1 |" ) or die "could not fork: $!\n";
 +    open( $fh, $in ) or die "could not open $in: $!\n";
      my $output = <$fh>;
      chomp $output;