/mandos/trunk

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

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Teddy Hogeborn
  • Date: 2019-02-10 08:41:14 UTC
  • Revision ID: teddy@recompile.se-20190210084114-u91mijrxtifvzra5
Bug fix: Only create TLS key with certtool, and read correct key file

* debian/mandos-client.postinst (create_keys): Remove any bad keys
                                               created by 1.8.0-1.
                                               Only create TLS keys if
                                               certtool succeeds.
* debian/mandos.postinst (configure): Remove any bad keys from
                                      clients.conf, and inform the
                                      user if any were found.
* debian/mandos.templates (mandos/removed_bad_key_ids): New message.
* mandos (MandosServer.handle_ipc): Do not trust a key_id with a known
                                    bad key ID.
* mandos-keygen (keygen): Only create TLS keys if certtool succeeds.
  (password): Bug fix: Generate key_id correctly, and only output
              key_id if TLS key exists.

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
 
2
12
%:
3
13
        dh $@
4
14
 
23
33
        dh_fixperms --exclude etc/keys/mandos \
24
34
                --exclude etc/mandos/plugins.d \
25
35
                --exclude etc/mandos/plugin-helpers \
26
 
                --exclude usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)/mandos/plugins.d \
27
 
                --exclude usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)/mandos/plugin-helpers \
 
36
                --exclude usr/lib/$(DEB_HOST_MULTIARCH)/mandos/plugins.d \
 
37
                --exclude usr/lib/$(DEB_HOST_MULTIARCH)/mandos/plugin-helpers \
28
38
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d
29
39
        chmod --recursive g-w -- \
30
40
        "$(CURDIR)/debian/mandos-client/usr/share/doc/mandos-client/examples/network-hooks.d"