/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: 2008-12-29 02:44:54 UTC
  • Revision ID: teddy@fukt.bsnet.se-20081229024454-nbsei556dwy5azr1
* 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 \
8
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
14
 
LINK_FORTIFY_LD=-z relro -fPIE
15
 
LINK_FORTIFY=-pie
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIE -pie
 
13
LINK_FORTIFY=-z relro -pie
16
14
#COVERAGE=--coverage
17
15
OPTIMIZE=-Os
18
16
LANGUAGE=-std=gnu99
19
17
htmldir=man
20
 
version=1.0.13
 
18
version=1.0.2
21
19
SED=sed
22
20
 
23
21
## Use these settings for a traditional /usr/local install
36
34
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
37
35
##
38
36
 
39
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
40
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
37
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
38
GNUTLS_LIBS=$(shell libgnutls-config --libs)
41
39
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
42
40
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
43
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
44
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
45
 
        getconf LFS_LDFLAGS)
 
41
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
42
GPGME_LIBS=$(shell gpgme-config --libs)
46
43
 
47
44
# Do not change these two
48
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
49
46
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
50
47
        -DVERSION='"$(version)"'
51
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
48
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
52
49
 
53
50
# Commands to format a DocBook <refentry> document into a manual page
54
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
79
76
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
80
77
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
81
78
CPROGS=plugin-runner $(PLUGINS)
82
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
79
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
83
80
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
84
81
        plugins.d/mandos-client.8mandos \
85
82
        plugins.d/password-prompt.8mandos mandos.conf.5 \
153
150
# Update all these files with version number $(version)
154
151
common.ent: Makefile
155
152
        $(SED) --in-place \
156
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
153
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
157
154
                $@
158
155
 
159
156
mandos: Makefile
166
163
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
167
164
                $@
168
165
 
169
 
mandos-ctl: Makefile
 
166
mandos-list: Makefile
170
167
        $(SED) --in-place \
171
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
172
169
                $@
178
175
        $(SED) --in-place \
179
176
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
180
177
                $@
181
 
        $(SED) --in-place \
182
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
183
 
                $@
184
178
 
185
179
plugins.d/mandos-client: plugins.d/mandos-client.o
186
180
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
205
199
run-client: all keydir/seckey.txt keydir/pubkey.txt
206
200
        ./plugin-runner --plugin-dir=plugins.d \
207
201
                --config-file=plugin-runner.conf \
208
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
209
 
                $(CLIENTARGS)
 
202
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
210
203
 
211
204
# Used by run-client
212
205
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
215
208
 
216
209
# Run the server with a local config
217
210
run-server: confdir/mandos.conf confdir/clients.conf
218
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
211
        ./mandos --debug --configdir=confdir
219
212
 
220
213
# Used by run-server
221
214
confdir/mandos.conf: mandos.conf
287
280
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
288
281
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
289
282
        install initramfs-tools-script \
290
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
283
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
291
284
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
292
285
        gzip --best --to-stdout mandos-keygen.8 \
293
286
                > $(MANDIR)/man8/mandos-keygen.8.gz
334
327
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
335
328
                $(INITRAMFSTOOLS)/hooks/mandos \
336
329
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
337
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
330
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
338
331
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
339
332
                $(MANDIR)/man8/mandos-keygen.8.gz \
340
333
                $(MANDIR)/man8/password-prompt.8mandos.gz \