New upstream version 1.4

17 files changed, 41 insertions, 26 deletions

diff --git a/client/wallet-rekey.1 b/client/wallet-rekey.1
index c9bb847..27d5200 100644
--- a/client/wallet-rekey.1
+++ b/client/wallet-rekey.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "WALLET-REKEY 1"
-.TH WALLET-REKEY 1 "2018-06-03" "1.4" "wallet"
+.TH WALLET-REKEY 1 "2018-06-04" "1.4" "wallet"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/client/wallet.1 b/client/wallet.1
index 449cc9e..228dc98 100644
--- a/client/wallet.1
+++ b/client/wallet.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "WALLET 1"
-.TH WALLET 1 "2018-06-03" "1.4" "wallet"
+.TH WALLET 1 "2018-06-04" "1.4" "wallet"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/contrib/wallet-rekey-periodic.8 b/contrib/wallet-rekey-periodic.8
index f2f619a..3d48459 100644
--- a/contrib/wallet-rekey-periodic.8
+++ b/contrib/wallet-rekey-periodic.8
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "WALLET-REKEY-PERIODIC 8"
-.TH WALLET-REKEY-PERIODIC 8 "2018-06-03" "1.4" "wallet"
+.TH WALLET-REKEY-PERIODIC 8 "2018-06-04" "1.4" "wallet"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/contrib/wallet-summary.8 b/contrib/wallet-summary.8
index 08a01d6..0fda9b3 100644
--- a/contrib/wallet-summary.8
+++ b/contrib/wallet-summary.8
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "WALLET-SUMMARY 8"
-.TH WALLET-SUMMARY 8 "2018-06-03" "1.4" "wallet"
+.TH WALLET-SUMMARY 8 "2018-06-04" "1.4" "wallet"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/contrib/wallet-unknown-hosts.8 b/contrib/wallet-unknown-hosts.8
index 4046854..8b1bdc4 100644
--- a/contrib/wallet-unknown-hosts.8
+++ b/contrib/wallet-unknown-hosts.8
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "WALLET-UNKNOWN-HOSTS 8"
-.TH WALLET-UNKNOWN-HOSTS 8 "2018-06-03" "1.4" "wallet"
+.TH WALLET-UNKNOWN-HOSTS 8 "2018-06-04" "1.4" "wallet"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/m4/perl.m4 b/m4/perl.m4
index 6080c3d..432913c 100644
--- a/m4/perl.m4
+++ b/m4/perl.m4
@@ -104,4 +104,14 @@ AC_DEFUN([RRA_LIB_PERL],
  rra_perl_core_libs=`echo "$rra_perl_core_libs" | sed 's/  *$//'`
  PERL_CPPFLAGS="$rra_perl_core_flags"
  PERL_LIBS="$rra_perl_core_libs"
- AC_MSG_RESULT([$PERL_LIBS])])
+ AC_MSG_RESULT([$PERL_LIBS])
+ rra_perl_save_CPPFLAGS="$CPPFLAGS"
+ rra_perl_save_LIBS="$LIBS"
+ CPPFLAGS="$PERL_CPPFLAGS $CPPFLAGS"
+ LIBS="$PERL_LIBS $LIBS"
+ AC_CHECK_HEADER([EXTERN.h], [],
+    [AC_MSG_FAILURE([unable to compile with EXTERN.h])])
+ AC_CHECK_FUNC([perl_alloc], [],
+    [AC_MSG_FAILURE([unable to link with Perl library])])
+ CPPFLAGS="$rra_perl_save_CPPFLAGS"
+ LIBS="$rra_perl_save_LIBS"])
diff --git a/server/keytab-backend.8 b/server/keytab-backend.8
index 8de167b..56320a1 100644
--- a/server/keytab-backend.8
+++ b/server/keytab-backend.8
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "KEYTAB-BACKEND 8"
-.TH KEYTAB-BACKEND 8 "2018-06-03" "1.4" "wallet"
+.TH KEYTAB-BACKEND 8 "2018-06-04" "1.4" "wallet"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/server/wallet-admin.8 b/server/wallet-admin.8
index 504fce2..aa8770e 100644
--- a/server/wallet-admin.8
+++ b/server/wallet-admin.8
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "WALLET-ADMIN 8"
-.TH WALLET-ADMIN 8 "2018-06-03" "1.4" "wallet"
+.TH WALLET-ADMIN 8 "2018-06-04" "1.4" "wallet"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/server/wallet-backend.8 b/server/wallet-backend.8
index ac72fd1..9bd8510 100644
--- a/server/wallet-backend.8
+++ b/server/wallet-backend.8
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "WALLET-BACKEND 8"
-.TH WALLET-BACKEND 8 "2018-06-03" "1.4" "wallet"
+.TH WALLET-BACKEND 8 "2018-06-04" "1.4" "wallet"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/server/wallet-report.8 b/server/wallet-report.8
index 6b4a90b..6e30aa4 100644
--- a/server/wallet-report.8
+++ b/server/wallet-report.8
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "WALLET-REPORT 8"
-.TH WALLET-REPORT 8 "2018-06-03" "1.4" "wallet"
+.TH WALLET-REPORT 8 "2018-06-04" "1.4" "wallet"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/tests/docs/spdx-license-t b/tests/docs/spdx-license-t
index e05e13f..91072bf 100755
--- a/tests/docs/spdx-license-t
+++ b/tests/docs/spdx-license-t
@@ -53,6 +53,7 @@ my @IGNORE = (
     qr{ [.] output \z }xms,             # Test data
 );
 my @IGNORE_PATHS = (
+    qr{ \A debian/ }xms,                       # Found in debian/* branches
     qr{ \A docs/metadata/ }xms,                # Package license should be fine
     qr{ \A docs/protocol[.](html|txt) \z }xms, # Generated by xml2rfc
     qr{ \A m4/ (libtool|lt.*) [.] m4 \z }xms,  # Files from Libtool
diff --git a/tests/tap/libtap.sh b/tests/tap/libtap.sh
index 38181d9..1827a68 100644
--- a/tests/tap/libtap.sh
+++ b/tests/tap/libtap.sh
@@ -10,8 +10,8 @@
 # <https://www.eyrie.org/~eagle/software/c-tap-harness/>.
 #
 # Written by Russ Allbery <eagle@eyrie.org>
-# Copyright 2009, 2010, 2011, 2012, 2016 Russ Allbery <eagle@eyrie.org>
-# Copyright 2006, 2007, 2008, 2013
+# Copyright 2009-2012, 2016 Russ Allbery <eagle@eyrie.org>
+# Copyright 2006-2008, 2013
 #     The Board of Trustees of the Leland Stanford Junior University
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/tests/tap/macros.h b/tests/tap/macros.h
index 32ed815..cc6d104 100644
--- a/tests/tap/macros.h
+++ b/tests/tap/macros.h
@@ -8,7 +8,7 @@
  * This file is part of C TAP Harness.  The current version plus supporting
  * documentation is at <https://www.eyrie.org/~eagle/software/c-tap-harness/>.
  *
- * Copyright 2008, 2012, 2013, 2015 Russ Allbery <eagle@eyrie.org>
+ * Copyright 2008, 2012-2013, 2015 Russ Allbery <eagle@eyrie.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/tests/tap/perl/Test/RRA.pm b/tests/tap/perl/Test/RRA.pm
index 807508c..3b2f584 100644
--- a/tests/tap/perl/Test/RRA.pm
+++ b/tests/tap/perl/Test/RRA.pm
@@ -246,7 +246,9 @@ Russ Allbery <eagle@eyrie.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2013, 2014 The Board of Trustees of the Leland Stanford Junior
+Copyright 2016 Russ Allbery <eagle@eyrie.org>
+
+Copyright 2013-2014 The Board of Trustees of the Leland Stanford Junior
 University
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/tests/tap/perl/Test/RRA/Automake.pm b/tests/tap/perl/Test/RRA/Automake.pm
index e4db56c..69fff6a 100644
--- a/tests/tap/perl/Test/RRA/Automake.pm
+++ b/tests/tap/perl/Test/RRA/Automake.pm
@@ -451,7 +451,7 @@ Russ Allbery <eagle@eyrie.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2014, 2015, 2018 Russ Allbery <eagle@eyrie.org>
+Copyright 2014-2015, 2018 Russ Allbery <eagle@eyrie.org>
 
 Copyright 2013 The Board of Trustees of the Leland Stanford Junior University
 
diff --git a/tests/tap/perl/Test/RRA/Config.pm b/tests/tap/perl/Test/RRA/Config.pm
index 7cb0916..40641f1 100644
--- a/tests/tap/perl/Test/RRA/Config.pm
+++ b/tests/tap/perl/Test/RRA/Config.pm
@@ -187,9 +187,9 @@ Russ Allbery <eagle@eyrie.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2015, 2016 Russ Allbery <eagle@eyrie.org>
+Copyright 2015-2016 Russ Allbery <eagle@eyrie.org>
 
-Copyright 2013, 2014 The Board of Trustees of the Leland Stanford Junior
+Copyright 2013-2014 The Board of Trustees of the Leland Stanford Junior
 University
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/tests/tap/perl/Test/RRA/ModuleVersion.pm b/tests/tap/perl/Test/RRA/ModuleVersion.pm
index 49acac4..8b6dba2 100644
--- a/tests/tap/perl/Test/RRA/ModuleVersion.pm
+++ b/tests/tap/perl/Test/RRA/ModuleVersion.pm
@@ -129,21 +129,23 @@ sub _module_version {
 #  Throws: Text exception on I/O failure or inability to find version
 sub _update_module_version {
     my ($file, $version) = @_;
-    open(my $in, q{<}, $file) or die "$0: cannot open $file: $!\n";
-    open(my $out, q{>}, "$file.new")
-      or die "$0: cannot create $file.new: $!\n";
 
-    # If the version starts with v, use it without quotes.  Otherwise, quote
-    # it to prevent removal of trailing zeroes.
-    if ($version !~ m{ \A v }xms) {
-        $version = "'$version'";
+    # The old-style syntax may require different quoting.  If the version
+    # starts with v, use it without quotes.  Otherwise, quote it to prevent
+    # removal of trailing zeroes.
+    my $old_version = $version;
+    if ($old_version !~ m{ \A v }xms) {
+        $old_version = "'$old_version'";
     }
 
     # Scan for the version and replace it.
+    open(my $in, q{<}, $file) or die "$0: cannot open $file: $!\n";
+    open(my $out, q{>}, "$file.new")
+      or die "$0: cannot create $file.new: $!\n";
   SCAN:
     while (defined(my $line = <$in>)) {
         if (   $line =~ s{ $REGEX_VERSION_PACKAGE }{$1$version$3}xms
-            || $line =~ s{ $REGEX_VERSION_OLD     }{$1$version$3}xms)
+            || $line =~ s{ $REGEX_VERSION_OLD     }{$1$old_version$3}xms)
         {
             print {$out} $line or die "$0: cannot write to $file.new: $!\n";
             last SCAN;
@@ -267,7 +269,7 @@ Russ Allbery <eagle@eyrie.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2016 Russ Allbery <eagle@eyrie.org>
+Copyright 2016, 2018 Russ Allbery <eagle@eyrie.org>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal