/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

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 \
7
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
 
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
14
 
LINK_FORTIFY_LD=-z relro -z now
15
 
LINK_FORTIFY=
16
 
 
17
 
# If BROKEN_PIE is set, do not build with -pie
18
 
ifndef BROKEN_PIE
19
 
FORTIFY += -fPIE
20
 
LINK_FORTIFY += -pie
21
 
endif
 
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
22
14
#COVERAGE=--coverage
23
15
OPTIMIZE=-Os
24
16
LANGUAGE=-std=gnu99
25
17
htmldir=man
26
 
version=1.5.2
 
18
version=1.0.3
27
19
SED=sed
28
20
 
29
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
30
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
31
 
 
32
21
## Use these settings for a traditional /usr/local install
33
22
# PREFIX=$(DESTDIR)/usr/local
34
23
# CONFDIR=$(DESTDIR)/etc/mandos
35
24
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
25
# MANDIR=$(PREFIX)/man
37
26
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
27
##
40
28
 
41
29
## These settings are for a package-type install
44
32
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
33
MANDIR=$(PREFIX)/share/man
46
34
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
48
35
##
49
36
 
50
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
51
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
37
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
38
GNUTLS_LIBS=$(shell libgnutls-config --libs)
52
39
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
53
40
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
54
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
55
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
56
 
        getconf LFS_LDFLAGS)
 
41
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
42
GPGME_LIBS=$(shell gpgme-config --libs)
57
43
 
58
44
# Do not change these two
59
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
46
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
47
        -DVERSION='"$(version)"'
62
 
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
48
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
63
49
 
64
50
# Commands to format a DocBook <refentry> document into a manual page
65
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
66
52
        --param man.charmap.use.subset          0 \
67
53
        --param make.year.ranges                1 \
68
54
        --param make.single.year.ranges         1 \
70
56
        --param man.authors.section.enabled     0 \
71
57
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
58
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
75
 
        --local-file $(notdir $@) >/dev/null)
 
59
        $(MANPOST) $(notdir $@)
76
60
# DocBook-to-man post-processing to fix a '\n' escape bug
77
61
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
78
62
 
79
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
63
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
80
64
        --param make.year.ranges                1 \
81
65
        --param make.single.year.ranges         1 \
82
66
        --param man.output.quietly              1 \
84
68
        --param citerefentry.link               1 \
85
69
        --output $@ \
86
70
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
87
 
        $<; $(HTMLPOST) $@)
 
71
        $<; $(HTMLPOST) $@
88
72
# Fix citerefentry links
89
73
HTMLPOST=$(SED) --in-place \
90
74
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
91
75
 
92
76
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
93
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
94
 
        plugins.d/plymouth
 
77
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
95
78
CPROGS=plugin-runner $(PLUGINS)
96
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
97
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
98
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
79
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
 
80
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
99
81
        plugins.d/mandos-client.8mandos \
100
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
101
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
102
 
        plugins.d/plymouth.8mandos intro.8mandos
 
82
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
83
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
84
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
103
85
 
104
86
htmldocs=$(addsuffix .xhtml,$(DOCS))
105
87
 
126
108
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
127
109
        $(DOCBOOKTOHTML)
128
110
 
129
 
intro.8mandos: intro.xml common.ent legalnotice.xml
130
 
        $(DOCBOOKTOMAN)
131
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
132
 
        $(DOCBOOKTOHTML)
133
 
 
134
111
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
135
112
                legalnotice.xml
136
113
        $(DOCBOOKTOMAN)
145
122
                 legalnotice.xml
146
123
        $(DOCBOOKTOHTML)
147
124
 
148
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
149
 
                legalnotice.xml
150
 
        $(DOCBOOKTOMAN)
151
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
152
 
                 legalnotice.xml
153
 
        $(DOCBOOKTOHTML)
154
 
 
155
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
156
 
                legalnotice.xml
157
 
        $(DOCBOOKTOMAN)
158
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
159
 
                 legalnotice.xml
160
 
        $(DOCBOOKTOHTML)
161
 
 
162
125
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
163
126
                legalnotice.xml
164
127
        $(DOCBOOKTOMAN)
186
149
 
187
150
# Update all these files with version number $(version)
188
151
common.ent: Makefile
189
 
        $(strip $(SED) --in-place \
190
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
191
 
                $@)
 
152
        $(SED) --in-place \
 
153
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
154
                $@
192
155
 
193
156
mandos: Makefile
194
 
        $(strip $(SED) --in-place \
 
157
        $(SED) --in-place \
195
158
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
196
 
                $@)
 
159
                $@
197
160
 
198
161
mandos-keygen: Makefile
199
 
        $(strip $(SED) --in-place \
 
162
        $(SED) --in-place \
200
163
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
201
 
                $@)
202
 
 
203
 
mandos-ctl: Makefile
204
 
        $(strip $(SED) --in-place \
205
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
206
 
                $@)
207
 
 
208
 
mandos-monitor: Makefile
209
 
        $(strip $(SED) --in-place \
210
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
211
 
                $@)
 
164
                $@
 
165
 
 
166
mandos-list: Makefile
 
167
        $(SED) --in-place \
 
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
169
                $@
212
170
 
213
171
mandos.lsm: Makefile
214
 
        $(strip $(SED) --in-place \
 
172
        $(SED) --in-place \
215
173
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
216
 
                $@)
217
 
        $(strip $(SED) --in-place \
 
174
                $@
 
175
        $(SED) --in-place \
218
176
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
219
 
                $@)
220
 
        $(strip $(SED) --in-place \
 
177
                $@
 
178
        $(SED) --in-place \
221
179
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
222
 
                $@)
 
180
                $@
223
181
 
224
 
plugins.d/mandos-client: plugins.d/mandos-client.c
225
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
226
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
182
plugins.d/mandos-client: plugins.d/mandos-client.o
 
183
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
184
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
227
185
 
228
186
.PHONY : all doc html clean distclean run-client run-server install \
229
187
        install-server install-client uninstall uninstall-server \
235
193
distclean: clean
236
194
mostlyclean: clean
237
195
maintainer-clean: clean
238
 
        -rm --force --recursive keydir confdir statedir
 
196
        -rm --force --recursive keydir confdir
239
197
 
240
198
check:  all
241
199
        ./mandos --check
242
200
 
243
201
# Run the client with a local config and key
244
202
run-client: all keydir/seckey.txt keydir/pubkey.txt
245
 
        @echo "###################################################################"
246
 
        @echo "# The following error messages are harmless and can be safely     #"
247
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
248
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
249
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
250
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
251
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
252
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
253
 
        @echo "#                     seteuid: Operation not permitted            #"
254
 
        @echo "#                     klogctl: Operation not permitted            #"
255
 
        @echo "###################################################################"
256
203
        ./plugin-runner --plugin-dir=plugins.d \
257
204
                --config-file=plugin-runner.conf \
258
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
259
 
                $(CLIENTARGS)
 
205
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
260
206
 
261
207
# Used by run-client
262
208
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
265
211
 
266
212
# Run the server with a local config
267
213
run-server: confdir/mandos.conf confdir/clients.conf
268
 
        ./mandos --debug --no-dbus --configdir=confdir \
269
 
                --statedir=statedir $(SERVERARGS)
 
214
        ./mandos --debug --configdir=confdir
270
215
 
271
216
# Used by run-server
272
217
confdir/mandos.conf: mandos.conf
277
222
        install --mode=u=rw $< $@
278
223
# Add a client password
279
224
        ./mandos-keygen --dir keydir --password >> $@
280
 
statedir:
281
 
        install --directory statedir
282
225
 
283
226
install: install-server install-client-nokey
284
227
 
289
232
 
290
233
install-server: doc
291
234
        install --directory $(CONFDIR)
292
 
        install --directory --mode=u=rwx --owner=$(USER) \
293
 
                --group=$(GROUP) $(STATEDIR)
294
235
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
295
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
296
 
                mandos-ctl
297
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
298
 
                mandos-monitor
299
236
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
300
237
                mandos.conf
301
238
        install --mode=u=rw --target-directory=$(CONFDIR) \
302
239
                clients.conf
303
 
        install --mode=u=rw,go=r dbus-mandos.conf \
304
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
305
240
        install --mode=u=rwx,go=rx init.d-mandos \
306
241
                $(DESTDIR)/etc/init.d/mandos
307
242
        install --mode=u=rw,go=r default-mandos \
311
246
        fi
312
247
        gzip --best --to-stdout mandos.8 \
313
248
                > $(MANDIR)/man8/mandos.8.gz
314
 
        gzip --best --to-stdout mandos-monitor.8 \
315
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
316
 
        gzip --best --to-stdout mandos-ctl.8 \
317
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
318
249
        gzip --best --to-stdout mandos.conf.5 \
319
250
                > $(MANDIR)/man5/mandos.conf.5.gz
320
251
        gzip --best --to-stdout mandos-clients.conf.5 \
321
252
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
322
 
        gzip --best --to-stdout intro.8mandos \
323
 
                > $(MANDIR)/man8/intro.8mandos.gz
324
253
 
325
254
install-client-nokey: all doc
326
255
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
330
259
                install --mode=u=rwx \
331
260
                        --directory "$(CONFDIR)/plugins.d"; \
332
261
        fi
333
 
        install --mode=u=rwx,go=rx --directory \
334
 
                "$(CONFDIR)/network-hooks.d"
335
262
        install --mode=u=rwx,go=rx \
336
263
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
337
264
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
351
278
        install --mode=u=rwxs,go=rx \
352
279
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
353
280
                plugins.d/askpass-fifo
354
 
        install --mode=u=rwxs,go=rx \
355
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
356
 
                plugins.d/plymouth
357
281
        install initramfs-tools-hook \
358
282
                $(INITRAMFSTOOLS)/hooks/mandos
359
283
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
360
284
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
361
285
        install initramfs-tools-script \
362
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
286
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
363
287
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
364
288
        gzip --best --to-stdout mandos-keygen.8 \
365
289
                > $(MANDIR)/man8/mandos-keygen.8.gz
366
290
        gzip --best --to-stdout plugin-runner.8mandos \
367
291
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
292
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
293
                > $(MANDIR)/man8/password-prompt.8mandos.gz
368
294
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
369
295
                > $(MANDIR)/man8/mandos-client.8mandos.gz
370
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
371
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
372
296
        gzip --best --to-stdout plugins.d/usplash.8mandos \
373
297
                > $(MANDIR)/man8/usplash.8mandos.gz
374
298
        gzip --best --to-stdout plugins.d/splashy.8mandos \
375
299
                > $(MANDIR)/man8/splashy.8mandos.gz
376
300
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
377
301
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
378
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
379
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
380
302
 
381
303
install-client: install-client-nokey
382
304
# Post-installation stuff
388
310
 
389
311
uninstall-server:
390
312
        -rm --force $(PREFIX)/sbin/mandos \
391
 
                $(PREFIX)/sbin/mandos-ctl \
392
 
                $(PREFIX)/sbin/mandos-monitor \
393
313
                $(MANDIR)/man8/mandos.8.gz \
394
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
395
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
396
314
                $(MANDIR)/man5/mandos.conf.5.gz \
397
315
                $(MANDIR)/man5/mandos-clients.conf.5.gz
398
316
        update-rc.d -f mandos remove
410
328
                $(PREFIX)/lib/mandos/plugins.d/usplash \
411
329
                $(PREFIX)/lib/mandos/plugins.d/splashy \
412
330
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
413
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
414
331
                $(INITRAMFSTOOLS)/hooks/mandos \
415
332
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
416
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
333
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
334
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
417
335
                $(MANDIR)/man8/mandos-keygen.8.gz \
418
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
419
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
420
336
                $(MANDIR)/man8/password-prompt.8mandos.gz \
421
337
                $(MANDIR)/man8/usplash.8mandos.gz \
422
338
                $(MANDIR)/man8/splashy.8mandos.gz \
423
339
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
424
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
340
                $(MANDIR)/man8/mandos-client.8mandos.gz
425
341
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
426
342
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
427
343
        update-initramfs -k all -u
430
346
 
431
347
purge-server: uninstall-server
432
348
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
433
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
434
349
                $(DESTDIR)/etc/default/mandos \
435
350
                $(DESTDIR)/etc/init.d/mandos \
436
351
                $(DESTDIR)/var/run/mandos.pid