From 5082f3c7fd852bae98e1c0e252ad19a9bfbb6d0c Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 21 Sep 2002 01:45:39 +0000
Subject: Store unkown fields from mix summary lines and put them in keyrings

---
 Echolot/Conf.pm  | 29 ++++++++++++++++++++++++++---
 NEWS             |  3 +++
 debian/changelog |  6 ++++++
 pingd            |  4 ++--
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/Echolot/Conf.pm b/Echolot/Conf.pm
index 890bf1c..271b14c 100644
--- a/Echolot/Conf.pm
+++ b/Echolot/Conf.pm
@@ -1,7 +1,7 @@
 package Echolot::Conf;
 
 # (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Conf.pm,v 1.29 2002/09/10 20:04:46 weasel Exp $
+# $Id: Conf.pm,v 1.30 2002/09/21 01:45:39 weasel Exp $
 #
 
 =pod
@@ -254,14 +254,37 @@ sub parse_mix_key($$$) {
 
 	my %mixmasters;
 	# rot26 rot26@mix.uucico.de 7f6d997678b19ccac110f6e669143126 2.9b33 MC
-	my @mix_confs = ($reply =~ /^[a-z0-9]+ \s+ \S+\@\S+ \s+ [0-9a-f]{32} (?:\s+ \S+ (?:[ \t]+ \S+)?)?/xmg);
+	my @mix_confs = ($reply =~ /^
+		[a-z0-9]+
+		\s+
+		\S+\@\S+
+		\s+
+		[0-9a-f]{32}
+		.*?$/xmg);
 	my @mix_keys = ($reply =~ /^-----Begin \s Mix \s Key-----\r?\n
 	                          [0-9a-f]{32}\r?\n
 							  \d+\r?\n
 							  (?:[a-zA-Z0-9+\/]*\r?\n)+
 							  -----End \s Mix \s Key-----$/xmg );
 	for (@mix_confs) {
-		my ($nick, $address, $keyid, $version, $caps) = /^([a-z0-9]+) \s+ (\S+@\S+) \s+ ([0-9a-f]{32}) (?:(\S+) (?:[\t]+ (\S+)))?/x;
+		my ($nick, $address, $keyid, $version, $caps, $created, $expires) = /^
+			([a-z0-9]+)
+			\s+
+			(\S+@\S+)
+			\s+
+			([0-9a-f]{32})
+			(?: [ \t]+
+			   (\S+)
+			   (?: [ \t]+
+			      (\S+)
+			      (?: [ \t]+
+			         (\d{4}-\d{2}-\d{2})
+			         (?: [ \t]+
+			            (\d{4}-\d{2}-\d{2})
+			         )?
+			      )?
+			   )?
+			)?/x;
 		$mixmasters{$keyid} = {
 			nick	=> $nick,
 			address => $address,
diff --git a/NEWS b/NEWS
index 4b98fea..09fd93b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Changes in version 2.0.1 - 2002-09-21
+	* Store unkown fields from mix summary lines and put them in keyrings.
+
 Changes in version 2.0 - 2002-09-17
 	* New version number, this is 2.0, really!
 	* Minor spelling fixes.
diff --git a/debian/changelog b/debian/changelog
index 4e7054d..fbe0e63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+echolot (2.0.1-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Peter Palfrader <weasel@debian.org>  Sat, 21 Sep 2002 03:45:14 +0200
+
 echolot (2.0-1) unstable; urgency=low
 
   * New upstream version:
diff --git a/pingd b/pingd
index a9ae7c2..5ed26eb 100755
--- a/pingd
+++ b/pingd
@@ -3,7 +3,7 @@
 $| = 1;
 
 # (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: pingd,v 1.77 2002/09/17 04:18:18 weasel Exp $
+# $Id: pingd,v 1.78 2002/09/21 01:45:39 weasel Exp $
 #
 
 =pod
@@ -294,7 +294,7 @@ use POSIX qw(setsid);
 delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
 
 
-my $VERSION = '2.0';
+my $VERSION = '2.0.1';
 
 
 my $redirected_stdio = 0;
-- 
cgit v1.2.3