/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-01-08 03:54:06 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090108035406-01uqkv9xqgxlnw7c
Change the default value of the "checker" option command to make the
checker command be run-time dependent on the "host" client attribute
instead of reading it only once on startup:

* clients.conf (checker): Changed default commented-out value to
                          "fping -q -- %%(host)s".
* mandos (main): Changed default value for the "checker" config option
                 to "fping -q -- %%(host)s".
* mandos-clients.conf.xml (OPTIONS): Document changed default value.
  (EXAMPLE): Changed value of "checker".

* plugins.d/password-prompt.c: Whitespace changes only.

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 -fPIE
13
 
LINK_FORTIFY_LD=-z relro -fPIE
14
 
LINK_FORTIFY=-pie
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIE -pie
 
13
LINK_FORTIFY=-z relro -pie
15
14
#COVERAGE=--coverage
16
15
OPTIMIZE=-Os
17
16
LANGUAGE=-std=gnu99
18
17
htmldir=man
19
 
version=1.0.8
 
18
version=1.0.3
20
19
SED=sed
21
20
 
22
21
## Use these settings for a traditional /usr/local install
39
38
GNUTLS_LIBS=$(shell libgnutls-config --libs)
40
39
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
41
40
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
42
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
43
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
44
 
        getconf LFS_LDFLAGS)
 
41
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
42
GPGME_LIBS=$(shell gpgme-config --libs)
45
43
 
46
44
# Do not change these two
47
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
48
46
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
49
47
        -DVERSION='"$(version)"'
50
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
48
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
51
49
 
52
50
# Commands to format a DocBook <refentry> document into a manual page
53
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
78
76
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
79
77
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
80
78
CPROGS=plugin-runner $(PLUGINS)
81
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
79
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
82
80
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
83
81
        plugins.d/mandos-client.8mandos \
84
82
        plugins.d/password-prompt.8mandos mandos.conf.5 \
152
150
# Update all these files with version number $(version)
153
151
common.ent: Makefile
154
152
        $(SED) --in-place \
155
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
153
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
156
154
                $@
157
155
 
158
156
mandos: Makefile
165
163
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
166
164
                $@
167
165
 
168
 
mandos-ctl: Makefile
 
166
mandos-list: Makefile
169
167
        $(SED) --in-place \
170
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
171
169
                $@
204
202
run-client: all keydir/seckey.txt keydir/pubkey.txt
205
203
        ./plugin-runner --plugin-dir=plugins.d \
206
204
                --config-file=plugin-runner.conf \
207
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
208
 
                $(CLIENTARGS)
 
205
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
209
206
 
210
207
# Used by run-client
211
208
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
214
211
 
215
212
# Run the server with a local config
216
213
run-server: confdir/mandos.conf confdir/clients.conf
217
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
214
        ./mandos --debug --configdir=confdir
218
215
 
219
216
# Used by run-server
220
217
confdir/mandos.conf: mandos.conf
286
283
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
287
284
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
288
285
        install initramfs-tools-script \
289
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
286
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
290
287
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
291
288
        gzip --best --to-stdout mandos-keygen.8 \
292
289
                > $(MANDIR)/man8/mandos-keygen.8.gz
333
330
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
334
331
                $(INITRAMFSTOOLS)/hooks/mandos \
335
332
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
336
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
333
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
337
334
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
338
335
                $(MANDIR)/man8/mandos-keygen.8.gz \
339
336
                $(MANDIR)/man8/password-prompt.8mandos.gz \