Next release is 0.7

0.6.1 was a maintenance release, but 0.6.2
should have been 0.7 already. Fix that for
the future.

Signed-off-by: Thomas Hochstein <thh@thh.name>

.gitignore

@@ -1 +0,0 @@
-TODO

ChangeLog

@@ -1,48 +1,65 @@
-Version 0.6 (2011-10-24)
+checkmail 0.7 (unreleased)
+
+* Re-format ChangeLog.
+* Update POD documentation (repository, issue tracker).
+* Add README.
+* Change mail address.
+* Fix display of CNAME/A records in log file.
+
+
+checkmail 0.6.2 (2016-01-09)
+
+* Try to handle CNAMEs and resolve them to A records.
+  Change documentation accordingly.
+  Fixes #55.
+
+* Allow setting an empty envelope-from ('<>') using '-s'.
+  Change documentation accordingly.
+  Update version and copyright dates.
+  Fixes #54.
+
+
+checkmail 0.6.1 (2011-12-04)
+
+* Fix annoying error message (and some small changes).
+
+
+checkmail 0.6 (2011-10-24)
 
 * Don't temp-fail on random address check.
-  Thomas Hochstein <thh@inter.net> Mon Oct 24 22:27:01 2011 +0200
 
 * Fix regexp for syntax check.
-  Thomas Hochstein <thh@inter.net> Sun Jul 24 12:28:26 2011 +0200
 
 
-Version 0.5
+checkmail 0.5
 
 * Add syntax check for mail addresses.
   Change documentation accordingly.
   Fixes #11.
-  Thomas Hochstein <thh@inter.net> Sat Jul 23 23:53:22 2011 +0200
 
 
-Version 0.4
+checkmail 0.4
 
 * Add overrides for configuration (MAIL FROM/EHLO).
   New commandline options: -s <sender> and -e <EHLO>.
   Change documentation accordingly.
-  Thomas Hochstein <thh@inter.net> Thu Jun 17 22:56:14 2010 +0200
     
 * Replace splitaddress() by Mail::Address.
-  Thomas Hochstein <thh@inter.net> Wed Jun 16 22:08:22 2010 +0200
     
 * -r: Create a really random localpart.
   Add create_rand_addr().
-  Thomas Hochstein <thh@inter.net> Wed Jun 16 21:51:50 2010 +0200
 
 * Analyze failure codes, don't fail on temporary failures.
   Add analyze_smtp_reply().
   Fixes #8.
-  Thomas Hochstein <thh@inter.net> Wed Jun 16 21:37:43 2010 +0200
 
 
-Version 0.3
+checkmail 0.3
 
 * Add Changelog.
-  Thomas Hochstein <thh@inter.net> 2010-06-16 22:48:23 +0200
 
 * Add documentation in POD format.
   - Drop checkmail.readme
-  Thomas Hochstein <thh@inter.net> 2010-06-16 21:11:43 +0200
 
 * Complete rewrite.
   - use strict;
@@ -55,10 +72,8 @@ Version 0.3
   - batch processing: set exit status to highest generated value
   Fixes #9.
   Fixes #10.
-  Thomas Hochstein <thh@inter.net> 2010-06-16 21:11:23 +0200
 
 
-Version 0.2
+checkmail 0.2
 
 * Initial check-in.
-  Thomas Hochstein <thh@inter.net> Wed Aug 3 22:00:00 2005 +0200

README.md

@@ -0,0 +1,13 @@
+# checkmail
+
+## Description
+
+**checkmail** determines the mail server (or servers) responsible for the domain of the mail address (MXes); if none are available, it falls back on the host with the corresponding name (if available). It then establishes an SMTP connection and goes through the SMTP dialogue until just before an email is actually sent and checks whether mail to the recipient address would be accepted in principle. If desired, checkmail can also test sending to an address that is certainly invalid in order to check whether the replies from the recipient mail server are reliable at all or whether every recipient address is accepted (initially).
+
+The sender of the apparent test email and the HELO parameter to be used can be configured in the script or passed as a parameter during the call.
+
+Additional options can be used to check several addresses present in a text file, to display the complete SMTP dialogue or to force a connection to a specific mail server (instead of checking the relevant MXes).
+
+## More information
+
+Please see the [distribution page](https://th-h.de/net/software/checkmail/) (in German).

TODO

@@ -0,0 +1,7 @@
+                         checkmail To-Do-Liste
+                         =====================
+
+* better analyze SMTP response codes
+
+
+

checkmail.pl

@@ -1,15 +1,15 @@
-#! /usr/bin/perl -W
+#! /usr/bin/perl -w
 #
-# checkmail Version 0.5 by Thomas Hochstein
+# checkmail
 #
 # This script tries to verify the deliverability of (a) mail address(es).
 # 
-# Copyright (c) 2002-2011 Thomas Hochstein <thh@inter.net>
+# Copyright (c) 2002-2016 Thomas Hochstein <thh@thh.name>
 #
 # It can be redistributed and/or modified under the same terms under 
 # which Perl itself is published.
 
-our $VERSION = "0.6";
+our $VERSION = "0.7 (unreleased)";
 
 ################################# Configuration ################################
 # Please fill in a working configuration!
@@ -39,7 +39,7 @@ getopts('Vhqlrf:m:s:e:', \%options);
 
 # -V: display version
 if ($options{'V'}) {
-  print "$myself v $VERSION\nCopyright (c) 2010 Thomas Hochstein <thh\@inter.net>\n";
+  print "$myself v $VERSION\nCopyright (c) 2002-2016 Thomas Hochstein <thh\@thh.name>\n";
   print "This program is free software; you may redistribute it and/or modify it under the same terms as Perl itself.\n";
   exit(100);
 };
@@ -67,7 +67,7 @@ if (!$options{'f'} and !$ARGV[0]) {
 };
 
 # -s / -e: override configuration
-$config{'from'} = $options{'s'} if $options{'s'};
+$config{'from'} = $options{'s'} if defined($options{'s'});
 $config{'helo'} = $options{'e'} if $options{'e'};
 
 # -f: open file and read addresses to @adresses
@@ -154,11 +154,20 @@ sub gettargets {
   # no MX record found; log and try A record(s)
   } else {
     print_dns_result($domain,'MX',undef,$resolver->errorstring,$logr);
-    print("    Falling back to A record ...\n") if !($options{'q'});
-	# get A record(s)
+    print("    Falling back to A record(s) ...\n") if !($options{'q'});
+    # get A record(s)
+    # may get CNAMEs instead ...
     if (my $query = $resolver->query($domain,'A','IN')) {
-      print_dns_result($domain,'A',$query->header->ancount,undef,$logr);
+      print_dns_result($domain,'A/CNAME',$query->header->ancount,undef,$logr);
       foreach my $rr ($query->answer) {
+        if ($rr->type ne 'A') {
+          # report CNAMEs and don't add them to target list
+          if ($rr->type eq 'CNAME') {
+            printf ("  ~ '%s' is a CNAME for '%s' and will be resolved accordingly. \n",$rr->name,$rr->cname) if !($options{'q'});
+            $$logr .= sprintf("- CNAME resolved: %s -> %s\n",$rr->name,$rr->cname);
+          }
+          next;
+        }
         $targets{$rr->address} = 0;
         $$logr .= sprintf("- %s\n",$rr->address);
       };
@@ -440,6 +449,7 @@ The hostname to be used for I<HELO> or I<EHLO> in the SMTP dialog.
 =item B<$config{'from'}>
 
 The sender address to be used for I<MAIL FROM> while testing.
+May be empty ('') to set '<>' as MAIL FROM.
 
 =back
 
@@ -460,11 +470,12 @@ them in order of precedence (if necessary). It will run through the
 SMTP dialog until just before the I<DATA> stage, i.e. doing I<EHLO>,
 I<MAIL FROM> and I<RCPT TO>. If no MX is defined, B<checkmail> will
 fall back to the I<example.org> host itself, provided there is at
-least one A record defined in the DNS. If there are neither MX nor A
-records for I<example.org>, mail is not deliverable and B<checkmail>
-will fail accordingly. If no host can be reached, B<checkmail> will
-fail, too. Finally B<checkmail> will fail if mail to the given
-recipient is not accepted by the respective host.
+least one A record defined in the DNS. CNAMEs will be accepted and
+resolved here. If there are neither MX nor A records for
+I<example.org>, mail is not deliverable and B<checkmail> will fail
+accordingly. If no host can be reached, B<checkmail> will fail,
+too. Finally B<checkmail> will fail if mail to the given recipient
+is not accepted by the respective host.
 
 If B<checkmail> fails, you'll not be able to deliver mail to that
 address - at least not using the configured sender address and from
@@ -600,25 +611,23 @@ The script itself.
 =head1 BUGS
 
 Please report any bugs or feature request to the author or use the
-bug tracker at L<http://bugs.th-h.de/>!
+bug tracker at L<https://code.virtcomm.de/thh/checkmail/issues>!
 
 =head1 SEE ALSO
 
-L<http://th-h.de/download/scripts.php> will have the current
+L<https://th-h.de/net/software/checkmail/> will have the current
 version of this program.
 
-This program is maintained using the Git version control system. You
-may clone L<git://code.th-h.de/mail/checkmail.git> to check out the
-current development tree or browse it on the web via
-L<http://code.th-h.de/?p=mail/checkmail.git>.
+This program is maintained using the Git version control system at
+L<https://code.virtcomm.de/thh/checkmail>.
 
 =head1 AUTHOR
 
-Thomas Hochstein <thh@inter.net>
+Thomas Hochstein <thh@thh.name>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2002-2010 Thomas Hochstein <thh@inter.net>
+Copyright (c) 2002-2016 Thomas Hochstein <thh@thh.name>
 
 This program is free software; you may redistribute it and/or modify it
 under the same terms as Perl itself.