- Add patch for Backup conduit supplied by Alan Harder which fixes

  problems with databases with slashes in their names.
- Bump version number to 1.107p1.

3 files changed, 119 insertions, 3 deletions

diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile
index c3957c9d0cd..42ed78cd266 100644
--- a/comms/pilotmgr/Makefile
+++ b/comms/pilotmgr/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.6 1999/10/07 17:41:47 tron Exp $
+# $NetBSD: Makefile,v 1.7 1999/10/22 23:31:51 tron Exp $
 
 DISTNAME=	pilotmgr-1.107
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.moshpit.org/pilotmgr/
 
 DEPENDS+=	p5-Data-Dumper-2.10:../../devel/p5-Data-Dumper
diff --git a/comms/pilotmgr/files/patch-sum b/comms/pilotmgr/files/patch-sum
index 3bd2880144d..608e8693c98 100644
--- a/comms/pilotmgr/files/patch-sum
+++ b/comms/pilotmgr/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:26 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/10/22 23:31:52 tron Exp $
 
 MD5 (patch-aa) = 7b45da352908206e1d383c46aae0029a
+MD5 (patch-ab) = fc53a3ae153dca1f7750780ff2697753
diff --git a/comms/pilotmgr/patches/patch-ab b/comms/pilotmgr/patches/patch-ab
new file mode 100644
index 00000000000..52ec5acb954
--- /dev/null
+++ b/comms/pilotmgr/patches/patch-ab
@@ -0,0 +1,114 @@
+$NetBSD: patch-ab,v 1.1 1999/10/22 23:31:53 tron Exp $
+
+--- /usr/pkg/lib/pilotmgr/Backup.pm	Tue Jul  6 21:41:45 1999
++++ Backup.pm	Thu Oct 21 08:14:38 1999
+@@ -33,7 +33,7 @@
+ my ($DEBUG) = 1;			  # Debug mode on/off
+ my ($DEBUGFILE);			  # Location of debug file
+ my ($RCFILE);				  # Location of resource file
+-my ($VERSION) = "1.007";		  # Version number
++my ($VERSION) = "1.007+";		  # Version number
+ my ($PREFS);				  # Preferences
+ my ($MAXARCHIVES) = 7;		          # Max number of archives
+ my ($MANIFEST) = ".archive_manifest";     # Tag to help protect
+@@ -626,7 +626,7 @@
+ 	    if (&fetchDB($dlp, "$PREFS->{gBackupDir}/$arch", $dbname, $info))
+ 	    {
+ 		$PREFS->{"backuprecord"}->{$dbname} = time;
+-		push(@success, $dbname);
++		push(@success, &makeFilename($dbname, $info));
+ 		$STATS{"success"}++;
+ 	    }
+ 	    else
+@@ -655,13 +655,9 @@
+ 		my $dir = shift @archList;
+ 		next if ($dir eq $arch);
+ 
+-		$file = "$dbname.pdb"
+-		    if (-f "$dir/$dbname.pdb");
++		$file = &makeFilename($dbname, $info);
+ 
+-		$file = "$dbname.prc"
+-		    if (-f "$dir/$dbname.prc");
+-
+-		if ($file)
++		if (-f "$dir/$file")
+ 		{
+ 		    PilotMgr::status("$dbname [from archive]", 
+ 				     int(100 * $count / $count_max));
+@@ -690,7 +686,7 @@
+ 			     $dbname, $info))
+ 		{
+ 		    $PREFS->{"backuprecord"}->{$dbname} = time;
+-		    push(@success, $dbname);
++		    push(@success, &makeFilename($dbname, $info));
+ 		    $STATS{"success"}++;
+ 		}
+ 		else
+@@ -705,7 +701,7 @@
+ 	    {
+ 		# Update the backup manifest
+ 		#
+-		push(@success, $dbname);
++		push(@success, &makeFilename($dbname, $info));
+ 	    }
+ 	}
+ 
+@@ -797,13 +793,10 @@
+     {
+ 	while (<FD>)
+ 	{
+-	    chop;
+-
+-	    unlink "$dir/$_.pdb"
+-		if (-f "$dir/$_.pdb");
++	    chomp;
+ 
+-	    unlink "$dir/$_.prc"
+-		if (-f "$dir/$_.prc");
++	    unlink "$dir/$_"
++		if (-f "$dir/$_");
+ 	}
+ 	close(FD);
+ 
+@@ -840,7 +833,7 @@
+     {
+ 	chomp($buf);
+ 	
+-	chop($time = `date +"%D %T`);
++	chomp($time = `date +"%D %T`);
+ 	$time .= "   ";
+ 	$pad = " " x length($time);
+ 	$buf =~ s/\n/\n$pad/g;
+@@ -857,11 +850,9 @@
+     return Dumper($obj);
+ }
+ 
+-sub fetchDB
++sub makeFilename
+ {
+-    my ($dlp, $dir, $filename, $info) = @_;
+-    my ($file);
+-    my ($err);
++    my ($filename, $info) = @_;
+ 
+     # Protect any special characters
+     $filename =~ s|=|=3D|g;
+@@ -875,7 +866,16 @@
+     {
+ 	$filename .= ".pdb";
+     }
+-    $filename = $dir . "/" . $filename;
++    return $filename;
++}
++
++sub fetchDB
++{
++    my ($dlp, $dir, $filename, $info) = @_;
++    my ($file);
++    my ($err);
++
++    $filename = $dir . "/" . &makeFilename($filename, $info);
+ 
+     $file = PDA::Pilot::File::create($filename, $info);
+     $dlp->getStatus();