/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-03-10 02:35:22 UTC
  • Revision ID: teddy@recompile.se-20190310023522-cvos2tw2si6t7if3
mandos-ctl: Minimize number of D-Bus calls

* mandos-ctl (Command.run): Now takes a {objpath: properties} dict,
                            followed by optional "bus" and "mandos"
                            arguments.  Use "bus" to connect to
                            clients when dispatching to method
                            run_on_one_client().  All callers changed.
  (IsEnabledCmd.run): New.
  (IsEnabledCmd.run_on_one_client): Remove.
  (ApproveCmd.run_on_one_client): Add busname to debug output.
  (DenyCmd.run_on_one_client): - '' -
  (main): In D-Bus debug output, change "name" to "busname".  Also,
          don't connect to clients, just use the object path as the
          key of the "clients" dict passed to Command.run().
  (TestCmd.clients): Changed to an {objpath: properties} dict.
  (TestCmd.one_client): - '' -
  (TestCmd.bus): New mock bus object having a get_object() method.

Show diffs side-by-side

added added

removed removed

Lines of Context:
35
35
                --exclude etc/mandos/plugin-helpers \
36
36
                --exclude usr/lib/$(DEB_HOST_MULTIARCH)/mandos/plugins.d \
37
37
                --exclude usr/lib/$(DEB_HOST_MULTIARCH)/mandos/plugin-helpers \
38
 
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d/
 
38
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d
39
39
        chmod --recursive g-w -- \
40
40
        "$(CURDIR)/debian/mandos-client/usr/share/doc/mandos-client/examples/network-hooks.d"
41
41
 
53
53
#bpo#   -gnutls_version=$$(dpkg-query --showformat='$${Version}' \
54
54
#bpo#           --show libgnutls30); \
55
55
#bpo#   dpkg --compare-versions $$gnutls_version lt 3.6.0 \
56
 
#bpo#           && { cp --archive debian/control debian/control.orig; sed --in-place --expression='s/libgnutls28-dev (>= 3\.6\.6) |//' debian/control; }
 
56
#bpo#           && { cp --archive debian/control debian/control.orig; sed --expression='s/libgnutls28-dev (>= 3\.6\.6) |//' debian/control; }
57
57
#bpo#   dh_shlibdeps
58
58
#bpo#   -gnutls_version=$$(dpkg-query --showformat='$${Version}' \
59
59
#bpo#           --show libgnutls30); \