From f31585af9ec404b3fc63738d48d6e9bfb6e7db25 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 3 Jun 2018 17:36:30 -0700 Subject: Resync files with rra-c-util Mostly comment and copyright changes, nothing that affects this package. --- m4/perl.m4 | 12 +++++++++++- tests/tap/libtap.sh | 4 ++-- tests/tap/macros.h | 2 +- tests/tap/perl/Test/RRA.pm | 4 +++- tests/tap/perl/Test/RRA/Automake.pm | 2 +- tests/tap/perl/Test/RRA/Config.pm | 4 ++-- tests/tap/perl/Test/RRA/ModuleVersion.pm | 20 +++++++++++--------- 7 files changed, 31 insertions(+), 17 deletions(-) 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/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 @@ # . # # Written by Russ Allbery -# Copyright 2009, 2010, 2011, 2012, 2016 Russ Allbery -# Copyright 2006, 2007, 2008, 2013 +# Copyright 2009-2012, 2016 Russ Allbery +# 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 . * - * Copyright 2008, 2012, 2013, 2015 Russ Allbery + * Copyright 2008, 2012-2013, 2015 Russ Allbery * * 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 =head1 COPYRIGHT AND LICENSE -Copyright 2013, 2014 The Board of Trustees of the Leland Stanford Junior +Copyright 2016 Russ Allbery + +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 =head1 COPYRIGHT AND LICENSE -Copyright 2014, 2015, 2018 Russ Allbery +Copyright 2014-2015, 2018 Russ Allbery 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 =head1 COPYRIGHT AND LICENSE -Copyright 2015, 2016 Russ Allbery +Copyright 2015-2016 Russ Allbery -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 =head1 COPYRIGHT AND LICENSE -Copyright 2016 Russ Allbery +Copyright 2016, 2018 Russ Allbery Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal -- cgit v1.2.3