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

* mandos (Client.timeout, Client.interval): Changed from being a
                                            property to be a normal
                                            attribute.
  (Client._timeout, Client._interval): Removed.
  (Client._timeout_milliseconds): Changed from being an attribute to
                                  be a method "timeout_milliseconds".
                                  All users changed.
  (Client._interval_milliseconds): Changed from being an attribute to
                                   be method "interval_milliseconds".
                                   All users changed.
  (Client.__init__): Take additional "use_dbus" keyword argument.
                     Only provide D-Bus interface if "use_dbus" is
                     True.
  (Client.use_dbus): New attribute.
  (Client.dbus_object_path): Changed to only be set if "self.use_dbus"
                             is True.
  (Client.enable, Client.disable, Client.checker_callback,
  Client.bump_timeout, Client.start_checker, Client.stop_checker):
  Only emit D-Bus signals if "self.use_dbus".
  (Client.SetChecker, Client.SetHost, Client.Enable): Bug fix: Emit
                                                      D-Bus signals.
  (Client.SetInterval, Client.SetTimeout): Changed to emit D-Bus
                                           signals.

  (main): Remove deprecated "default" keyword argument to "--check"
          option.  Added new "--no-dbus" option.  Added corresponding
          "use_dbus" server configuration option.  Only provide D-Bus
          interface and emit D-Bus signals if "use_dbus".  Pass
          "use_dbus" on to Client constructor.

* mandos-options.xml ([@id="dbus"]): New option.

* mandos.conf (use_dbus): New option.

* mandos.conf.xml (OPTIONS): New option "use_dbus".
  (EXAMPLE): - '' -

* mandos.xml (SYNOPSIS): New option "--no-dbus".
  (D-BUS INTERFACE): New section.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
13
 
LINK_FORTIFY_LD=-z relro -z now
14
 
LINK_FORTIFY=
15
 
ifndef BROKEN_PIE
16
 
FORTIFY += -fPIE
17
 
LINK_FORTIFY_LD += -fPIE
18
 
LINK_FORTIFY += -pie
19
 
endif
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIE -pie
 
13
LINK_FORTIFY=-z relro -pie
20
14
#COVERAGE=--coverage
21
15
OPTIMIZE=-Os
22
16
LANGUAGE=-std=gnu99
23
17
htmldir=man
24
 
version=1.0.14
 
18
version=1.0.2
25
19
SED=sed
26
20
 
27
21
## Use these settings for a traditional /usr/local install
40
34
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
41
35
##
42
36
 
43
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
44
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
37
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
38
GNUTLS_LIBS=$(shell libgnutls-config --libs)
45
39
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
46
40
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
47
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
48
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
49
 
        getconf LFS_LDFLAGS)
 
41
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
42
GPGME_LIBS=$(shell gpgme-config --libs)
50
43
 
51
44
# Do not change these two
52
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
53
46
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
54
47
        -DVERSION='"$(version)"'
55
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
48
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
56
49
 
57
50
# Commands to format a DocBook <refentry> document into a manual page
58
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
83
76
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
84
77
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
85
78
CPROGS=plugin-runner $(PLUGINS)
86
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
79
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
87
80
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
88
81
        plugins.d/mandos-client.8mandos \
89
82
        plugins.d/password-prompt.8mandos mandos.conf.5 \
157
150
# Update all these files with version number $(version)
158
151
common.ent: Makefile
159
152
        $(SED) --in-place \
160
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
153
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
161
154
                $@
162
155
 
163
156
mandos: Makefile
170
163
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
171
164
                $@
172
165
 
173
 
mandos-ctl: Makefile
 
166
mandos-list: Makefile
174
167
        $(SED) --in-place \
175
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
176
169
                $@
182
175
        $(SED) --in-place \
183
176
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
184
177
                $@
185
 
        $(SED) --in-place \
186
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
187
 
                $@
188
178
 
189
179
plugins.d/mandos-client: plugins.d/mandos-client.o
190
180
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
209
199
run-client: all keydir/seckey.txt keydir/pubkey.txt
210
200
        ./plugin-runner --plugin-dir=plugins.d \
211
201
                --config-file=plugin-runner.conf \
212
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
213
 
                $(CLIENTARGS)
 
202
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
214
203
 
215
204
# Used by run-client
216
205
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
219
208
 
220
209
# Run the server with a local config
221
210
run-server: confdir/mandos.conf confdir/clients.conf
222
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
211
        ./mandos --debug --configdir=confdir
223
212
 
224
213
# Used by run-server
225
214
confdir/mandos.conf: mandos.conf
291
280
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
292
281
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
293
282
        install initramfs-tools-script \
294
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
283
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
295
284
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
296
285
        gzip --best --to-stdout mandos-keygen.8 \
297
286
                > $(MANDIR)/man8/mandos-keygen.8.gz
338
327
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
339
328
                $(INITRAMFSTOOLS)/hooks/mandos \
340
329
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
341
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
330
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
342
331
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
343
332
                $(MANDIR)/man8/mandos-keygen.8.gz \
344
333
                $(MANDIR)/man8/password-prompt.8mandos.gz \