Merge branch 'master' into SIMPLEROUTE

Conflicts:

	Changes
	cmd/Aliases
	perl/DXChannel.pm
	perl/DXProt.pm
	perl/DXSql/SQLite.pm
	perl/DXSql/mysql.pm
	perl/DXXml.pm
	perl/DXXml/Cmd.pm
	perl/DXXml/IM.pm
	perl/DXXml/Text.pm
	perl/Msg.pm
	perl/Route/Node.pm
	perl/Version.pm

fix conflicts from merge

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..37eee13
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+local*
+*~
+*.[oa]
+CVS

diff --git a/Changes b/Changes
index 899cc36645c101235a737934eacef90f41ce5c30..edf2bfe3d4c1077d4d8ec16139c2e75452236271 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,11 +1,41 @@
 13Jun06=======================================================================
 1. start using git.
 2. change all the version / build numbering.
-15Jan06=======================================================================
+14Jun07=======================================================================
+1. prepare for git repository and moving of anon cvs repository to
+scm.tobit.co.uk.
+11Jun07=======================================================================
+1. Change the frequency normalisation for DX Spot dupe checks so that any
+decimal part is thrown away (in other words: truncate the freq to integer khz)
+20May07=======================================================================
+1. add 1704 cty.dat
+08Apr07=======================================================================
+1. add CTY-1703 cty.dat
+2. alter the way the dupefile deletion is done.
+18Mar07=======================================================================
+1. change URL in show/425.
+04Mar07=======================================================================
+1. add CTY 1702 prefix data files
+22Feb07=======================================================================
+1. add show/myfdx to Aliases.
+15Feb07=======================================================================
+1. allow convkeps.pl to parse NORAD keps files.
+22Jan07=======================================================================
+1. disable default propagation of PC9x sentences
+2. simplify PC17 handling
+16Jan07=======================================================================
+1. back ported a change to PC16 handling so that a locally connected node's
+info clears out and generally overrides any residual PC16 info gathered from
+elsewhere.
+15Jan07=======================================================================
 1. added CTY-1701
-07Jan06=======================================================================
+07Jan07=======================================================================
 1. use IO::Socket blocking where available and switch off or ignore all
 attempts to block.
+05Jan07=======================================================================
+1. increase default ephemeral deduping on PC15 to 6 minutes (from 2).
+23Nov06=======================================================================
+1. added wrapping to over length lines in console.pl.
 03Nov06=======================================================================
 1. add CTY-1609 changes
 2. add back Geo::Taf code with submitted mods

diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644 (file)
index 0000000..0a6c856
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1,10 @@
+bad*
+debug
+*.db
+*.v?
+spots
+user*
+dupefile
+log
+wwv
+wcy

diff --git a/filter/.gitignore b/filter/.gitignore
new file mode 100644 (file)
index 0000000..150f68c
--- /dev/null
+++ b/filter/.gitignore
@@ -0,0 +1 @@
+*/*

diff --git a/msg/.gitignore b/msg/.gitignore
new file mode 100644 (file)
index 0000000..a938e09
--- /dev/null
+++ b/msg/.gitignore
@@ -0,0 +1,4 @@
+*
+!*.issue
+!distro
+!.git*

diff --git a/perl/.gitignore b/perl/.gitignore
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index e386d0849e2b5330c53a8727d1511d0eb065640f..8ab5a6fbc7e4695974050d5e87d1fb3909ed22be 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -123,7 +123,6 @@ $count = 0;
                  inqueue => '9,Input Queue,parray',
                 );
 
-
 # object destruction
 sub DESTROY
 {

diff --git a/perl/DXSql/SQLite.pm b/perl/DXSql/SQLite.pm
index 834b4b66e798447a423b6ca246f704041949520c..9819dbd0ff330a1eff6184c9e6866a529c4c5efc 100644 (file)
--- a/perl/DXSql/SQLite.pm
+++ b/perl/DXSql/SQLite.pm
@@ -12,6 +12,7 @@ package DXSql::SQLite;
 
 use DXDebug;
 
+use vars qw(@ISA);
 @ISA = qw{DXSql};
 
 sub show_tables

diff --git a/perl/DXSql/mysql.pm b/perl/DXSql/mysql.pm
index 3a638443276c92c73d2ffa5524706a241b38e5a8..6dc15d0d516f419d89e0d1eb9b70b3e618b1a827 100644 (file)
--- a/perl/DXSql/mysql.pm
+++ b/perl/DXSql/mysql.pm
@@ -12,6 +12,7 @@ package DXSql::mysql;
 
 use DXDebug;
 
+use vars qw(@ISA);
 @ISA = qw{DXSql};
 
 sub show_tables

diff --git a/perl/DXXml.pm b/perl/DXXml.pm
index 1b4d2e83cf10cb27e2ee9436c08094d3e24f8e15..3bc8427403c2f8164c65e5ad7911e20de38d4052 100644 (file)
--- a/perl/DXXml.pm
+++ b/perl/DXXml.pm
@@ -21,7 +21,7 @@ use DXXml::IM;
 use DXXml::Text;
 use DXXml::Cmd;
 
-use vars qw($VERSION $BRANCH $xs $id $max_old_age $max_future_age $dupeage);
+use vars qw($xs $id $max_old_age $max_future_age $dupeage);
 $xs = undef;                                   # the XML::Simple parser instance
 $id = 0;                                               # the next ID to be used
 $max_old_age = 3600;                   # how old a sentence we will accept

diff --git a/perl/Version.pm b/perl/Version.pm
index 92136f5750e3d5e6678b53d392df93a4b5fe523b..230b4a8395da398715f4d4b2bf8dc7f22e41a360 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -1,10 +1,15 @@
 #
-# $Id$
+# Version information for DXSpider
+#
+# DO NOT ALTER THIS FILE. It is generated automatically
+# and will be overwritten
 #
 
 package main;
 
 use vars qw($version $build);
 
-$version = "1.54";
-$build = 467;
+$version = '1.54';
+$build = '3';
+
+1;

diff --git a/perl/cluster.pl b/perl/cluster.pl
index c517a23179d9d2eb35c8849bde6d57490bca12e0..3c4548b6414b83441e9d9bec69c57fb8c71cb005 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -123,7 +123,7 @@ use vars qw(@inqueue $systime $starttime $lockfn @outstanding_connects
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
 $starttime = 0;                 # the starting time of the cluster   
-#@outstanding_connects = ();     # list of outstanding connects
+@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();                               # list of listeners
 $reqreg = 0;                                   # 1 = registration required, 2 = deregister people
 $bumpexisting = 1;                             # 1 = allow new connection to disconnect old, 0 - don't allow it

diff --git a/perl/issue.pl b/perl/issue.pl
new file mode 100755 (executable)
index 0000000..6d2bfd3
--- /dev/null
+++ b/perl/issue.pl
@@ -0,0 +1,41 @@
+#!/usr/bin/perl
+#
+# create a version and build id for the project using git ids
+#
+# $Id$
+#
+# Copyright (c) 2007 Dirk Koopman, G1TLH
+#
+
+# Determine the correct place to put stuff
+BEGIN {
+       # root of directory tree for this system
+       $root = "/spider";
+       $root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
+}
+
+use strict;
+
+use vars qw($root);
+my $fn = "$root/perl/Version.pm";
+my $desc = `git-describe`;
+my ($v, $b) = $desc =~ /^([\d.]+)-(\d+)-/;
+$b++;                  # to account for the commit that is about to happen
+
+open F, ">$fn" or die "issue.pl: can't open $fn $!\n";
+print F qq(#
+# Version information for DXSpider
+#
+# DO NOT ALTER THIS FILE. It is generated automatically
+# and will be overwritten
+#
+
+package main;
+
+use vars qw(\$version \$build);
+
+\$version = '$v';
+\$build = '$b';
+
+1;
+);