***************
*** 8,14 ****
  # suitable for use by dot or neato (package name graphviz,
  # http://www.research.att.com/sw/tools/graphviz/) like so:
  #
- # gpg --list-sigs --keyring /usr/share/keyrings/debian-keyring.gpg | ./sig2dot.pl > debian-keyring.dot
  # neato -Tps debian-keyring.dot > debian-keyring.neato.dot.ps
  # dot -Tps debian-keyring.dot > debian-keyring.dot.dot.ps
  #
--- 8,14 ----
  # suitable for use by dot or neato (package name graphviz,
  # http://www.research.att.com/sw/tools/graphviz/) like so:
  #
+ # gpg --with-colons --check-sigs --keyring /usr/share/keyrings/debian-keyring.gpg | ./sig2dot.pl > debian-keyring.dot
  # neato -Tps debian-keyring.dot > debian-keyring.neato.dot.ps
  # dot -Tps debian-keyring.dot > debian-keyring.dot.dot.ps
  #
***************
*** 21,43 ****
  # v0.15 Jun 20 17:16 fixed blue, green is proportional to ratio
  # v0.16 Jun 20 18:55 uniqed %signedby
  # v0.17 Jan 10 19:10 Use overlap=scale instead of fixed edge lengths.  Requires graphviz v1.7.8.
  
  while ($line = <STDIN>)
  {
    chomp $line;
-   if ($line =~ m#([^ ]+) +([^ ]+) +[^ ]+ +([^<]+)#)
    {
-     $type = $1;
-     $id = $2;
-     $name = $3;
      # strip trailing whitespace more cleanly:
      $name =~ s/\s+$//g;
  
      if ($type eq "pub")
      {
-       $id = (split('/',$id))[1];
        $owner = $id; 
      } 
  
      $name{$id} = $name;
  
--- 21,49 ----
  # v0.15 Jun 20 17:16 fixed blue, green is proportional to ratio
  # v0.16 Jun 20 18:55 uniqed %signedby
  # v0.17 Jan 10 19:10 Use overlap=scale instead of fixed edge lengths.  Requires graphviz v1.7.8.
+ # v0.18?  2003-07-11    Jeremy Portzer <jeremyp@pobox.com>   patch to use --with-colons input
  
  while ($line = <STDIN>)
  {
    chomp $line;
+   if ($line =~ /^(pub|sig)/ )		#types we can process
    {
+     @fields = split(/:/,$line);
+     $type = $fields[0];
+     $id = $fields[4];
+     $name = $fields[9];
+  
+     #strip off leading 8 bytes of key ID that we don't need
+     $id = substr($id,8);
+     
      # strip trailing whitespace more cleanly:
      $name =~ s/\s+$//g;
  
      if ($type eq "pub")
      {
        $owner = $id; 
      } 
+     print STDERR "Processing owner,type,id,name : $owner,$type,$id,$name\n";
  
      $name{$id} = $name;