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 b7018c4e541585734a2152a3248f1fdedbd0fe4e..da4021145f40411079888a2e8af28bebb167239f 100644 (file)
--- 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 e1292ad0e5673c7501782cdd0725135d38447293..496487dca5b5e34a5cad40df1f3f63902f70976f 100644 (file)
--- 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 1137b00aaebb4b7c8a93bc9500644e3ce0dd4918..d7039bb8bf288ab563599f1907c4fb6b15bf3bb9 100755 (executable)
--- 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 4eaf519d7b15c5435676957dc59d5221755c1b1e..a6a9a3afd9bc0665c743c01190b2896433dd0ae8 100755 (executable)
--- 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 772903c286b0afb392e9063737ba3801cf352738..2b4269169c386b7570df6ff7021dbf9f6f80b949 100755 (executable)
--- 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 <rra@stanford.edu>
+# Copyright 2008, 2009, 2013 Russ Allbery <rra@stanford.edu>
 #
 # 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 ee769af06d449ab0832e3d132c7d16a13a005091..fefee0320ae53289239782ce426ffff24c43510b 100755 (executable)
--- 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 <rra@stanford.edu>
+# Copyright 2009, 2013 Russ Allbery <rra@stanford.edu>
 #
 # 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