/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: 2015-08-10 09:00:23 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150810090023-fz6vjqr7zf33e2tf
Support the standard org.freedesktop.DBus.ObjectManager interface.

Now that the D-Bus standard has an interface to keep track of new and
removed objects, use that instead of our own methods.  This deprecates
our D-Bus methods "GetAllClients" and "GetAllClientsWithProperties"
and the signals "ClientAdded" and "ClientRemoved", all on the server
interface "se.recompile.Mandos".

* DBUS-API: Removed references to deprecated methods and signals;
  insert reference to the org.freedesktop.DBus.ObjectManager
  interface.
* mandos (DBusObjectWithProperties._get_all_interface_names): New.
  (dbus.OBJECT_MANAGER_IFACE): If not present, monkey patch.
  (DBusObjectWithObjectManager): New.
  (main/MandosDBusService): Inherit from DBusObjectWithObjectManager.
  (main/MandosDBusService.ClientRemoved): Annotate as deprecated.
  (main/MandosDBusService.GetAllClients): - '' -
  (main/MandosDBusService.GetAllClientsWithProperties): Annotate as
                                                        deprecated.
                                                        Also only
                                                        return
                                                        properties on
                                                        client
                                                        interface.
  (main/MandosDBusService.RemoveClient): Call client_removed_signal
                                         instead of ClientRemoved.
  (main/MandosDBusService.GetManagedObjects): New.
  (main/MandosDBusService.client_added_signal): New.
  (main/MandosDBusService.client_removed_signal): - '' -
  (main/cleanup): Call "client_removed_signal" instead of sending
                  "ClientRemoved" signal directly.
  (main): Call "client_added_signal" instead of sending "ClientAdded"
          signal directly.
* mandos-ctl: Use GetManagedObjects instead of
              GetAllClientsWithProperties.  Also, show better error
              message in case of failure to connect to the D-Bus

* mandos-monitor (MandosClientPropertyCache.properties_changed):
  Bug fix; only update properties on client interface.
  (UserInterface.find_and_remove_client): Change to accept arguments
                                          from InterfacesRemoved
                                          signal.  Also, bug fix:
                                          working error message when
                                          removing unknown client.
  (UserInterface.add_new_client): Change to accept arguments from
                                  InterfacesRemoved signal.  Pass
                                  properties to MandosClientWidget
                                  constructor.
  (UserInterface.run): Connect find_and_remove_client method to
                       InterfacesRemoved signal and the add_new_client
                       method to the InterfacesAdded signal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
1
1
#!/usr/bin/make -f
2
 
# Sample debian/rules that uses debhelper.
3
 
#
4
 
# This file was originally written by Joey Hess and Craig Small.
5
 
# As a special exception, when this file is copied by dh-make into a
6
 
# dh-make output file, you may use that output file without restriction.
7
 
# This special exception was added by Craig Small in version 0.37 of dh-make.
8
 
#
9
 
# Modified to make a template file for a multi-binary package with separated
10
 
# build-arch and build-indep targets  by Bill Allombert 2001
11
 
 
12
 
# Uncomment this to turn on verbose mode.
13
 
#export DH_VERBOSE=1
14
 
 
15
 
# This has to be exported to make some magic below work.
16
 
export DH_OPTIONS
17
 
 
18
 
# -pie was broken briefly on the mips and mipsel architectures, see
19
 
# <http://bugs.debian.org/526961>
20
 
BINUTILS_V := $(shell dpkg-query --showformat='$${Version}' \
21
 
                        --show binutils)
22
 
ifeq (yes,$(shell dpkg --compare-versions $(BINUTILS_V) lt 2.20-3 \
23
 
                && dpkg --compare-versions $(BINUTILS_V) ge 2.19.1-1 \
24
 
                && echo yes))
25
 
  ifneq (,$(strip $(findstring :$(DEB_HOST_ARCH):,:mips:mipsel:) \
26
 
                $(findstring :$(DEB_BUILD_ARCH):,:mips:mipsel:)))
27
 
    BROKEN_PIE := yes
28
 
    export BROKEN_PIE
29
 
  endif
30
 
endif
31
 
 
32
 
configure: configure-stamp
33
 
configure-stamp:
34
 
        dh_testdir
35
 
        touch configure-stamp
36
 
 
37
 
build: build-arch build-indep
38
 
 
39
 
build-arch: build-arch-stamp
40
 
build-arch-stamp: configure-stamp
 
2
%:
 
3
        dh $@
 
4
 
 
5
override_dh_auto_build-arch:
41
6
        LC_ALL=en_US.utf8 dh_auto_build -- all doc
42
 
        touch $@
43
 
 
44
 
build-indep: build-indep-stamp
45
 
build-indep-stamp: configure-stamp
46
 
        LC_ALL=en_US.UTF-8 dh_auto_build -- doc
47
 
        touch $@
48
 
 
49
 
clean:
50
 
        dh_testdir
51
 
        dh_testroot
52
 
        rm -f build-arch-stamp build-indep-stamp configure-stamp
53
 
        dh_auto_clean
54
 
        dh_clean
55
 
 
56
 
install: install-indep install-arch
57
 
install-indep:
58
 
        dh_testdir
59
 
        dh_testroot
60
 
        dh_prep
61
 
        dh_installdirs --indep
62
 
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos install-server
63
 
        dh_lintian
 
7
 
 
8
override_dh_auto_build-indep:
 
9
        LC_ALL=en_US.utf8 dh_auto_build -- doc
 
10
 
 
11
override_dh_installinit-indep:
64
12
        dh_installinit --onlyscripts \
65
13
                --update-rcd-params="defaults 25 15"
66
 
        dh_install --indep
67
 
 
68
 
install-arch:
69
 
        dh_testdir
70
 
        dh_testroot
71
 
        dh_prep
72
 
        dh_installdirs --same-arch
73
 
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos-client install-client-nokey
74
 
        dh_lintian
75
 
        dh_install --same-arch
76
 
 
77
 
binary-common:
78
 
        dh_testdir
79
 
        dh_testroot
80
 
        dh_installchangelogs
81
 
        dh_installdocs
82
 
        dh_installexamples
83
 
        dh_link
84
 
        dh_strip
85
 
        dh_compress
 
14
 
 
15
override_dh_auto_install-indep:
 
16
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos install-server
 
17
 
 
18
override_dh_auto_install-arch:
 
19
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos-client \
 
20
                install-client-nokey
 
21
 
 
22
override_dh_fixperms:
86
23
        dh_fixperms --exclude etc/keys/mandos \
87
24
                --exclude etc/mandos/clients.conf \
88
25
                --exclude etc/mandos/plugins.d \
89
 
                --exclude usr/lib/mandos/plugins.d \
 
26
                --exclude usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)/mandos/plugins.d \
90
27
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d
91
 
        dh_installdeb
92
 
        dh_shlibdeps
93
 
        dh_gencontrol
94
 
        dh_md5sums
95
 
        dh_builddeb
96
 
 
97
 
# Build architecture independant packages using the common target.
98
 
binary-indep: build-indep install-indep
99
 
        $(MAKE) -f debian/rules DH_OPTIONS=--indep binary-common
100
 
 
101
 
# Build architecture dependant packages using the common target.
102
 
binary-arch: build-arch install-arch
103
 
        $(MAKE) -f debian/rules DH_OPTIONS=--same-arch binary-common
104
 
 
105
 
binary: binary-arch binary-indep
106
 
 
107
 
.PHONY: build clean binary-indep binary-arch binary install \
108
 
                install-indep install-arch configure
 
28
        chmod --recursive g-w -- \
 
29
        "$(CURDIR)/debian/mandos-client/usr/share/doc/mandos-client/examples/network-hooks.d"
 
30
 
 
31
override_dh_auto_test-arch: ;