Use Digest::MD5.pm instead of MD5.pm in the SyncPlan conduit. The MD5.pm

module is superseded by Digest::MD5.pm.

4 files changed, 62 insertions, 2 deletions

diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile
index 3e3c32a8843..65684587196 100644
--- a/comms/pilotmgr/Makefile
+++ b/comms/pilotmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/09/27 23:17:50 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/10/02 06:43:39 jlam Exp $
 
 DISTNAME=	pilotmgr-1.107p2
 CATEGORIES=	comms
@@ -30,6 +30,9 @@ post-extract:
 		@${RM} -f ${WRKSRC}/SyncCM.pm
 		@${CHMOD} +x ${WRKSRC}/Setup
 
+pre-install:
+		@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
+
 do-install:
 		${INSTALL_DATA_DIR} ${PM_PERL_DIR} ${PM_DOC_DIR}
 		for FILE in ${WRKSRC}/*.pm; do \
diff --git a/comms/pilotmgr/distinfo b/comms/pilotmgr/distinfo
index 333dcf024eb..d76dce68328 100644
--- a/comms/pilotmgr/distinfo
+++ b/comms/pilotmgr/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 09:04:25 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/10/02 06:43:39 jlam Exp $
 
 SHA1 (pilotmgr-1.107p2.tar.bz2) = 3eda213891fbddc1239c49b7f704bd1447dd9112
 Size (pilotmgr-1.107p2.tar.bz2) = 161129 bytes
 SHA1 (patch-aa) = 8d9b56ca41809a8687dab48a685da4e1e80b0ab9
 SHA1 (patch-ab) = 2c6bca3b173574830866d4fc5a2909345dff4109
+SHA1 (patch-ac) = d8482ee4c6e20b264cb5262d1674a2f292d61384
+SHA1 (patch-ad) = 809277732a213516c184b8d8ba8e810c8973f82e
diff --git a/comms/pilotmgr/patches/patch-ac b/comms/pilotmgr/patches/patch-ac
new file mode 100644
index 00000000000..b450d249457
--- /dev/null
+++ b/comms/pilotmgr/patches/patch-ac
@@ -0,0 +1,40 @@
+$NetBSD: patch-ac,v 1.1 2001/10/02 06:43:39 jlam Exp $
+
+--- SyncPlan.pm.orig	Wed Mar 24 18:00:01 1999
++++ SyncPlan.pm
+@@ -17,7 +17,7 @@
+ use IO::Socket;
+ use IO::Select;
+ use Time::Local;
+-use MD5;
++use Digest::MD5;
+ use Carp;
+ use strict;
+ 
+@@ -363,7 +363,7 @@
+ 		}
+ 	}
+ 
+-	my($hash) = new MD5;
++	my($hash) = Digest::MD5->new;
+ 	foreach (@output) {
+ 		#print "Adding |$_| to hash\n";
+ 		$hash->add($_);
+@@ -553,7 +553,7 @@
+ 	my(@l) = split(/\n/,$r);
+ 	my($rec) = { raw => [@l], other => [] };
+ 	my(@E,@R,@N,@M,@S,@US);
+-	my($hash) = new MD5;
++	my($hash) = Digest::MD5->new;
+ 	$l[0] =~ s/\s+/ /g;
+ 	$hash->add($l[0]);
+ 	my($date, $time, $length, $early, $late, $flags, $color) = split(/\s+/, shift @l);
+@@ -629,7 +629,7 @@
+ 
+ sub HashPilotRecord {
+ 	my($record) = @_;
+-	my($hash) = new MD5;
++	my($hash) = Digest::MD5->new;
+ 	$hash->add($record->{raw});
+ 	$hash->hexdigest;
+ }
diff --git a/comms/pilotmgr/patches/patch-ad b/comms/pilotmgr/patches/patch-ad
new file mode 100644
index 00000000000..a4731cb5ba3
--- /dev/null
+++ b/comms/pilotmgr/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2001/10/02 06:43:39 jlam Exp $
+
+--- lib/test/SyncPlan.t.orig	Tue Mar 17 14:31:03 1998
++++ lib/test/SyncPlan.t
+@@ -30,8 +30,8 @@
+ eval "use IO::Select";
+ &complain("IO::Select", $@) if ($@);
+ 
+-eval "use MD5";
+-&complain("MD5", $@) if ($@);
++eval "use Digest::MD5";
++&complain("Digest::MD5", $@) if ($@);
+ 
+ print qq|
+ All required modules are installed properly on your system,