/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.4.1
 
18
version=1.0.3
27
19
SED=sed
28
20
 
29
21
## Use these settings for a traditional /usr/local install
42
34
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
43
35
##
44
36
 
45
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
37
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
38
GNUTLS_LIBS=$(shell libgnutls-config --libs)
47
39
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
48
40
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
49
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
50
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
51
 
        getconf LFS_LDFLAGS)
 
41
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
42
GPGME_LIBS=$(shell gpgme-config --libs)
52
43
 
53
44
# Do not change these two
54
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
46
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
47
        -DVERSION='"$(version)"'
57
 
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
48
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
58
49
 
59
50
# Commands to format a DocBook <refentry> document into a manual page
60
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
61
52
        --param man.charmap.use.subset          0 \
62
53
        --param make.year.ranges                1 \
63
54
        --param make.single.year.ranges         1 \
65
56
        --param man.authors.section.enabled     0 \
66
57
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
58
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@);\
69
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
70
 
        --local-file $(notdir $@) >/dev/null)
 
59
        $(MANPOST) $(notdir $@)
71
60
# DocBook-to-man post-processing to fix a '\n' escape bug
72
61
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
73
62
 
74
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
63
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
75
64
        --param make.year.ranges                1 \
76
65
        --param make.single.year.ranges         1 \
77
66
        --param man.output.quietly              1 \
79
68
        --param citerefentry.link               1 \
80
69
        --output $@ \
81
70
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
82
 
        $<; $(HTMLPOST) $@)
 
71
        $<; $(HTMLPOST) $@
83
72
# Fix citerefentry links
84
73
HTMLPOST=$(SED) --in-place \
85
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'
86
75
 
87
76
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
88
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
89
 
        plugins.d/plymouth
 
77
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
90
78
CPROGS=plugin-runner $(PLUGINS)
91
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
92
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
93
 
        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 \
94
81
        plugins.d/mandos-client.8mandos \
95
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
96
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
97
 
        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
98
85
 
99
86
htmldocs=$(addsuffix .xhtml,$(DOCS))
100
87
 
121
108
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
122
109
        $(DOCBOOKTOHTML)
123
110
 
124
 
intro.8mandos: intro.xml common.ent legalnotice.xml
125
 
        $(DOCBOOKTOMAN)
126
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
127
 
        $(DOCBOOKTOHTML)
128
 
 
129
111
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
130
112
                legalnotice.xml
131
113
        $(DOCBOOKTOMAN)
140
122
                 legalnotice.xml
141
123
        $(DOCBOOKTOHTML)
142
124
 
143
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
144
 
                legalnotice.xml
145
 
        $(DOCBOOKTOMAN)
146
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
147
 
                 legalnotice.xml
148
 
        $(DOCBOOKTOHTML)
149
 
 
150
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
151
 
                legalnotice.xml
152
 
        $(DOCBOOKTOMAN)
153
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
154
 
                 legalnotice.xml
155
 
        $(DOCBOOKTOHTML)
156
 
 
157
125
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
158
126
                legalnotice.xml
159
127
        $(DOCBOOKTOMAN)
181
149
 
182
150
# Update all these files with version number $(version)
183
151
common.ent: Makefile
184
 
        $(strip $(SED) --in-place \
185
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
186
 
                $@)
 
152
        $(SED) --in-place \
 
153
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
154
                $@
187
155
 
188
156
mandos: Makefile
189
 
        $(strip $(SED) --in-place \
 
157
        $(SED) --in-place \
190
158
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
191
 
                $@)
 
159
                $@
192
160
 
193
161
mandos-keygen: Makefile
194
 
        $(strip $(SED) --in-place \
 
162
        $(SED) --in-place \
195
163
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
196
 
                $@)
197
 
 
198
 
mandos-ctl: Makefile
199
 
        $(strip $(SED) --in-place \
200
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
201
 
                $@)
202
 
 
203
 
mandos-monitor: Makefile
204
 
        $(strip $(SED) --in-place \
205
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
206
 
                $@)
 
164
                $@
 
165
 
 
166
mandos-list: Makefile
 
167
        $(SED) --in-place \
 
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
169
                $@
207
170
 
208
171
mandos.lsm: Makefile
209
 
        $(strip $(SED) --in-place \
 
172
        $(SED) --in-place \
210
173
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
211
 
                $@)
212
 
        $(strip $(SED) --in-place \
 
174
                $@
 
175
        $(SED) --in-place \
213
176
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
214
 
                $@)
215
 
        $(strip $(SED) --in-place \
 
177
                $@
 
178
        $(SED) --in-place \
216
179
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
217
 
                $@)
 
180
                $@
218
181
 
219
 
plugins.d/mandos-client: plugins.d/mandos-client.c
220
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
221
 
                ) $(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 $@
222
185
 
223
186
.PHONY : all doc html clean distclean run-client run-server install \
224
187
        install-server install-client uninstall uninstall-server \
237
200
 
238
201
# Run the client with a local config and key
239
202
run-client: all keydir/seckey.txt keydir/pubkey.txt
240
 
        @echo "###################################################################"
241
 
        @echo "# The following error messages are harmless and can be safely     #"
242
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
243
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
244
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
245
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
246
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
247
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
248
 
        @echo "#                     seteuid: Operation not permitted            #"
249
 
        @echo "#                     klogctl: Operation not permitted            #"
250
 
        @echo "###################################################################"
251
203
        ./plugin-runner --plugin-dir=plugins.d \
252
204
                --config-file=plugin-runner.conf \
253
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
254
 
                $(CLIENTARGS)
 
205
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
255
206
 
256
207
# Used by run-client
257
208
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
260
211
 
261
212
# Run the server with a local config
262
213
run-server: confdir/mandos.conf confdir/clients.conf
263
 
        ./mandos --debug --no-dbus --configdir=confdir --no-restore \
264
 
        $(SERVERARGS)
 
214
        ./mandos --debug --configdir=confdir
265
215
 
266
216
# Used by run-server
267
217
confdir/mandos.conf: mandos.conf
283
233
install-server: doc
284
234
        install --directory $(CONFDIR)
285
235
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
286
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
287
 
                mandos-ctl
288
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
289
 
                mandos-monitor
290
236
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
291
237
                mandos.conf
292
238
        install --mode=u=rw --target-directory=$(CONFDIR) \
293
239
                clients.conf
294
 
        install --mode=u=rw,go=r dbus-mandos.conf \
295
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
296
240
        install --mode=u=rwx,go=rx init.d-mandos \
297
241
                $(DESTDIR)/etc/init.d/mandos
298
242
        install --mode=u=rw,go=r default-mandos \
302
246
        fi
303
247
        gzip --best --to-stdout mandos.8 \
304
248
                > $(MANDIR)/man8/mandos.8.gz
305
 
        gzip --best --to-stdout mandos-monitor.8 \
306
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
307
 
        gzip --best --to-stdout mandos-ctl.8 \
308
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
309
249
        gzip --best --to-stdout mandos.conf.5 \
310
250
                > $(MANDIR)/man5/mandos.conf.5.gz
311
251
        gzip --best --to-stdout mandos-clients.conf.5 \
338
278
        install --mode=u=rwxs,go=rx \
339
279
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
340
280
                plugins.d/askpass-fifo
341
 
        install --mode=u=rwxs,go=rx \
342
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
343
 
                plugins.d/plymouth
344
281
        install initramfs-tools-hook \
345
282
                $(INITRAMFSTOOLS)/hooks/mandos
346
283
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
347
284
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
348
285
        install initramfs-tools-script \
349
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
286
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
350
287
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
351
288
        gzip --best --to-stdout mandos-keygen.8 \
352
289
                > $(MANDIR)/man8/mandos-keygen.8.gz
353
290
        gzip --best --to-stdout plugin-runner.8mandos \
354
291
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
292
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
293
                > $(MANDIR)/man8/password-prompt.8mandos.gz
355
294
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
356
295
                > $(MANDIR)/man8/mandos-client.8mandos.gz
357
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
358
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
359
296
        gzip --best --to-stdout plugins.d/usplash.8mandos \
360
297
                > $(MANDIR)/man8/usplash.8mandos.gz
361
298
        gzip --best --to-stdout plugins.d/splashy.8mandos \
362
299
                > $(MANDIR)/man8/splashy.8mandos.gz
363
300
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
364
301
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
365
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
366
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
367
302
 
368
303
install-client: install-client-nokey
369
304
# Post-installation stuff
375
310
 
376
311
uninstall-server:
377
312
        -rm --force $(PREFIX)/sbin/mandos \
378
 
                $(PREFIX)/sbin/mandos-ctl \
379
 
                $(PREFIX)/sbin/mandos-monitor \
380
313
                $(MANDIR)/man8/mandos.8.gz \
381
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
382
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
383
314
                $(MANDIR)/man5/mandos.conf.5.gz \
384
315
                $(MANDIR)/man5/mandos-clients.conf.5.gz
385
316
        update-rc.d -f mandos remove
397
328
                $(PREFIX)/lib/mandos/plugins.d/usplash \
398
329
                $(PREFIX)/lib/mandos/plugins.d/splashy \
399
330
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
400
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
401
331
                $(INITRAMFSTOOLS)/hooks/mandos \
402
332
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
403
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
333
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
334
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
404
335
                $(MANDIR)/man8/mandos-keygen.8.gz \
405
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
406
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
407
336
                $(MANDIR)/man8/password-prompt.8mandos.gz \
408
337
                $(MANDIR)/man8/usplash.8mandos.gz \
409
338
                $(MANDIR)/man8/splashy.8mandos.gz \
410
339
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
411
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
340
                $(MANDIR)/man8/mandos-client.8mandos.gz
412
341
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
413
342
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
414
343
        update-initramfs -k all -u
417
346
 
418
347
purge-server: uninstall-server
419
348
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
420
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
421
349
                $(DESTDIR)/etc/default/mandos \
422
350
                $(DESTDIR)/etc/init.d/mandos \
423
351
                $(DESTDIR)/var/run/mandos.pid