X-Git-Url: https://git.eyrie.org/?a=blobdiff_plain;f=Makefile.am;h=c3419ec10f7c0f714db505c74173dd2b42dcb2ed;hb=5dd356e159cc54bfbbde48a0bad923fb17bda241;hp=bfaf2f45014c83091871f336b65555eb5747674c;hpb=b2aa8693b008c48cdc110602eb6f08cf1b0ceb54;p=kerberos%2Fkrb5-strength.git diff --git a/Makefile.am b/Makefile.am index bfaf2f4..c3419ec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,35 +1,54 @@ # Automake makefile for krb5-strength. # -# Written by Russ Allbery -# Copyright 2007, 2009, 2010, 2012 +# Written by Russ Allbery +# Copyright 2016, 2020, 2023 Russ Allbery +# Copyright 2007, 2009-2010, 2012-2014 # The Board of Trustees of the Leland Stanford Junior University # -# See LICENSE for licensing terms. +# SPDX-License-Identifier: MIT ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = .gitignore LICENSE autogen cracklib/HISTORY cracklib/LICENCE \ +EXTRA_DIST = .clang-format .github .gitignore README.md LICENSE bootstrap \ + ci/README ci/install ci/test cracklib/HISTORY cracklib/LICENCE \ cracklib/README cracklib/genrules.pl cracklib/mkdict \ - external/heimdal-strength.pod patches/README patches/mit-krb5-1.4.4 \ - tests/HOWTO tests/TESTS tests/data/wordlist \ - tests/heimdal/external-t tests/heimdal/plugin-t \ - tests/heimdal/pod-spelling-t tests/heimdal/pod-t tests/mit/plugin-t \ - tests/tap/libtap.sh + docs/krb5-strength.5.in docs/krb5-strength.pod docs/metadata \ + tests/README tests/TESTS tests/data/cppcheck.supp \ + tests/data/krb5.conf tests/data/make-krb5-conf tests/data/passwords \ + tests/data/perl.conf tests/data/perlcriticrc tests/data/perltidyrc \ + tests/data/valgrind.supp tests/data/wordlist \ + tests/data/wordlist.cdb tests/data/wordlist.sqlite \ + tests/docs/pod-spelling-t tests/docs/pod-t \ + tests/docs/spdx-license-t tests/perl/critic-t \ + tests/perl/minimum-version-t tests/perl/strict-t \ + tests/style/obsolete-strings-t tests/tap/libtap.sh \ + tests/tap/perl/Test/RRA.pm tests/tap/perl/Test/RRA/Config.pm \ + tests/tap/perl/Test/RRA/Automake.pm tests/tools/heimdal-history-t \ + tests/tools/heimdal-strength-t tests/tools/wordlist-cdb-t \ + tests/tools/wordlist-sqlite-t tests/tools/wordlist-t \ + tests/util/xmalloc-t tests/valgrind/logs-t \ + tools/heimdal-strength.pod # Do this globally. Everything needs to find the Kerberos headers and -# libraries, and if we're using the system CrackLib, add its location -# unconditionally as well. -AM_CPPFLAGS = $(CRACKLIB_CPPFLAGS) $(KRB5_CPPFLAGS) -AM_LDFLAGS = $(CRACKLIB_LDFLAGS) $(KRB5_LDFLAGS) - -# Put the module into /usr/local/lib/kadmind by default, relative to --libdir. -moduledir = $(libdir)/kadmind +# libraries, and if we're using the system CrackLib, TinyCDB, or SQLite, add +# its location unconditionally as well. +AM_CPPFLAGS = $(CRACKLIB_CPPFLAGS) $(KRB5_CPPFLAGS) $(CDB_CPPFLAGS) \ + $(SQLITE3_CPPFLAGS) +AM_LDFLAGS = $(CRACKLIB_LDFLAGS) $(KRB5_LDFLAGS) $(CDB_LDFLAGS) \ + $(SQLITE3_LDFLAGS) # Build our portability library. noinst_LTLIBRARIES = portable/libportable.la -portable_libportable_la_SOURCES = portable/dummy.c portable/macros.h \ - portable/stdbool.h portable/system.h +portable_libportable_la_SOURCES = portable/dummy.c portable/kadmin.h \ + portable/krb5.h portable/macros.h portable/stdbool.h \ + portable/system.h portable_libportable_la_LIBADD = $(LTLIBOBJS) +# Build our command-line utility library. +noinst_LIBRARIES = util/libutil.a +util_libutil_a_SOURCES = util/macros.h util/messages-krb5.c \ + util/messages-krb5.h util/messages.c util/messages.h util/xmalloc.c \ + util/xmalloc.h + # If we're building with the embedded cracklib, build cracklib as a helper # library and build (but don't install) the packer program. cracklib_libcracklib_la_SOURCES = cracklib/fascist.c cracklib/packlib.c \ @@ -41,98 +60,165 @@ if EMBEDDED_CRACKLIB noinst_LTLIBRARIES += cracklib/libcracklib.la endif +# Put the plugin into $(libdir)/krb5/plugins/pwqual by default, +moduledir = $(libdir)/krb5/plugins/pwqual + # Rules for building the password strength plugin. -module_LTLIBRARIES = plugin/passwd_strength.la -plugin_passwd_strength_la_SOURCES = plugin/api.c plugin/heimdal.c plugin/mit.c -plugin_passwd_strength_la_LDFLAGS = -module -avoid-version +module_LTLIBRARIES = plugin/strength.la +plugin_strength_la_SOURCES = plugin/cdb.c plugin/classes.c plugin/config.c \ + plugin/cracklib.c plugin/error.c plugin/general.c plugin/heimdal.c \ + plugin/internal.h plugin/mit.c plugin/principal.c plugin/sqlite.c \ + plugin/vector.c +plugin_strength_la_LDFLAGS = -module -avoid-version if EMBEDDED_CRACKLIB - plugin_passwd_strength_la_LIBADD = cracklib/libcracklib.la + plugin_strength_la_LIBADD = cracklib/libcracklib.la else - plugin_passwd_strength_la_LIBADD = $(CRACKLIB_LIBS) + plugin_strength_la_LIBADD = $(CRACKLIB_LIBS) endif -plugin_passwd_strength_la_LIBADD += portable/libportable.la $(KRB5_LIBS) +plugin_strength_la_LIBADD += portable/libportable.la $(KRB5_LIBS) \ + $(CDB_LIBS) $(SQLITE3_LIBS) -# The Heimdal external-check program. -bin_PROGRAMS = external/heimdal-strength -external_heimdal_strength_CFLAGS = $(AM_CFLAGS) -external_heimdal_strength_SOURCES = plugin/api.c plugin/api.h \ - external/heimdal-strength.c +# The Heimdal external check program. +bin_PROGRAMS = tools/heimdal-strength +tools_heimdal_strength_CFLAGS = $(AM_CFLAGS) +tools_heimdal_strength_SOURCES = plugin/cdb.c plugin/classes.c \ + plugin/config.c plugin/cracklib.c plugin/error.c plugin/general.c \ + plugin/internal.h plugin/principal.c plugin/sqlite.c \ + plugin/vector.c tools/heimdal-strength.c if EMBEDDED_CRACKLIB - external_heimdal_strength_LDADD = cracklib/libcracklib.la + tools_heimdal_strength_LDADD = cracklib/libcracklib.la else - external_heimdal_strength_LDADD = $(CRACKLIB_LIBS) + tools_heimdal_strength_LDADD = $(CRACKLIB_LIBS) endif -external_heimdal_strength_LDADD += portable/libportable.la $(KRB5_LIBS) -dist_man_MANS = external/heimdal-strength.1 +tools_heimdal_strength_LDADD += util/libutil.a portable/libportable.la \ + $(KRB5_LIBS) $(CDB_LIBS) $(SQLITE3_LIBS) + +# Other tools. +dist_bin_SCRIPTS = tools/heimdal-history tools/krb5-strength-wordlist + +# Man pages for all tools. +dist_man_MANS = tools/heimdal-history.1 tools/heimdal-strength.1 \ + tools/krb5-strength-wordlist.1 +man_MANS = docs/krb5-strength.5 + +# Substitute the installation paths into the manual page. +docs/krb5-strength.5: $(srcdir)/docs/krb5-strength.5.in + [ -d docs ] || mkdir docs + sed -e 's%\(\\f(CI\)*\@moduledir\(\\fI\)*\@%$(moduledir)%' \ + < $(srcdir)/docs/krb5-strength.5.in > $@ # Handle the standard stuff that make maintainer-clean should probably remove # but doesn't. This breaks the GNU coding standard, but in this area the GNU # coding standard is dumb. -CLEANFILES = tests/data/dictionary.hwm tests/data/dictionary.pwd \ - tests/data/dictionary.pwi +CLEANFILES = docs/krb5-strength.5 tests/data/dictionary.hwm \ + tests/data/dictionary.pwd tests/data/dictionary.pwi DISTCLEANFILES = tests/data/.placeholder -MAINTAINERCLEANFILES = Makefile.in aclocal.m4 build-aux/compile \ - build-aux/config.guess build-aux/config.sub build-aux/depcomp \ - build-aux/install-sh build-aux/ltmain.sh build-aux/missing \ - config.h.in config.h.in~ configure m4/libtool.m4 m4/ltoptions.m4 \ - m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 - -# 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) -# -# Last checked against gcc 4.6.1 (2011-05-04). -D_FORTIFY_SOURCE=2 enables -# warn_unused_result attribute markings on glibc functions on Linux, which -# catches a few more issues. -WARNINGS = -g -O -D_FORTIFY_SOURCE=2 -Wall -Wextra -Wendif-labels \ - -Wformat=2 -Winit-self -Wswitch-enum -Wdeclaration-after-statement \ - -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align \ - -Wwrite-strings -Wjump-misses-init -Wlogical-op \ - -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls \ - -Wnested-externs -Werror +MAINTAINERCLEANFILES = Makefile.in aclocal.m4 build-aux/compile \ + build-aux/config.guess build-aux/config.sub build-aux/depcomp \ + build-aux/install-sh build-aux/ltmain.sh build-aux/missing \ + config.h.in config.h.in~ configure docs/krb5-strength.5.in \ + m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 \ + m4/lt~obsolete.m4 tests/data/wordlist.cdb \ + tests/data/wordlist.sqlite tools/heimdal-history.1 \ + tools/heimdal-strength.1 tools/krb5-strength-wordlist.1 + +# Also remove the generated *.c files from our JSON test data on +# maintainer-clean. +maintainer-clean-local: + rm -f tests/data/passwords/*.c warnings: - $(MAKE) V=0 CFLAGS='$(WARNINGS)' - $(MAKE) V=0 CFLAGS='$(WARNINGS)' $(check_PROGRAMS) + $(MAKE) V=0 CFLAGS='$(WARNINGS_CFLAGS) $(AM_CFLAGS)' \ + KRB5_CPPFLAGS='$(KRB5_CPPFLAGS_WARNINGS)' + $(MAKE) V=0 CFLAGS='$(WARNINGS_CFLAGS) $(AM_CFLAGS)' \ + KRB5_CPPFLAGS='$(KRB5_CPPFLAGS_WARNINGS)' $(check_PROGRAMS) # The bits below are for the test suite, not for the main package. -check_PROGRAMS = tests/heimdal/plugin tests/mit/plugin \ - tests/portable/asprintf-t tests/portable/snprintf-t \ - tests/portable/strlcat-t tests/portable/strlcpy-t tests/runtests +check_PROGRAMS = tests/runtests tests/plugin/heimdal-t tests/plugin/mit-t \ + tests/portable/asprintf-t tests/portable/mkstemp-t \ + tests/portable/reallocarray-t tests/portable/strndup-t \ + tests/util/messages-krb5-t tests/util/messages-t tests/util/xmalloc if EMBEDDED_CRACKLIB check_PROGRAMS += cracklib/packer endif -tests_runtests_CPPFLAGS = -DSOURCE='"$(abs_top_srcdir)/tests"' \ - -DBUILD='"$(abs_top_builddir)/tests"' +tests_runtests_CPPFLAGS = -DC_TAP_SOURCE='"$(abs_top_srcdir)/tests"' \ + -DC_TAP_BUILD='"$(abs_top_builddir)/tests"' check_LIBRARIES = tests/tap/libtap.a -tests_tap_libtap_a_CPPFLAGS = -I$(abs_top_srcdir)/tests -tests_tap_libtap_a_SOURCES = tests/tap/basic.c tests/tap/basic.h \ - tests/tap/macros.h +tests_tap_libtap_a_CPPFLAGS = -I$(abs_top_srcdir)/tests $(KRB5_CPPFLAGS) +tests_tap_libtap_a_SOURCES = tests/tap/basic.c tests/tap/basic.h \ + tests/tap/kerberos.c tests/tap/kerberos.h tests/tap/macros.h \ + tests/tap/process.c tests/tap/process.h tests/tap/string.c \ + tests/tap/string.h # The actual test programs. -tests_heimdal_plugin_SOURCES = tests/heimdal/plugin.c -tests_heimdal_plugin_LDADD = portable/libportable.la $(KRB5_LIBS) $(DL_LIBS) -tests_mit_plugin_SOURCES = tests/mit/plugin.c -tests_mit_plugin_LDADD = portable/libportable.la $(KRB5_LIBS) $(DL_LIBS) +tests_plugin_heimdal_t_CPPFLAGS = $(KRB5_CPPFLAGS) +tests_plugin_heimdal_t_LDADD = tests/tap/libtap.a portable/libportable.la \ + $(KRB5_LIBS) $(CDB_LIBS) $(DL_LIBS) +tests_plugin_mit_t_CPPFLAGS = $(KRB5_CPPFLAGS) +tests_plugin_mit_t_LDADD = tests/tap/libtap.a portable/libportable.la \ + $(KRB5_LIBS) $(CDB_LIBS) $(DL_LIBS) tests_portable_asprintf_t_SOURCES = tests/portable/asprintf-t.c \ tests/portable/asprintf.c tests_portable_asprintf_t_LDADD = tests/tap/libtap.a portable/libportable.la -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.la -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.la -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.la +tests_portable_mkstemp_t_SOURCES = tests/portable/mkstemp-t.c \ + tests/portable/mkstemp.c +tests_portable_mkstemp_t_LDADD = tests/tap/libtap.a portable/libportable.la +tests_portable_reallocarray_t_SOURCES = tests/portable/reallocarray-t.c \ + tests/portable/reallocarray.c +tests_portable_reallocarray_t_LDADD = tests/tap/libtap.a \ + portable/libportable.la +tests_portable_strndup_t_SOURCES = tests/portable/strndup-t.c \ + tests/portable/strndup.c +tests_portable_strndup_t_LDADD = tests/tap/libtap.a portable/libportable.la +tests_util_messages_t_LDADD = tests/tap/libtap.a util/libutil.a \ + portable/libportable.la +tests_util_messages_krb5_t_LDADD = tests/tap/libtap.a util/libutil.a \ + portable/libportable.la $(KRB5_LIBS) +tests_util_xmalloc_LDADD = util/libutil.a portable/libportable.la # The dictionary is used by the tests and needs to be built first. -tests/data/dictionary.pwd: cracklib/packer $(srcdir)/tests/data/wordlist +if EMBEDDED_CRACKLIB +tests/data/dictionary.pwd: cracklib/packer $(srcdir)/cracklib/mkdict \ + $(srcdir)/tests/data/wordlist + mkdir -p tests/data + $(srcdir)/cracklib/mkdict $(srcdir)/tests/data/wordlist \ + | cracklib/packer tests/data/dictionary +else +tests/data/dictionary.pwd: $(srcdir)/tests/data/wordlist mkdir -p tests/data - cracklib/packer tests/data/dictionary < $(srcdir)/tests/data/wordlist + cracklib-format $(srcdir)/tests/data/wordlist \ + | cracklib-packer tests/data/dictionary +endif check-local: $(check_PROGRAMS) tests/data/dictionary.pwd cd tests && ./runtests -l $(abs_top_srcdir)/tests/TESTS + +# Used by maintainers to check the source code with cppcheck. +check-cppcheck: + cd $(abs_top_srcdir) && \ + find . -name .git -prune -o -name '*.[ch]' -print \ + | cppcheck -q --force --error-exitcode=2 --file-list=- \ + --suppressions-list=tests/data/cppcheck.supp \ + --enable=warning,performance,portability,style + +# The full path to valgrind and its options, used when doing valgrind +# testing. +VALGRIND_COMMAND = $(PATH_VALGRIND) --leak-check=full \ + --trace-children=yes --trace-children-skip=/bin/sh \ + --suppressions=$(abs_top_srcdir)/tests/data/valgrind.supp \ + --log-file=$(abs_top_builddir)/tests/tmp/valgrind/log.%p + +# Used by maintainers to run the main test suite under valgrind. +check-valgrind: $(check_PROGRAMS) tests/data/dictionary.pwd + rm -rf $(abs_top_builddir)/tests/tmp + mkdir $(abs_top_builddir)/tests/tmp + mkdir $(abs_top_builddir)/tests/tmp/valgrind + C_TAP_VALGRIND="$(VALGRIND_COMMAND)" tests/runtests \ + -l '$(abs_top_srcdir)/tests/TESTS' + +# Used by maintainers to reformat all source code using clang-format and +# excluding some files. +reformat: + find . -name '*.[ch]' \! -name krb5-profile.c \ + \! -path './cracklib/*' -print \ + | xargs clang-format -style=file -i