From 57a5a0095c3fe0f22dcbb9d99a82cc94f2b608c7 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 17 Jan 2016 14:30:53 -0800 Subject: Update to rra-c-util 5.10 and C TAP Harness 3.4 Update to rra-c-util 5.10: * Add missing va_end to xasprintf implementation. * Fix Perl test suite framework for new Automake relative paths. * Improve portability to Kerberos included in Solaris 10. * Use appropriate warning flags with Clang (currently not warning clean). Update to C TAP Harness 3.4: * Fix segfault in runtests with an empty test list. * Display verbose test results with -v or C_TAP_VERBOSE. * Test infrastructure builds cleanly with Clang warnings. * Support comments and blank lines in test lists. --- Makefile.am | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index ccbaed0..5c87639 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ # Automake makefile for wallet. # # Written by Russ Allbery +# Copyright 2016 Russ Allbery # Copyright 2006, 2007, 2008, 2010, 2013, 2014 # The Board of Trustees of the Leland Stanford Junior University # @@ -173,22 +174,28 @@ dist_pkgdata_DATA = perl/sql/Wallet-Schema-0.07-0.08-MySQL.sql \ perl/sql/Wallet-Schema-0.09-PostgreSQL.sql \ perl/sql/Wallet-Schema-0.09-SQLite.sql -# A set of flags for warnings. Add -O because gcc won't find some warnings +# A set of flags for warnings. Add -O because gcc won't find some warnings # without optimization turned on. Desirable warnings that can't be turned # on due to other problems: # -# -Wconversion http://bugs.debian.org/488884 (htons warnings) +# -Wconversion http://bugs.debian.org/488884 (htons warnings) # -# Last checked against gcc 4.8.2 (2014-04-12). -D_FORTIFY_SOURCE=2 enables +# Last checked against gcc 4.8.2 (2014-04-12). -D_FORTIFY_SOURCE=2 enables # warn_unused_result attribute markings on glibc functions on Linux, which # catches a few more issues. -WARNINGS = -g -O -fstrict-overflow -fstrict-aliasing -D_FORTIFY_SOURCE=2 \ - -Wall -Wextra -Wendif-labels -Wformat=2 -Winit-self -Wswitch-enum \ - -Wstrict-overflow=5 -Wfloat-equal -Wdeclaration-after-statement \ - -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align \ - -Wwrite-strings -Wjump-misses-init -Wlogical-op -Wstrict-prototypes \ - -Wold-style-definition -Wmissing-prototypes -Wnormalized=nfc \ - -Wpacked -Wredundant-decls -Wnested-externs -Winline -Wvla -Werror +if WARNINGS_GCC + WARNINGS = -g -O -fstrict-overflow -fstrict-aliasing -D_FORTIFY_SOURCE=2 \ + -Wall -Wextra -Wendif-labels -Wformat=2 -Winit-self -Wswitch-enum \ + -Wstrict-overflow=5 -Wmissing-format-attribute -Wfloat-equal \ + -Wdeclaration-after-statement -Wshadow -Wpointer-arith \ + -Wbad-function-cast -Wcast-align -Wwrite-strings -Wjump-misses-init \ + -Wlogical-op -Wstrict-prototypes -Wold-style-definition \ + -Wmissing-prototypes -Wnormalized=nfc -Wpacked -Wredundant-decls \ + -Wnested-externs -Winline -Wvla -Werror +endif +if WARNINGS_CLANG + WARNINGS = -Weverything -Wno-padded +endif warnings: $(MAKE) V=0 CFLAGS='$(WARNINGS)' KRB5_CPPFLAGS='$(KRB5_CPPFLAGS_GCC)' -- cgit v1.2.3 From 128699d54becd0aa45f1fd43a0ab38642a58ce86 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 17 Jan 2016 14:33:11 -0800 Subject: Remove remaining uses of strlcpy and strlcat --- Makefile.am | 6 ---- configure.ac | 4 +-- portable/strlcat.c | 52 ------------------------------- portable/strlcpy.c | 50 ----------------------------- tests/TESTS | 2 -- tests/portable/strlcat-t.c | 78 ---------------------------------------------- tests/portable/strlcat.c | 2 -- tests/portable/strlcpy-t.c | 70 ----------------------------------------- tests/portable/strlcpy.c | 2 -- 9 files changed, 2 insertions(+), 264 deletions(-) delete mode 100644 portable/strlcat.c delete mode 100644 portable/strlcpy.c delete mode 100644 tests/portable/strlcat-t.c delete mode 100644 tests/portable/strlcat.c delete mode 100644 tests/portable/strlcpy-t.c delete mode 100644 tests/portable/strlcpy.c (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 5c87639..214bb84 100644 --- a/Makefile.am +++ b/Makefile.am @@ -290,12 +290,6 @@ tests_portable_setenv_t_LDADD = tests/tap/libtap.a portable/libportable.a tests_portable_snprintf_t_SOURCES = tests/portable/snprintf-t.c \ tests/portable/snprintf.c tests_portable_snprintf_t_LDADD = tests/tap/libtap.a portable/libportable.a -tests_portable_strlcat_t_SOURCES = tests/portable/strlcat-t.c \ - tests/portable/strlcat.c -tests_portable_strlcat_t_LDADD = tests/tap/libtap.a portable/libportable.a -tests_portable_strlcpy_t_SOURCES = tests/portable/strlcpy-t.c \ - tests/portable/strlcpy.c -tests_portable_strlcpy_t_LDADD = tests/tap/libtap.a portable/libportable.a tests_util_messages_krb5_t_CPPFLAGS = $(KRB5_CPPFLAGS) tests_util_messages_krb5_t_LDFLAGS = $(KRB5_LDFLAGS) tests_util_messages_krb5_t_LDADD = tests/tap/libtap.a util/libutil.a \ diff --git a/configure.ac b/configure.ac index f4541e2..3b3c787 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,7 @@ RRA_LIB_KRB5_RESTORE dnl Probe for properties of the C library. AC_HEADER_STDBOOL AC_CHECK_HEADERS([sys/bitypes.h sys/uio.h sys/time.h syslog.h]) -AC_CHECK_DECLS([snprintf, strlcat, strlcpy, vsnprintf]) +AC_CHECK_DECLS([snprintf, vsnprintf]) RRA_C_C99_VAMACROS RRA_C_GNU_VAMACROS AC_TYPE_LONG_LONG_INT @@ -69,7 +69,7 @@ AC_CHECK_TYPES([ssize_t], [], [], [#include ]) RRA_FUNC_SNPRINTF AC_CHECK_FUNCS([setrlimit]) -AC_REPLACE_FUNCS([asprintf mkstemp reallocarray setenv strlcat strlcpy]) +AC_REPLACE_FUNCS([asprintf mkstemp reallocarray setenv]) dnl Find a remctld binary for the test suite. AC_ARG_VAR([REMCTLD], [Path to the remctld binary]) diff --git a/portable/strlcat.c b/portable/strlcat.c deleted file mode 100644 index 613d3f2..0000000 --- a/portable/strlcat.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Replacement for a missing strlcat. - * - * Provides the same functionality as the *BSD function strlcat, originally - * developed by Todd Miller and Theo de Raadt. strlcat works similarly to - * strncat, except simpler. The result is always nul-terminated even if the - * source string is longer than the space remaining in the destination string, - * and the total space required is returned. The third argument is the total - * space available in the destination buffer, not just the amount of space - * remaining. - * - * The canonical version of this file is maintained in the rra-c-util package, - * which can be found at . - * - * Written by Russ Allbery - * - * The authors hereby relinquish any claim to any copyright that they may have - * in this work, whether granted under contract or by operation of law or - * international treaty, and hereby commit to the public, at large, that they - * shall not, at any time in the future, seek to enforce any copyright in this - * work against any person or entity, or prevent any person or entity from - * copying, publishing, distributing or creating derivative works of this - * work. - */ - -#include -#include - -/* - * If we're running the test suite, rename strlcat to avoid conflicts with - * the system version. - */ -#if TESTING -# undef strlcat -# define strlcat test_strlcat -size_t test_strlcat(char *, const char *, size_t); -#endif - -size_t -strlcat(char *dst, const char *src, size_t size) -{ - size_t used, length, copy; - - used = strlen(dst); - length = strlen(src); - if (size > 0 && used < size - 1) { - copy = (length >= size - used) ? size - used - 1 : length; - memcpy(dst + used, src, copy); - dst[used + copy] = '\0'; - } - return used + length; -} diff --git a/portable/strlcpy.c b/portable/strlcpy.c deleted file mode 100644 index 60fdab3..0000000 --- a/portable/strlcpy.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Replacement for a missing strlcpy. - * - * Provides the same functionality as the *BSD function strlcpy, originally - * developed by Todd Miller and Theo de Raadt. strlcpy works similarly to - * strncpy, except saner and simpler. The result is always nul-terminated - * even if the source string is longer than the destination string, and the - * total space required is returned. The destination string is not nul-filled - * like strncpy does, just nul-terminated. - * - * The canonical version of this file is maintained in the rra-c-util package, - * which can be found at . - * - * Written by Russ Allbery - * - * The authors hereby relinquish any claim to any copyright that they may have - * in this work, whether granted under contract or by operation of law or - * international treaty, and hereby commit to the public, at large, that they - * shall not, at any time in the future, seek to enforce any copyright in this - * work against any person or entity, or prevent any person or entity from - * copying, publishing, distributing or creating derivative works of this - * work. - */ - -#include -#include - -/* - * If we're running the test suite, rename strlcpy to avoid conflicts with - * the system version. - */ -#if TESTING -# undef strlcpy -# define strlcpy test_strlcpy -size_t test_strlcpy(char *, const char *, size_t); -#endif - -size_t -strlcpy(char *dst, const char *src, size_t size) -{ - size_t length, copy; - - length = strlen(src); - if (size > 0) { - copy = (length >= size) ? size - 1 : length; - memcpy(dst, src, copy); - dst[copy] = '\0'; - } - return length; -} diff --git a/tests/TESTS b/tests/TESTS index f78a477..76bd4ae 100644 --- a/tests/TESTS +++ b/tests/TESTS @@ -11,8 +11,6 @@ portable/asprintf portable/mkstemp portable/setenv portable/snprintf -portable/strlcat -portable/strlcpy server/admin server/backend server/keytab diff --git a/tests/portable/strlcat-t.c b/tests/portable/strlcat-t.c deleted file mode 100644 index 58aba58..0000000 --- a/tests/portable/strlcat-t.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * strlcat test suite. - * - * The canonical version of this file is maintained in the rra-c-util package, - * which can be found at . - * - * Written by Russ Allbery - * - * The authors hereby relinquish any claim to any copyright that they may have - * in this work, whether granted under contract or by operation of law or - * international treaty, and hereby commit to the public, at large, that they - * shall not, at any time in the future, seek to enforce any copyright in this - * work against any person or entity, or prevent any person or entity from - * copying, publishing, distributing or creating derivative works of this - * work. - */ - -#include -#include - -#include - -size_t test_strlcat(char *, const char *, size_t); - - -int -main(void) -{ - char buffer[10] = ""; - - plan(27); - - is_int(3, test_strlcat(buffer, "foo", sizeof(buffer)), - "strlcat into empty buffer"); - is_string("foo", buffer, "...with right output"); - is_int(7, test_strlcat(buffer, " bar", sizeof(buffer)), - "...and append more"); - is_string("foo bar", buffer, "...and output is still correct"); - is_int(9, test_strlcat(buffer, "!!", sizeof(buffer)), - "...and append to buffer limit"); - is_string("foo bar!!", buffer, "...output is still correct"); - is_int(10, test_strlcat(buffer, "!", sizeof(buffer)), - "...append one more character"); - is_string("foo bar!!", buffer, "...and output didn't change"); - ok(buffer[9] == '\0', "...buffer still nul-terminated"); - buffer[0] = '\0'; - is_int(11, test_strlcat(buffer, "hello world", sizeof(buffer)), - "append single long string"); - is_string("hello wor", buffer, "...string truncates properly"); - ok(buffer[9] == '\0', "...buffer still nul-terminated"); - buffer[0] = '\0'; - is_int(7, test_strlcat(buffer, "sausage", 5), "lie about buffer length"); - is_string("saus", buffer, "...contents are correct"); - is_int(14, test_strlcat(buffer, "bacon eggs", sizeof(buffer)), - "...add more up to real size"); - is_string("sausbacon", buffer, "...and result is correct"); - - /* Make sure that with a size of 0, the destination isn't changed. */ - is_int(11, test_strlcat(buffer, "!!", 0), "no change with size of 0"); - is_string("sausbacon", buffer, "...and content is the same"); - - /* Now play with empty strings. */ - is_int(9, test_strlcat(buffer, "", 0), - "correct count when appending empty string"); - is_string("sausbacon", buffer, "...and contents are unchanged"); - buffer[0] = '\0'; - is_int(0, test_strlcat(buffer, "", sizeof(buffer)), - "correct count when appending empty string to empty buffer"); - is_string("", buffer, "...and buffer content is correct"); - is_int(3, test_strlcat(buffer, "foo", 2), "append to length 2 buffer"); - is_string("f", buffer, "...and got only a single character"); - ok(buffer[1] == '\0', "...and buffer is still nul-terminated"); - is_int(1, test_strlcat(buffer, "", sizeof(buffer)), - "append an empty string"); - ok(buffer[1] == '\0', "...and buffer is still nul-terminated"); - - return 0; -} diff --git a/tests/portable/strlcat.c b/tests/portable/strlcat.c deleted file mode 100644 index 8983bd8..0000000 --- a/tests/portable/strlcat.c +++ /dev/null @@ -1,2 +0,0 @@ -#define TESTING 1 -#include diff --git a/tests/portable/strlcpy-t.c b/tests/portable/strlcpy-t.c deleted file mode 100644 index 6652a7c..0000000 --- a/tests/portable/strlcpy-t.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * strlcpy test suite. - * - * The canonical version of this file is maintained in the rra-c-util package, - * which can be found at . - * - * Written by Russ Allbery - * - * The authors hereby relinquish any claim to any copyright that they may have - * in this work, whether granted under contract or by operation of law or - * international treaty, and hereby commit to the public, at large, that they - * shall not, at any time in the future, seek to enforce any copyright in this - * work against any person or entity, or prevent any person or entity from - * copying, publishing, distributing or creating derivative works of this - * work. - */ - -#include -#include - -#include - -size_t test_strlcpy(char *, const char *, size_t); - - -int -main(void) -{ - char buffer[10]; - - plan(23); - - is_int(3, test_strlcpy(buffer, "foo", sizeof(buffer)), "simple strlcpy"); - is_string("foo", buffer, "...result is correct"); - is_int(9, test_strlcpy(buffer, "hello wor", sizeof(buffer)), - "strlcpy exact length of buffer"); - is_string("hello wor", buffer, "...result is correct"); - is_int(10, test_strlcpy(buffer, "world hell", sizeof(buffer)), - "strlcpy one more than buffer length"); - is_string("world hel", buffer, "...result is correct"); - ok(buffer[9] == '\0', "...buffer is nul-terminated"); - is_int(11, test_strlcpy(buffer, "hello world", sizeof(buffer)), - "strlcpy more than buffer length"); - is_string("hello wor", buffer, "...result is correct"); - ok(buffer[9] == '\0', "...buffer is nul-terminated"); - - /* Make sure that with a size of 0, the destination isn't changed. */ - is_int(3, test_strlcpy(buffer, "foo", 0), "buffer unchanged if size 0"); - is_string("hello wor", buffer, "...contents still the same"); - - /* Now play with empty strings. */ - is_int(0, test_strlcpy(buffer, "", 0), "copy empty string with size 0"); - is_string("hello wor", buffer, "...buffer unchanged"); - is_int(0, test_strlcpy(buffer, "", sizeof(buffer)), - "copy empty string into full buffer"); - is_string("", buffer, "...buffer now empty string"); - is_int(3, test_strlcpy(buffer, "foo", 2), - "copy string into buffer of size 2"); - is_string("f", buffer, "...got one character"); - ok(buffer[1] == '\0', "...buffer is nul-terminated"); - is_int(0, test_strlcpy(buffer, "", 1), - "copy empty string into buffer of size 1"); - ok(buffer[0] == '\0', "...buffer is empty string"); - - /* Finally, check using strlcpy as strlen. */ - is_int(3, test_strlcpy(NULL, "foo", 0), "use strlcpy as strlen"); - is_int(11, test_strlcpy(NULL, "hello world", 0), "...again"); - - return 0; -} diff --git a/tests/portable/strlcpy.c b/tests/portable/strlcpy.c deleted file mode 100644 index d444595..0000000 --- a/tests/portable/strlcpy.c +++ /dev/null @@ -1,2 +0,0 @@ -#define TESTING 1 -#include -- cgit v1.2.3 From a4eb8d3c9cd3ccd6e51b6077b773a0012be3a850 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 17 Jan 2016 14:39:02 -0800 Subject: Remove the Makefile mentions of the strlcpy and strlcat tests --- Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 214bb84..15ad042 100644 --- a/Makefile.am +++ b/Makefile.am @@ -265,8 +265,7 @@ distclean-local: # The bits below are for the test suite, not for the main package. check_PROGRAMS = tests/runtests tests/portable/asprintf-t \ tests/portable/mkstemp-t tests/portable/setenv-t \ - tests/portable/snprintf-t tests/portable/strlcat-t \ - tests/portable/strlcpy-t tests/util/messages-krb5-t \ + tests/portable/snprintf-t tests/util/messages-krb5-t \ tests/util/messages-t tests/util/xmalloc tests_runtests_CPPFLAGS = -DSOURCE='"$(abs_top_srcdir)/tests"' \ -DBUILD='"$(abs_top_builddir)/tests"' -- cgit v1.2.3 From 196daba5166b86af6cb0841c055ba1f80e00acb1 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 17 Jan 2016 14:46:36 -0800 Subject: Remove the Autoconf cache on make distclean --- Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 15ad042..d1319f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -254,8 +254,10 @@ clean-local: cd perl && ./Build realclean ; \ fi -# Remove the files that we copy over if and only if builddir != srcdir. +# Remove the Autoconf cache. Remove the files that we copy over if and only +# if builddir != srcdir. distclean-local: + rm -rf autom4te.cache set -e; if [ x"$(builddir)" != x"$(srcdir)" ] ; then \ for f in $(PERL_FILES) ; do \ rm -f "$(builddir)/$$f" ; \ -- cgit v1.2.3 From 80090f7f755576744e19230a8c14e640c4b99db0 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 17 Jan 2016 14:46:56 -0800 Subject: Include .travis.yml in the distribution We want it to propagate to the other repository branches for Debian packaging so that it will turn off builds in those branches. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index d1319f3..5da3295 100644 --- a/Makefile.am +++ b/Makefile.am @@ -97,7 +97,7 @@ PERL_DIRECTORIES = perl perl/lib perl/lib/Wallet perl/lib/Wallet/ACL \ perl/t/policy perl/t/style perl/t/util perl/t/verifier ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = .gitignore LICENSE autogen client/wallet.pod \ +EXTRA_DIST = .gitignore .travis.yml LICENSE autogen client/wallet.pod \ client/wallet-rekey.pod config/allow-extract config/keytab \ config/keytab.acl config/wallet config/wallet-report.acl \ docs/design contrib/README contrib/convert-srvtab-db \ -- cgit v1.2.3 From c6cbf452708adc5180d1772050e760ab010c0fa7 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 17 Jan 2016 18:40:38 -0800 Subject: Remove obsolete Duo Perl modules from distribution --- Makefile.am | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 5da3295..5810a1e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,9 +28,6 @@ PERL_FILES = perl/Build.PL perl/MANIFEST perl/MANIFEST.SKIP perl/create-ddl \ perl/lib/Wallet/Kadmin.pm perl/lib/Wallet/Kadmin/Heimdal.pm \ perl/lib/Wallet/Kadmin/MIT.pm perl/lib/Wallet/Object/Base.pm \ perl/lib/Wallet/Object/Duo.pm \ - perl/lib/Wallet/Object/Duo/LDAPProxy.pm \ - perl/lib/Wallet/Object/Duo/PAM.pm perl/lib/Wallet/Object/Duo/RDP.pm \ - perl/lib/Wallet/Object/Duo/RadiusProxy.pm \ perl/lib/Wallet/Object/File.pm perl/lib/Wallet/Object/Keytab.pm \ perl/lib/Wallet/Object/WAKeyring.pm \ perl/lib/Wallet/Policy/Stanford.pm perl/lib/Wallet/Report.pm \ @@ -87,14 +84,14 @@ PERL_FILES = perl/Build.PL perl/MANIFEST perl/MANIFEST.SKIP perl/create-ddl \ # Directories that have to be created in builddir != srcdir builds before # copying PERL_FILES over. -PERL_DIRECTORIES = perl perl/lib perl/lib/Wallet perl/lib/Wallet/ACL \ - perl/lib/Wallet/ACL/Krb5 perl/lib/Wallet/ACL/LDAP \ - perl/lib/Wallet/ACL/NetDB perl/lib/Wallet/Kadmin \ - perl/lib/Wallet/Object perl/lib/Wallet/Object/Duo \ - perl/lib/Wallet/Policy perl/lib/Wallet/Schema \ - perl/lib/Wallet/Schema/Result perl/sql perl/t perl/t/data \ - perl/t/data/duo perl/t/docs perl/t/general perl/t/lib perl/t/object \ - perl/t/policy perl/t/style perl/t/util perl/t/verifier +PERL_DIRECTORIES = perl perl/lib perl/lib/Wallet perl/lib/Wallet/ACL \ + perl/lib/Wallet/ACL/Krb5 perl/lib/Wallet/ACL/LDAP \ + perl/lib/Wallet/ACL/NetDB perl/lib/Wallet/Kadmin \ + perl/lib/Wallet/Object perl/lib/Wallet/Policy \ + perl/lib/Wallet/Schema perl/lib/Wallet/Schema/Result perl/sql \ + perl/t perl/t/data perl/t/data/duo perl/t/docs perl/t/general \ + perl/t/lib perl/t/object perl/t/policy perl/t/style perl/t/util \ + perl/t/verifier ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = .gitignore .travis.yml LICENSE autogen client/wallet.pod \ -- cgit v1.2.3 From b39428f02c66430c1bcb497e345315ea29fde99b Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 17 Jan 2016 18:47:57 -0800 Subject: Include tests/perl/module-version-t in the distribution --- Makefile.am | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 5810a1e..b3074bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -114,11 +114,13 @@ EXTRA_DIST = .gitignore .travis.yml LICENSE autogen client/wallet.pod \ tests/data/fake-keytab-unknown tests/data/fake-srvtab \ tests/data/full.conf tests/data/perl.conf tests/data/wallet.conf \ tests/docs/pod-spelling-t tests/docs/pod-t \ - tests/perl/minimum-version-t tests/perl/strict-t \ - tests/server/admin-t tests/server/backend-t tests/server/keytab-t \ - tests/server/report-t tests/tap/kerberos.sh tests/tap/libtap.sh \ - tests/tap/perl/Test/RRA.pm tests/tap/perl/Test/RRA/Automake.pm \ - tests/tap/perl/Test/RRA/Config.pm tests/tap/remctl.sh \ + tests/perl/minimum-version-t tests/perl/module-version-t \ + tests/perl/strict-t tests/server/admin-t tests/server/backend-t \ + tests/server/keytab-t tests/server/report-t tests/tap/kerberos.sh \ + tests/tap/libtap.sh tests/tap/perl/Test/RRA.pm \ + tests/tap/perl/Test/RRA/Automake.pm \ + tests/tap/perl/Test/RRA/Config.pm \ + tests/tap/perl/Test/RRA/ModuleVersion.pm tests/tap/remctl.sh \ tests/util/xmalloc-t $(PERL_FILES) # Supporting convenience libraries used by other targets. -- cgit v1.2.3 From 76f93739a8a933d98b87db9496861dae7de0ae1a Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 17 Jan 2016 19:04:56 -0800 Subject: Add lots of missing files to the distribution --- Makefile.am | 99 +++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 53 insertions(+), 46 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index b3074bc..6cabc93 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,14 +21,18 @@ WALLET_PERL_FLAGS ?= # builddir != srcdir builds. PERL_FILES = perl/Build.PL perl/MANIFEST perl/MANIFEST.SKIP perl/create-ddl \ perl/lib/Wallet/ACL.pm perl/lib/Wallet/ACL/Base.pm \ - perl/lib/Wallet/ACL/Krb5.pm perl/lib/Wallet/ACL/Krb5/Regex.pm \ - perl/lib/Wallet/ACL/LDAP/Attribute.pm perl/lib/Wallet/ACL/NetDB.pm \ + perl/lib/Wallet/ACL/External.pm perl/lib/Wallet/ACL/Krb5.pm \ + perl/lib/Wallet/ACL/Krb5/Regex.pm \ + perl/lib/Wallet/ACL/LDAP/Attribute.pm \ + perl/lib/Wallet/ACL/LDAP/Attribute/Root.pm \ + perl/lib/Wallet/ACL/NetDB.pm perl/lib/Wallet/ACL/Nested.pm \ perl/lib/Wallet/ACL/NetDB/Root.pm perl/lib/Wallet/Admin.pm \ perl/lib/Wallet/Config.pm perl/lib/Wallet/Database.pm \ - perl/lib/Wallet/Kadmin.pm perl/lib/Wallet/Kadmin/Heimdal.pm \ - perl/lib/Wallet/Kadmin/MIT.pm perl/lib/Wallet/Object/Base.pm \ - perl/lib/Wallet/Object/Duo.pm \ + perl/lib/Wallet/Kadmin.pm perl/lib/Wallet/Kadmin/AD.pm \ + perl/lib/Wallet/Kadmin/Heimdal.pm perl/lib/Wallet/Kadmin/MIT.pm \ + perl/lib/Wallet/Object/Base.pm perl/lib/Wallet/Object/Duo.pm \ perl/lib/Wallet/Object/File.pm perl/lib/Wallet/Object/Keytab.pm \ + perl/lib/Wallet/Object/Password.pm \ perl/lib/Wallet/Object/WAKeyring.pm \ perl/lib/Wallet/Policy/Stanford.pm perl/lib/Wallet/Report.pm \ perl/lib/Wallet/Schema.pm perl/lib/Wallet/Server.pm \ @@ -63,8 +67,9 @@ PERL_FILES = perl/Build.PL perl/MANIFEST perl/MANIFEST.SKIP perl/create-ddl \ perl/sql/Wallet-Schema-0.09-0.10-SQLite.sql \ perl/sql/Wallet-Schema-0.10-MySQL.sql \ perl/sql/Wallet-Schema-0.10-PostgreSQL.sql \ - perl/sql/Wallet-Schema-0.10-SQLite.sql perl/t/data/README \ - perl/t/data/duo/integration.json \ + perl/sql/Wallet-Schema-0.10-SQLite.sql \ + perl/sql/wallet-1.3-update-duo.sql perl/t/data/README \ + perl/t/data/acl-command perl/t/data/duo/integration.json \ perl/t/data/duo/integration-ldap.json \ perl/t/data/duo/integration-radius.json \ perl/t/data/duo/integration-rdp.json perl/t/data/duo/keys.json \ @@ -77,50 +82,52 @@ PERL_FILES = perl/Build.PL perl/MANIFEST perl/MANIFEST.SKIP perl/create-ddl \ perl/t/object/duo.t perl/t/object/duo-ldap.t \ perl/t/object/duo-pam.t perl/t/object/duo-radius.t \ perl/t/object/duo-rdp.t perl/t/object/file.t perl/t/object/keytab.t \ - perl/t/object/wa-keyring.t perl/t/policy/stanford.t \ - perl/t/style/minimum-version.t perl/t/style/strict.t \ - perl/t/util/kadmin.t perl/t/verifier/basic.t \ - perl/t/verifier/ldap-attr.t perl/t/verifier/netdb.t + perl/t/object/password.t perl/t/object/wa-keyring.t \ + perl/t/policy/stanford.t perl/t/style/minimum-version.t \ + perl/t/style/strict.t perl/t/util/kadmin.t perl/t/verifier/basic.t \ + perl/t/verifier/external.t perl/t/verifier/ldap-attr.t \ + perl/t/verifier/nested.t perl/t/verifier/netdb.t # Directories that have to be created in builddir != srcdir builds before # copying PERL_FILES over. -PERL_DIRECTORIES = perl perl/lib perl/lib/Wallet perl/lib/Wallet/ACL \ - perl/lib/Wallet/ACL/Krb5 perl/lib/Wallet/ACL/LDAP \ - perl/lib/Wallet/ACL/NetDB perl/lib/Wallet/Kadmin \ - perl/lib/Wallet/Object perl/lib/Wallet/Policy \ - perl/lib/Wallet/Schema perl/lib/Wallet/Schema/Result perl/sql \ - perl/t perl/t/data perl/t/data/duo perl/t/docs perl/t/general \ - perl/t/lib perl/t/object perl/t/policy perl/t/style perl/t/util \ - perl/t/verifier +PERL_DIRECTORIES = perl perl/lib perl/lib/Wallet perl/lib/Wallet/ACL \ + perl/lib/Wallet/ACL/Krb5 perl/lib/Wallet/ACL/LDAP \ + perl/lib/Wallet/ACL/LDAP/Attribute perl/lib/Wallet/ACL/NetDB \ + perl/lib/Wallet/Kadmin perl/lib/Wallet/Object \ + perl/lib/Wallet/Policy perl/lib/Wallet/Schema \ + perl/lib/Wallet/Schema/Result perl/sql perl/t perl/t/data \ + perl/t/data/duo perl/t/docs perl/t/general perl/t/lib perl/t/object \ + perl/t/policy perl/t/style perl/t/util perl/t/verifier ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = .gitignore .travis.yml LICENSE autogen client/wallet.pod \ - client/wallet-rekey.pod config/allow-extract config/keytab \ - config/keytab.acl config/wallet config/wallet-report.acl \ - docs/design contrib/README contrib/convert-srvtab-db \ - contrib/used-principals contrib/wallet-contacts \ - contrib/wallet-rekey-periodic contrib/wallet-rekey-periodic.8 \ - contrib/wallet-summary contrib/wallet-summary.8 \ - contrib/wallet-unknown-hosts contrib/wallet-unknown-hosts.8 \ - docs/design-acl docs/design-api docs/netdb-role-api docs/notes \ - docs/objects-and-schemes docs/setup docs/stanford-naming \ - examples/stanford.conf tests/HOWTO tests/TESTS tests/config/README \ - tests/data/allow-extract tests/data/basic.conf tests/data/cmd-fake \ - tests/data/cmd-wrapper tests/data/fake-data tests/data/fake-kadmin \ - tests/data/fake-keytab tests/data/fake-keytab-2 \ - tests/data/fake-keytab-foreign tests/data/fake-keytab-merge \ - tests/data/fake-keytab-old tests/data/fake-keytab-partial \ - tests/data/fake-keytab-partial-result tests/data/fake-keytab-rekey \ - tests/data/fake-keytab-unknown tests/data/fake-srvtab \ - tests/data/full.conf tests/data/perl.conf tests/data/wallet.conf \ - tests/docs/pod-spelling-t tests/docs/pod-t \ - tests/perl/minimum-version-t tests/perl/module-version-t \ - tests/perl/strict-t tests/server/admin-t tests/server/backend-t \ - tests/server/keytab-t tests/server/report-t tests/tap/kerberos.sh \ - tests/tap/libtap.sh tests/tap/perl/Test/RRA.pm \ - tests/tap/perl/Test/RRA/Automake.pm \ - tests/tap/perl/Test/RRA/Config.pm \ - tests/tap/perl/Test/RRA/ModuleVersion.pm tests/tap/remctl.sh \ +EXTRA_DIST = .gitignore .travis.yml LICENSE autogen client/wallet.pod \ + client/wallet-rekey.pod config/allow-extract config/keytab \ + config/keytab.acl config/wallet config/wallet-report.acl \ + docs/design contrib/README contrib/commerzbank/wallet-history \ + contrib/convert-srvtab-db contrib/used-principals \ + contrib/wallet-contacts contrib/wallet-rekey-periodic \ + contrib/wallet-rekey-periodic.8 contrib/wallet-summary \ + contrib/wallet-summary.8 contrib/wallet-unknown-hosts \ + contrib/wallet-unknown-hosts.8 docs/design-acl docs/design-api \ + docs/netdb-role-api docs/notes docs/objects-and-schemes docs/setup \ + docs/stanford-naming examples/stanford.conf tests/HOWTO tests/TESTS \ + tests/config/README tests/data/allow-extract tests/data/basic.conf \ + tests/data/cmd-fake tests/data/cmd-wrapper tests/data/fake-data \ + tests/data/fake-kadmin tests/data/fake-keytab \ + tests/data/fake-keytab-2 tests/data/fake-keytab-foreign \ + tests/data/fake-keytab-merge tests/data/fake-keytab-old \ + tests/data/fake-keytab-partial \ + tests/data/fake-keytab-partial-result tests/data/fake-keytab-rekey \ + tests/data/fake-keytab-unknown tests/data/fake-srvtab \ + tests/data/full.conf tests/data/perl.conf tests/data/wallet.conf \ + tests/docs/pod-spelling-t tests/docs/pod-t \ + tests/perl/minimum-version-t tests/perl/module-version-t \ + tests/perl/strict-t tests/server/admin-t tests/server/backend-t \ + tests/server/keytab-t tests/server/report-t tests/tap/kerberos.sh \ + tests/tap/libtap.sh tests/tap/perl/Test/RRA.pm \ + tests/tap/perl/Test/RRA/Automake.pm \ + tests/tap/perl/Test/RRA/Config.pm \ + tests/tap/perl/Test/RRA/ModuleVersion.pm tests/tap/remctl.sh \ tests/util/xmalloc-t $(PERL_FILES) # Supporting convenience libraries used by other targets. -- cgit v1.2.3