Update to rra-c-util 8.2

* Fix support for configuring the test suite with a krb5.conf file.

diff --git a/NEWS b/NEWS
index 442c661b5fe31d14d502e815ef8553f354048829..00aa2efdfcaf4bfa5a29053b41032616b0886060 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,8 +7,9 @@ pam-krb5 4.9 (unreleased)
     of service attack via the Kerberos string to key function.  Thanks to
     Florian Best for pointing out this issue and suggesting a good fix.
 
-    Update to rra-c-util 8.1:
+    Update to rra-c-util 8.2:
 
+    * Fix support for configuring the test suite with a krb5.conf file.
     * Drop support for Perl 5.6.
     * Reformat all C source using clang-format 10.
     * Remove bogus snprintf tests.

diff --git a/tests/data/generate-krb5-conf b/tests/data/generate-krb5-conf
index d116306e7ee50bb2d79679b7542fa7951e10d1c2..4172fa98e5420888a94c8764b1fd9008cccf065d 100755 (executable)
--- a/tests/data/generate-krb5-conf
+++ b/tests/data/generate-krb5-conf
@@ -67,7 +67,7 @@ awk '
     !/^ *\[appdefaults\]/ && / *\[/   { skip = 0 }
 
     { if (skip == 0) print }
-' "$p" > tmp/krb5.conf.tmp
+' "$krb5conf" > tmp/krb5.conf.tmp
 if [ -n "$realm" ] ; then
     sed -e "s/\\(default_realm.*=\\) .*/\\1 $realm/" \
         tmp/krb5.conf.tmp > tmp/krb5.conf

diff --git a/tests/tap/perl/Test/RRA.pm b/tests/tap/perl/Test/RRA.pm
index 1d5e4db23d42b627c1fe3035a5bcf32e1793615d..cd106d03e272cbcfb59eae8550e21489347d7715 100644 (file)
--- a/tests/tap/perl/Test/RRA.pm
+++ b/tests/tap/perl/Test/RRA.pm
@@ -52,7 +52,7 @@ BEGIN {
     # This version should match the corresponding rra-c-util release, but with
     # two digits for the minor version, including a leading zero if necessary,
     # so that it will sort properly.
-    $VERSION = '8.01';
+    $VERSION = '8.02';
 }
 
 # Compare a string to the contents of a file, similar to the standard is()

diff --git a/tests/tap/perl/Test/RRA/Automake.pm b/tests/tap/perl/Test/RRA/Automake.pm
index 90014f3eb41fbfe7764f31586aa78465772cf94e..16c9b0153dbe502970196d1e7ef46aee5a23de94 100644 (file)
--- a/tests/tap/perl/Test/RRA/Automake.pm
+++ b/tests/tap/perl/Test/RRA/Automake.pm
@@ -65,13 +65,13 @@ BEGIN {
     # This version should match the corresponding rra-c-util release, but with
     # two digits for the minor version, including a leading zero if necessary,
     # so that it will sort properly.
-    $VERSION = '8.01';
+    $VERSION = '8.02';
 }
 
 # Directories to skip globally when looking for all files, or for directories
 # that could contain Perl files.
 my @GLOBAL_SKIP = qw(
-  .git _build autom4te.cache build-aux perl/_build perl/blib
+  .git .pc _build autom4te.cache build-aux perl/_build perl/blib
 );
 
 # Additional paths to skip when building a list of all files in the
@@ -448,7 +448,7 @@ Russ Allbery <eagle@eyrie.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2014-2015, 2018-2019 Russ Allbery <eagle@eyrie.org>
+Copyright 2014-2015, 2018-2020 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 80a1573941086d46befcb8cf09b9819a3bbcfce4..70641405c6cd15352a5057e56a2d066ce9b97960 100644 (file)
--- a/tests/tap/perl/Test/RRA/Config.pm
+++ b/tests/tap/perl/Test/RRA/Config.pm
@@ -32,7 +32,7 @@ BEGIN {
     # This version should match the corresponding rra-c-util release, but with
     # two digits for the minor version, including a leading zero if necessary,
     # so that it will sort properly.
-    $VERSION = '8.01';
+    $VERSION = '8.02';
 }
 
 # If C_TAP_BUILD or C_TAP_SOURCE are set in the environment, look for