Fix deprecation warnings for new Autoconf

wallet should now work properly with Autoconf 2.71.  This required
updating tests/docs/spdx-license-t from rra-c-util, which in turn
bumped the minimum required Perl version for the test suite to 5.10.
That's not yet reflected in the documentation.

diff --git a/.gitignore b/.gitignore
index cca306910544bd80d35128586bb259afff00be1d..91b7ea641610ba6c60e634784b1007f927744a83 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 /config.log
 /config.status
 /configure
+/configure~
 /perl/Build
 /perl/MYMETA.json
 /perl/MYMETA.yml

diff --git a/configure.ac b/configure.ac
index 80eeee13fa69c3ff83e18eb822ab2aec98d1e9b1..b8f84f521471d532ea33b450ec77447003bea7ae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Autoconf configuration for wallet.
 dnl
 dnl Written by Russ Allbery <eagle@eyrie.org>
-dnl Copyright 2014, 2016, 2018, 2020 Russ Allbery <eagle@eyrie.org>
+dnl Copyright 2014, 2016, 2018, 2020-2021 Russ Allbery <eagle@eyrie.org>
 dnl Copyright 2006-2008, 2010, 2013-2014
 dnl     The Board of Trustees of the Leland Stanford Junior University
 dnl
@@ -39,12 +39,12 @@ AC_PROG_MKDIR_P
 dnl Allow modification of the default wallet port, and setting a default
 dnl wallet server when none is defined in krb5.conf.
 AC_ARG_WITH([wallet-server],
-    [AC_HELP_STRING([--with-wallet-server=HOST], [Default wallet server])],
+    [AS_HELP_STRING([--with-wallet-server=HOST], [Default wallet server])],
     [AS_IF([test x"$withval" != xno && test x"$withval" != xyes],
         [AC_DEFINE_UNQUOTED([WALLET_SERVER], ["$withval"],
             [Define to the default server host name.])])])
 AC_ARG_WITH([wallet-port],
-    [AC_HELP_STRING([--with-wallet-port=PORT],
+    [AS_HELP_STRING([--with-wallet-port=PORT],
         [Default wallet server port])],
     [AS_IF([test x"$withval" != xno && test x"$withval" != xyes],
         [AC_DEFINE_UNQUOTED([WALLET_PORT], [$withval],
@@ -97,7 +97,7 @@ AS_IF([test x"$REMCTLD" != x],
         [Define to the full path to remctld to run remctl tests.])])
 
 dnl Output section.
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([tests/client/basic-t], [chmod +x tests/client/basic-t])
 AC_CONFIG_FILES([tests/client/full-t], [chmod +x tests/client/full-t])

diff --git a/tests/data/perl.conf b/tests/data/perl.conf
index 0c1e34ef053f888f0c36d60d17f6cf8cf1777523..1aad2a02ba6ce757e8050dba56de638907792e03 100644 (file)
--- a/tests/data/perl.conf
+++ b/tests/data/perl.conf
@@ -1,5 +1,8 @@
 # Configuration for Perl tests.  -*- perl -*-
 
+# Default minimum version requirement.
+$MINIMUM_VERSION = '5.010';
+
 # Wallet::Schema's version number is used to version the database schema and
 # requires upgrade SQL files for each version bump.  Until this is replaced
 # with some better system, exclude it from version checking.

diff --git a/tests/docs/spdx-license-t b/tests/docs/spdx-license-t
index d829080da1e7c9a39781e0f72b00070f24f984c9..2841835fb69a2817db75d03ddd3ea42fea3ddabd 100755 (executable)
--- a/tests/docs/spdx-license-t
+++ b/tests/docs/spdx-license-t
@@ -9,7 +9,7 @@
 # The canonical version of this file is maintained in the rra-c-util package,
 # which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 #
-# Copyright 2018-2020 Russ Allbery <eagle@eyrie.org>
+# Copyright 2018-2021 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"),
@@ -31,7 +31,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-use 5.008;
+use 5.010;
 use strict;
 use warnings;
 
@@ -51,6 +51,9 @@ my @IGNORE = (
     qr{ \A (NEWS|THANKS|TODO) \z }xms,  # Package license should be fine
     qr{ \A README ( [.] .* )? \z }xms,  # Package license should be fine
     qr{ \A (Makefile|libtool) \z }xms,  # Generated file
+    qr{ ~ \z }xms,                      # Backup files
+    qr{ [.] l?a \z }xms,                # Created by libtool
+    qr{ [.] o \z }xms,                  # Compiler objects
     qr{ [.] output \z }xms,             # Test data
 );
 my @IGNORE_PATHS = (
@@ -74,8 +77,7 @@ my @IGNORE_PATHS = (
     qr{ \A php/run-tests [.] php \z }xms,      # Created by phpize
     qr{ \A python/ .* [.] egg-info/ }xms,      # Python build files
     qr{ \A tests/config/ (?!README) }xms,      # Test configuration
-    qr{ [.] l?a \z }xms,                       # Created by libtool
-    qr{ [.] o \z }xms,                         # Compiler objects
+    qr{ \A tests/tmp/ }xms,                    # Temporary test files
 );
 ## use critic