From: Russ Allbery Date: Tue, 1 Oct 2013 20:49:35 +0000 (-0700) Subject: Move heimdal-strength to the tools directory X-Git-Tag: release/2.0~47 X-Git-Url: https://git.eyrie.org/?a=commitdiff_plain;h=10f3af55415e1d8964c6a05a876f8dde782ec019;p=kerberos%2Fkrb5-strength.git Move heimdal-strength to the tools directory Try to keep the proliferation of directories to a minimum and put all the command-line tools in the same directory. --- diff --git a/.gitignore b/.gitignore index b7018c4..da40211 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,6 @@ /config.status /configure /cracklib/packer -/external/heimdal-strength /libtool /m4/libtool.m4 /m4/ltoptions.m4 @@ -33,6 +32,7 @@ /tests/tap/libtap.a /tests/util/messages-t /tests/util/xmalloc +/tools/heimdal-strength .deps/ .dirstamp .libs/ diff --git a/Makefile.am b/Makefile.am index e1292ad..496487d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,11 +8,11 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = .gitignore LICENSE autogen cracklib/HISTORY cracklib/LICENCE \ - cracklib/README cracklib/genrules.pl cracklib/mkdict \ - external/heimdal-strength.pod tests/HOWTO tests/TESTS \ - tests/data/wordlist tests/heimdal/external-t \ + cracklib/README cracklib/genrules.pl cracklib/mkdict tests/HOWTO \ + tests/TESTS tests/data/wordlist tests/heimdal/external-t \ tests/heimdal/pod-spelling-t tests/heimdal/pod-t \ - tests/tap/libtap.sh tests/tools/cdbmake-wordlist + tests/tap/libtap.sh tests/tools/cdbmake-wordlist \ + tools/heimdal-strength.pod # Do this globally. Everything needs to find the Kerberos headers and # libraries, and if we're using the system CrackLib or libcdb, add its @@ -60,24 +60,24 @@ endif plugin_passwd_strength_la_LIBADD += portable/libportable.la $(KRB5_LIBS) \ $(CDB_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 plugin/cdb.c \ - 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/api.c plugin/api.h plugin/cdb.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 += util/libutil.a portable/libportable.la \ +tools_heimdal_strength_LDADD += util/libutil.a portable/libportable.la \ $(KRB5_LIBS) $(CDB_LIBS) # Other tools. dist_bin_SCRIPTS = tools/cdbmake-wordlist # Man pages for all tools. -dist_man_MANS = external/heimdal-strength.1 tools/cdbmake-wordlist.1 +dist_man_MANS = tools/heimdal-strength.1 tools/cdbmake-wordlist.1 # 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 diff --git a/autogen b/autogen index 1137b00..d7039bb 100755 --- a/autogen +++ b/autogen @@ -9,10 +9,10 @@ autoreconf -i --force # Generate manual pages. version=`grep '^krb5-strength' NEWS | head -1 | cut -d' ' -f2` -pod2man --release="$version" --center='krb5-strength' \ - external/heimdal-strength.pod > external/heimdal-strength.1 pod2man --release="$version" --center='krb5-strength' \ tools/cdbmake-wordlist > tools/cdbmake-wordlist.1 +pod2man --release="$version" --center='krb5-strength' \ + tools/heimdal-strength.pod > tools/heimdal-strength.1 # Generate the C version of our password test data. tests/data/make-c-data tests/data/cracklib.json > tests/data/cracklib.c diff --git a/tests/heimdal/external-t b/tests/heimdal/external-t index 4eaf519..a6a9a3a 100755 --- a/tests/heimdal/external-t +++ b/tests/heimdal/external-t @@ -40,7 +40,7 @@ sub run_heimdal_strength { $in .= "end\n"; # Find the newly-built password checking program. - my $program = test_file_path('../external/heimdal-strength'); + my $program = test_file_path('../tools/heimdal-strength'); # Run the password strength checker. my $out; diff --git a/tests/heimdal/pod-spelling-t b/tests/heimdal/pod-spelling-t index 772903c..2b42691 100755 --- a/tests/heimdal/pod-spelling-t +++ b/tests/heimdal/pod-spelling-t @@ -7,7 +7,7 @@ # RRA_MAINTAINER_TESTS is set, since spelling dictionaries vary too much # between environments. # -# Copyright 2008, 2009 Russ Allbery +# Copyright 2008, 2009, 2013 Russ Allbery # # See LICENSE for licensing terms. @@ -44,7 +44,7 @@ plan skip_all => 'aspell or ispell required to test POD spelling' # what POD files we have and from that develop our plan. $| = 1; my @pod = map { s,[^/.][^/]*/../,,g; $_ } - ("$ENV{SOURCE}/../external/heimdal-strength.pod"); + ("$ENV{SOURCE}/../tools/heimdal-strength.pod"); plan tests => scalar @pod; # Finally, do the checks. diff --git a/tests/heimdal/pod-t b/tests/heimdal/pod-t index ee769af..fefee03 100755 --- a/tests/heimdal/pod-t +++ b/tests/heimdal/pod-t @@ -2,7 +2,7 @@ # # Test POD formatting for krb5-strength documentation. # -# Copyright 2009 Russ Allbery +# Copyright 2009, 2013 Russ Allbery # # See LICENSE for licensing terms. @@ -11,5 +11,5 @@ use Test::More; eval 'use Test::Pod 1.00'; plan skip_all => "Test::Pod 1.00 required for testing POD" if $@; plan tests => 1; -pod_file_ok ("$ENV{SOURCE}/../external/heimdal-strength.pod", +pod_file_ok ("$ENV{SOURCE}/../tools/heimdal-strength.pod", 'heimdal-strength'); diff --git a/external/heimdal-strength.c b/tools/heimdal-strength.c similarity index 100% rename from external/heimdal-strength.c rename to tools/heimdal-strength.c diff --git a/external/heimdal-strength.pod b/tools/heimdal-strength.pod similarity index 100% rename from external/heimdal-strength.pod rename to tools/heimdal-strength.pod