/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Teddy Hogeborn
  • Date: 2014-06-22 02:19:30 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 317.
  • Revision ID: teddy@recompile.se-20140622021930-icl7h4cm97blhjml
mandos-keygen: Generate "checker" option to use SSH fingerprints.

To turn this off, use a new "--no-ssh" option to mandos-keygen.

* INSTALL (Mandos Server, Mandos Client): Document new suggested
                                          installation of SSH.
* Makefile (confdir/clients.conf): Use new "--no-ssh" option to
                                   "mandos-keygen".
* debian/control (mandos/Depends): Changed to "fping | ssh-client".
  (mandos-client/Recommends): New; set to "ssh".
* intro.xml (FREQUENTLY ASKED QUESTIONS): Rename and rewrite section
                                          called "Faking ping
                                          replies?" to address new
                                          default behavior.
* mandos-clients.conf.xml (OPTIONS/checker): Briefly discuss new
                                             behavior of
                                             mandos-keygen.
* mandos-keygen: Bug fix: Suppress failure output of "shred" to remove
                 "sec*", since no such files may exist.
 (password mode): Scan for SSH key fingerprints and output as new
                  "checker" and "ssh_fingerprint" options, unless new
                  "--no-ssh" option is given.
* mandos-keygen.xml (SYNOPSIS/--force): Bug fix: Document short form.
  (OPTIONS/--no-ssh): New.
  (SEE ALSO): Add reference "ssh-keyscan(1)".
* plugins.d/mandos-client.xml (SECURITY): Briefly mention the
                                          possibility of using SSH key
                                          fingerprints for checking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
1
1
#!/usr/bin/make -f
2
 
 
3
 
ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
4
 
    MAKEFLAGS += OPTIMIZE=-O0
5
 
endif
6
 
 
7
 
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
8
 
    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
9
 
    MAKEFLAGS += -j$(NUMJOBS)
10
 
endif
11
 
 
12
2
%:
13
3
        dh $@
14
4
 
29
19
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos-client \
30
20
                install-client-nokey
31
21
 
32
 
override_dh_fixperms-arch:
 
22
override_dh_fixperms:
33
23
        dh_fixperms --exclude etc/keys/mandos \
 
24
                --exclude etc/mandos/clients.conf \
34
25
                --exclude etc/mandos/plugins.d \
35
 
                --exclude etc/mandos/plugin-helpers \
36
 
                --exclude usr/lib/$(DEB_HOST_MULTIARCH)/mandos/plugins.d \
37
 
                --exclude usr/lib/$(DEB_HOST_MULTIARCH)/mandos/plugin-helpers \
 
26
                --exclude usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)/mandos/plugins.d \
38
27
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d
39
28
        chmod --recursive g-w -- \
40
29
        "$(CURDIR)/debian/mandos-client/usr/share/doc/mandos-client/examples/network-hooks.d"
41
30
 
42
 
override_dh_fixperms-indep:
43
 
        dh_fixperms --exclude etc/mandos/clients.conf
44
 
 
45
31
override_dh_auto_test-arch: ;
46
 
 
47
 
#bpo## dpkg-shlibdeps sees the "libgnutls28-dev (>= 3.6.6) |
48
 
#bpo## libgnutls28-dev (<< 3.6.0)," in the build-dependencies not as two
49
 
#bpo## alternatives, but as an absolute dependency on libgnutls30 >= 3.6.6.
50
 
#bpo## So we have to do this ugly hack to hide this build dependency if we
51
 
#bpo## compiled with libgnutls30 << 3.6.0.
52
 
#bpo#override_dh_shlibdeps-arch:
53
 
#bpo#   -gnutls_version=$$(dpkg-query --showformat='$${Version}' \
54
 
#bpo#           --show libgnutls30); \
55
 
#bpo#   dpkg --compare-versions $$gnutls_version lt 3.6.0 \
56
 
#bpo#           && { cp --archive debian/control debian/control.orig; sed --expression='s/libgnutls28-dev (>= 3\.6\.6) |//' debian/control; }
57
 
#bpo#   dh_shlibdeps
58
 
#bpo#   -gnutls_version=$$(dpkg-query --showformat='$${Version}' \
59
 
#bpo#           --show libgnutls30); \
60
 
#bpo#   dpkg --compare-versions $$gnutls_version lt 3.6.0 \
61
 
#bpo#           && mv debian/control.orig debian/control