keys.list-{keepers,recov}: New commands for inspecting infrastructure.

[distorted-keys] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0cd0854cf089bbc0ab7269e942b37dbd09f7c3a6..a356ec18188de67d93ab6f02f9369ef44cd880d7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,12 +23,17 @@
 ### along with distorted-keys; if not, write to the Free Software Foundation,
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+pkgconfdir              = $(sysconfdir)/$(PACKAGE)
+profiledir              = $(pkgconfdir)/profile.d
+
 bin_SCRIPTS             =
 sbin_SCRIPTS            =
 dist_pkglib_SCRIPTS     =
 dist_pkglib_DATA        =
+noinst_DATA             =
 pkglib_DATA             =
 noinst_SCRIPTS          =
+dist_profile_DATA       =
 
 EXTRA_DIST              =
 CLEANFILES              =
@@ -41,14 +46,19 @@ confsubst = $(top_srcdir)/config/confsubst
 EXTRA_DIST             += config/confsubst
 
 SUBSTVARS = \
-        PACKAGE="$(PACKAGE)" VERSION="$(VERSION)" \
+       PACKAGE="$(PACKAGE)" VERSION="$(VERSION)" \
        PYTHON="$(PYTHON)" \
-       bindir="$(bindir)" \
-       pkgconfdir="$(sysconfdir)/$(PACKAGE)" \
-       pkgstatedir="$(localstatedir)/$(PACKAGE)" \
-       pkglibdir="$(pkglibdir)"
+       bindir="$(bindir)" sbindir="$(sbindir)" \
+       pkgconfdir="$(pkgconfdir)" \
+       pkgstatedir="$(localstatedir)/lib/$(PACKAGE)" \
+       pkglibdir="$(pkglibdir)" \
+       user="$(user)"
+
+V_SUBST = $(V_SUBST_$V)
+V_SUBST_= $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
+V_SUBST_0 = @printf "  SUBST  %s\n" $@;
 
-SUBST = $(AM_V_GEN)$(confsubst)
+SUBST = $(V_SUBST)$(confsubst)
 
 ###--------------------------------------------------------------------------
 ### Utility programs.
@@ -71,11 +81,43 @@ extract-profile: extract-profile.in Makefile
                chmod +x extract-profile.new && \
                mv extract-profile.new extract-profile
 
+###--------------------------------------------------------------------------
+### Main driver program and commands.
+
+## Main driver.
+sbin_SCRIPTS           += keys
+EXTRA_DIST             += keys.in
+CLEANFILES             += keys
+keys: keys.in Makefile
+       $(SUBST) $(srcdir)/keys.in $(SUBSTVARS) >keys.new && \
+               chmod +x keys.new && mv keys.new keys
+
+## Utilities library.
+pkglib_DATA            += keyfunc.sh
+EXTRA_DIST             += keyfunc.sh.in
+CLEANFILES             += keyfunc.sh
+keyfunc.sh: keyfunc.sh.in Makefile
+       $(SUBST) $(srcdir)/keyfunc.sh.in $(SUBSTVARS) >keyfunc.sh.new && \
+               mv keyfunc.sh.new keyfunc.sh
+
+## Commands.
+dist_pkglib_SCRIPTS    += keys.archive
+dist_pkglib_SCRIPTS    += keys.conceal
+dist_pkglib_SCRIPTS    += keys.keeper-cards
+dist_pkglib_SCRIPTS    += keys.keeper-nub
+dist_pkglib_SCRIPTS    += keys.list-keepers
+dist_pkglib_SCRIPTS    += keys.list-recov
+dist_pkglib_SCRIPTS    += keys.new-keeper
+dist_pkglib_SCRIPTS    += keys.new-recov
+dist_pkglib_SCRIPTS    += keys.recover
+dist_pkglib_SCRIPTS    += keys.reveal
+dist_pkglib_SCRIPTS    += keys.stash
+
 ###--------------------------------------------------------------------------
 ### Crypto operations.
 
 ## Main driver program.
-sbin_SCRIPTS           += cryptop
+bin_SCRIPTS            += cryptop
 EXTRA_DIST             += cryptop.in
 CLEANFILES             += cryptop
 cryptop: cryptop.in Makefile
@@ -84,10 +126,14 @@ cryptop: cryptop.in Makefile
 
 ## Key type libraries.
 dist_pkglib_DATA       += ktype.gnupg
+dist_profile_DATA      += profile.d/01gnupg
+
 dist_pkglib_DATA       += ktype.seccure
+dist_profile_DATA      += profile.d/01seccure
 
 ## Commands.
 dist_pkglib_SCRIPTS    += cryptop.genkey
+dist_pkglib_SCRIPTS    += cryptop.list
 dist_pkglib_SCRIPTS    += cryptop.delkey
 dist_pkglib_SCRIPTS    += cryptop.recover
 dist_pkglib_SCRIPTS    += cryptop.info
@@ -97,32 +143,39 @@ dist_pkglib_SCRIPTS        += cryptop.decrypt
 dist_pkglib_SCRIPTS    += cryptop.sign
 dist_pkglib_SCRIPTS    += cryptop.verify
 
+## Userv services configuration.
+noinst_DATA            += userv/distorted-keys
+EXTRA_DIST             += userv/distorted-keys.in
+CLEANFILES             += userv/distorted-keys
+userv/distorted-keys: userv/distorted-keys.in Makefile
+       $(AM_V_at)mkdir -p userv/
+       $(SUBST) $(srcdir)/userv/distorted-keys.in $(SUBSTVARS) \
+                       >userv/distorted-keys.new && \
+               mv userv/distorted-keys.new userv/distorted-keys
+
 ###--------------------------------------------------------------------------
-### Main driver program and commands.
+### Configuration snippets.
 
-## Main driver.
-bin_SCRIPTS            += keys
-EXTRA_DIST             += keys.in
-CLEANFILES             += keys
-keys: keys.in Makefile
-       $(SUBST) $(srcdir)/keys.in $(SUBSTVARS) >keys.new && \
-               chmod +x keys.new && mv keys.new keys
+dist_profile_DATA      += profile.d/00base
+dist_profile_DATA      += profile.d/02infra
 
-## Utilities library.
-pkglib_DATA            += keyfunc.sh
-EXTRA_DIST             += keyfunc.sh.in
-CLEANFILES             += keyfunc.sh
-keyfunc.sh: keyfunc.sh.in Makefile
-       $(SUBST) $(srcdir)/keyfunc.sh.in $(SUBSTVARS) >keyfunc.sh.new && \
-               mv keyfunc.sh.new keyfunc.sh
+###--------------------------------------------------------------------------
+### Release setup.
 
-## Commands.
-dist_pkglib_SCRIPTS    += keys.conceal
-dist_pkglib_SCRIPTS    += keys.keeper-cards
-dist_pkglib_SCRIPTS    += keys.new-keeper
-dist_pkglib_SCRIPTS    += keys.new-recov
-dist_pkglib_SCRIPTS    += keys.recover
-dist_pkglib_SCRIPTS    += keys.reveal
-dist_pkglib_SCRIPTS    += keys.stash
+dist-hook::
+       echo $(VERSION) >$(distdir)/RELEASE
+
+EXTRA_DIST             += config/auto-version
+
+###--------------------------------------------------------------------------
+### Debian packaging.
+
+EXTRA_DIST             += debian/changelog debian/control debian/copyright
+EXTRA_DIST             += debian/rules debian/compat
+
+EXTRA_DIST             += debian/distorted-keys.install
+EXTRA_DIST             += debian/distorted-keys.postinst
+
+EXTRA_DIST             += debian/admin.users debian/admin.groups
 
 ###----- That's all, folks --------------------------------------------------