/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 Makefile

  • Committer: Teddy Hogeborn
  • Date: 2009-12-25 23:13:47 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091225231347-gg9u9ru0wj0f24hh
More consistent terminology: Clients are no longer "invalid" - they
are "disabled".  All code and documentation changed to reflect this.

D=Bus API change: The "properties" argument was removed from the
"ClientAdded" signal on interface "se.bsnet.fukt.Mandos".  All code in
both "mandos" and "mandos-monitor" changed to reflect this.

* mandos: Replaced "with closing(F)" with simply "with F" in all
          places where F is a file object.
  (Client.still_valid): Removed.  All callers changed to look at
                        "Client.enabled" instead.
  (dbus_service_property): Check for unsupported signatures with the
                           "byte_arrays" option.
  (DBusObjectWithProperties.Set): - '' -
  (ClientHandler.handle): Use the reverse pipe to receive the
                          "Client.enabled" attribute instead of the
                          now-removed "Client.still_valid()" method.
  (ForkingMixInWithPipe): Renamed to "ForkingMixInWithPipes" (all
                          users changed).  Now also create a reverse
                          pipe for sending data to the child process.
  (ForkingMixInWithPipes.add_pipe): Now takes two pipe fd's as
                                    arguments.  All callers changed.
  (IPv6_TCPServer.handle_ipc): Take an additional "reply_fd" argument
                               (all callers changed).  Close the reply
                               pipe when the child data pipe is
                               closed.  New "GETATTR" IPC method; will
                               pickle client attribute and send it
                               over the reply pipe FD.
  (MandosDBusService.ClientAdded): Removed "properties" argument.  All
                                   emitters changed.
* mandos-clients.conf.xml (DESCRIPTION, OPTIONS): Use
                                                  "enabled/disabled"
                                                  terminology.
* mandos-ctl: Option "--is-valid" renamed to "--is-enabled".
* mandos-monitor: Enable user locale.  Try to log exceptions.
  (MandosClientPropertyCache.__init__): Removed "properties" argument.
                                        All callers changed.
  (UserInterface.add_new_client): Remove "properties" argument.  All
                                  callers changed.  Supply "logger"
                                  argument to MandosClientWidget().
  (UserInterface.add_client): New "logger" argument.  All callers
                              changed.
* mandos.xml (BUGS, SECURITY/CLIENTS): Use "enabled/disabled"
                                       terminology.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
13
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
14
LINK_FORTIFY_LD=-z relro -z now
15
15
LINK_FORTIFY=
 
16
 
 
17
# If BROKEN_PIE is set, do not build with -pie
16
18
ifndef BROKEN_PIE
17
19
FORTIFY += -fPIE
18
 
LINK_FORTIFY_LD += -fPIE
19
20
LINK_FORTIFY += -pie
20
21
endif
21
22
#COVERAGE=--coverage
56
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
57
58
 
58
59
# Commands to format a DocBook <refentry> document into a manual page
59
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
60
61
        --param man.charmap.use.subset          0 \
61
62
        --param make.year.ranges                1 \
62
63
        --param make.single.year.ranges         1 \
64
65
        --param man.authors.section.enabled     0 \
65
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
66
67
        $(notdir $<); \
67
 
        $(MANPOST) $(notdir $@)
 
68
        $(MANPOST) $(notdir $@))
68
69
# DocBook-to-man post-processing to fix a '\n' escape bug
69
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
70
71
 
71
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
72
73
        --param make.year.ranges                1 \
73
74
        --param make.single.year.ranges         1 \
74
75
        --param man.output.quietly              1 \
76
77
        --param citerefentry.link               1 \
77
78
        --output $@ \
78
79
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
79
 
        $<; $(HTMLPOST) $@
 
80
        $<; $(HTMLPOST) $@)
80
81
# Fix citerefentry links
81
82
HTMLPOST=$(SED) --in-place \
82
83
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
157
158
 
158
159
# Update all these files with version number $(version)
159
160
common.ent: Makefile
160
 
        $(SED) --in-place \
 
161
        $(strip $(SED) --in-place \
161
162
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
162
 
                $@
 
163
                $@)
163
164
 
164
165
mandos: Makefile
165
 
        $(SED) --in-place \
 
166
        $(strip $(SED) --in-place \
166
167
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
167
 
                $@
 
168
                $@)
168
169
 
169
170
mandos-keygen: Makefile
170
 
        $(SED) --in-place \
 
171
        $(strip $(SED) --in-place \
171
172
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
172
 
                $@
 
173
                $@)
173
174
 
174
175
mandos-ctl: Makefile
175
 
        $(SED) --in-place \
 
176
        $(strip $(SED) --in-place \
176
177
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
177
 
                $@
 
178
                $@)
178
179
 
179
180
mandos.lsm: Makefile
180
 
        $(SED) --in-place \
 
181
        $(strip $(SED) --in-place \
181
182
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
182
 
                $@
183
 
        $(SED) --in-place \
 
183
                $@)
 
184
        $(strip $(SED) --in-place \
184
185
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
185
 
                $@
186
 
        $(SED) --in-place \
 
186
                $@)
 
187
        $(strip $(SED) --in-place \
187
188
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
188
 
                $@
 
189
                $@)
189
190
 
190
 
plugins.d/mandos-client: plugins.d/mandos-client.o
191
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
192
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
191
plugins.d/mandos-client: plugins.d/mandos-client.c
 
192
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
193
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
193
194
 
194
195
.PHONY : all doc html clean distclean run-client run-server install \
195
196
        install-server install-client uninstall uninstall-server \