/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

  • Committer: Björn Påhlsson
  • Date: 2010-09-12 18:12:11 UTC
  • mto: (237.7.1 mandos)
  • mto: This revision was merged to the branch mainline in revision 270.
  • Revision ID: belorn@fukt.bsnet.se-20100912181211-wvkt0sk37zhx7tws
mandos-client: Added never ending loop for --connect
mandos-ctl: Better option parsing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
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
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var \
8
 
        -Wunreachable-code
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
 
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
 
10
# For info about _FORTIFY_SOURCE, see
 
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
11
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
12
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
13
14
LINK_FORTIFY_LD=-z relro -z now
19
20
LINK_FORTIFY += -pie
20
21
endif
21
22
#COVERAGE=--coverage
22
 
OPTIMIZE=-Os -fno-strict-aliasing
 
23
OPTIMIZE=-Os
23
24
LANGUAGE=-std=gnu99
24
25
htmldir=man
25
 
version=1.6.4
 
26
version=1.0.14
26
27
SED=sed
27
28
 
28
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
29
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
30
 
 
31
29
## Use these settings for a traditional /usr/local install
32
30
# PREFIX=$(DESTDIR)/usr/local
33
31
# CONFDIR=$(DESTDIR)/etc/mandos
34
32
# KEYDIR=$(DESTDIR)/etc/mandos/keys
35
33
# MANDIR=$(PREFIX)/man
36
34
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
37
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
38
 
# LIBDIR=$(PREFIX)/lib
39
35
##
40
36
 
41
37
## These settings are for a package-type install
44
40
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
41
MANDIR=$(PREFIX)/share/man
46
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
48
 
LIBDIR=$(shell \
49
 
        for d in \
50
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
51
 
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
52
 
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
53
 
                        echo "$(DESTDIR)$$d"; \
54
 
                        break; \
55
 
                fi; \
56
 
        done)
57
43
##
58
44
 
59
 
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
60
 
 
61
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
62
46
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
63
47
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
67
51
        getconf LFS_LDFLAGS)
68
52
 
69
53
# Do not change these two
70
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
71
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
72
56
        -DVERSION='"$(version)"'
73
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
74
58
 
75
59
# Commands to format a DocBook <refentry> document into a manual page
76
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
79
63
        --param make.single.year.ranges         1 \
80
64
        --param man.output.quietly              1 \
81
65
        --param man.authors.section.enabled     0 \
82
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
83
67
        $(notdir $<); \
84
 
        $(MANPOST) $(notdir $@);\
85
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
86
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
87
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
88
 
        fi >/dev/null)
 
68
        $(MANPOST) $(notdir $@))
89
69
# DocBook-to-man post-processing to fix a '\n' escape bug
90
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
91
71
 
103
83
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
104
84
 
105
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
106
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
107
 
        plugins.d/plymouth
 
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
108
87
CPROGS=plugin-runner $(PLUGINS)
109
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
110
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
111
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
88
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
89
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
112
90
        plugins.d/mandos-client.8mandos \
113
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
114
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
115
 
        plugins.d/plymouth.8mandos intro.8mandos
 
91
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
92
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
93
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
116
94
 
117
95
htmldocs=$(addsuffix .xhtml,$(DOCS))
118
96
 
139
117
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
140
118
        $(DOCBOOKTOHTML)
141
119
 
142
 
intro.8mandos: intro.xml common.ent legalnotice.xml
143
 
        $(DOCBOOKTOMAN)
144
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
145
 
        $(DOCBOOKTOHTML)
146
 
 
147
120
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
148
121
                legalnotice.xml
149
122
        $(DOCBOOKTOMAN)
158
131
                 legalnotice.xml
159
132
        $(DOCBOOKTOHTML)
160
133
 
161
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
162
 
                legalnotice.xml
163
 
        $(DOCBOOKTOMAN)
164
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
165
 
                 legalnotice.xml
166
 
        $(DOCBOOKTOHTML)
167
 
 
168
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
169
 
                legalnotice.xml
170
 
        $(DOCBOOKTOMAN)
171
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
172
 
                 legalnotice.xml
173
 
        $(DOCBOOKTOHTML)
174
 
 
175
134
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
176
135
                legalnotice.xml
177
136
        $(DOCBOOKTOMAN)
218
177
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
219
178
                $@)
220
179
 
221
 
mandos-monitor: Makefile
222
 
        $(strip $(SED) --in-place \
223
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
224
 
                $@)
225
 
 
226
180
mandos.lsm: Makefile
227
181
        $(strip $(SED) --in-place \
228
182
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
235
189
                $@)
236
190
 
237
191
plugins.d/mandos-client: plugins.d/mandos-client.c
238
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
239
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
192
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
193
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
240
194
 
241
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
242
 
        check run-client run-server install install-html \
243
 
        install-server install-client-nokey install-client uninstall \
244
 
        uninstall-server uninstall-client purge purge-server \
245
 
        purge-client
 
195
.PHONY : all doc html clean distclean run-client run-server install \
 
196
        install-server install-client uninstall uninstall-server \
 
197
        uninstall-client purge purge-server purge-client
246
198
 
247
199
clean:
248
200
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
250
202
distclean: clean
251
203
mostlyclean: clean
252
204
maintainer-clean: clean
253
 
        -rm --force --recursive keydir confdir statedir
 
205
        -rm --force --recursive keydir confdir
254
206
 
255
207
check:  all
256
208
        ./mandos --check
257
 
        ./mandos-ctl --check
258
209
 
259
210
# Run the client with a local config and key
260
211
run-client: all keydir/seckey.txt keydir/pubkey.txt
271
222
        @echo "###################################################################"
272
223
        ./plugin-runner --plugin-dir=plugins.d \
273
224
                --config-file=plugin-runner.conf \
274
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
225
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
275
226
                $(CLIENTARGS)
276
227
 
277
228
# Used by run-client
280
231
        ./mandos-keygen --dir keydir --force
281
232
 
282
233
# Run the server with a local config
283
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
284
 
        ./mandos --debug --no-dbus --configdir=confdir \
285
 
                --statedir=statedir $(SERVERARGS)
 
234
run-server: confdir/mandos.conf confdir/clients.conf
 
235
        @echo "#################################################################"
 
236
        @echo "# NOTE: Please IGNORE errors about \"No permission to bind to    #"
 
237
        @echo "# interface\" or \"Could not open file u'/var/run/mandos.pid'\" -  #"
 
238
        @echo "# they are harmless and are caused by the server not running as #"
 
239
        @echo "# root.  Do NOT run \"make run-server\" server as root if you did #"
 
240
        @echo "# not also unpack and compile it as root.                       #"
 
241
        @echo "#################################################################"
 
242
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
286
243
 
287
244
# Used by run-server
288
245
confdir/mandos.conf: mandos.conf
293
250
        install --mode=u=rw $< $@
294
251
# Add a client password
295
252
        ./mandos-keygen --dir keydir --password >> $@
296
 
statedir:
297
 
        install --directory statedir
298
253
 
299
254
install: install-server install-client-nokey
300
255
 
305
260
 
306
261
install-server: doc
307
262
        install --directory $(CONFDIR)
308
 
        if install --directory --mode=u=rwx --owner=$(USER) \
309
 
                --group=$(GROUP) $(STATEDIR); then \
310
 
                :; \
311
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
312
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
313
 
        fi
314
263
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
315
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
316
 
                mandos-ctl
317
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
318
 
                mandos-monitor
319
264
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
320
265
                mandos.conf
321
266
        install --mode=u=rw --target-directory=$(CONFDIR) \
322
267
                clients.conf
323
 
        install --mode=u=rw,go=r dbus-mandos.conf \
324
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
325
268
        install --mode=u=rwx,go=rx init.d-mandos \
326
269
                $(DESTDIR)/etc/init.d/mandos
327
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
328
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
329
 
        fi
330
270
        install --mode=u=rw,go=r default-mandos \
331
271
                $(DESTDIR)/etc/default/mandos
332
272
        if [ -z $(DESTDIR) ]; then \
334
274
        fi
335
275
        gzip --best --to-stdout mandos.8 \
336
276
                > $(MANDIR)/man8/mandos.8.gz
337
 
        gzip --best --to-stdout mandos-monitor.8 \
338
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
339
 
        gzip --best --to-stdout mandos-ctl.8 \
340
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
341
277
        gzip --best --to-stdout mandos.conf.5 \
342
278
                > $(MANDIR)/man5/mandos.conf.5.gz
343
279
        gzip --best --to-stdout mandos-clients.conf.5 \
344
280
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
345
 
        gzip --best --to-stdout intro.8mandos \
346
 
                > $(MANDIR)/man8/intro.8mandos.gz
347
281
 
348
282
install-client-nokey: all doc
349
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
283
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
350
284
        install --directory --mode=u=rwx $(KEYDIR) \
351
 
                $(LIBDIR)/mandos/plugins.d
352
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
285
                $(PREFIX)/lib/mandos/plugins.d
 
286
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
353
287
                install --mode=u=rwx \
354
288
                        --directory "$(CONFDIR)/plugins.d"; \
355
289
        fi
356
 
        install --mode=u=rwx,go=rx --directory \
357
 
                "$(CONFDIR)/network-hooks.d"
358
290
        install --mode=u=rwx,go=rx \
359
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
291
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
360
292
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
361
293
                mandos-keygen
362
294
        install --mode=u=rwx,go=rx \
363
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
295
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
364
296
                plugins.d/password-prompt
365
297
        install --mode=u=rwxs,go=rx \
366
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
298
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
367
299
                plugins.d/mandos-client
368
300
        install --mode=u=rwxs,go=rx \
369
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
301
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
370
302
                plugins.d/usplash
371
303
        install --mode=u=rwxs,go=rx \
372
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
304
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
373
305
                plugins.d/splashy
374
306
        install --mode=u=rwxs,go=rx \
375
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
307
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
376
308
                plugins.d/askpass-fifo
377
 
        install --mode=u=rwxs,go=rx \
378
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
379
 
                plugins.d/plymouth
380
309
        install initramfs-tools-hook \
381
310
                $(INITRAMFSTOOLS)/hooks/mandos
382
311
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
388
317
                > $(MANDIR)/man8/mandos-keygen.8.gz
389
318
        gzip --best --to-stdout plugin-runner.8mandos \
390
319
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
320
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
321
                > $(MANDIR)/man8/password-prompt.8mandos.gz
391
322
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
392
323
                > $(MANDIR)/man8/mandos-client.8mandos.gz
393
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
394
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
395
324
        gzip --best --to-stdout plugins.d/usplash.8mandos \
396
325
                > $(MANDIR)/man8/usplash.8mandos.gz
397
326
        gzip --best --to-stdout plugins.d/splashy.8mandos \
398
327
                > $(MANDIR)/man8/splashy.8mandos.gz
399
328
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
400
329
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
401
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
402
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
403
330
 
404
331
install-client: install-client-nokey
405
332
# Post-installation stuff
411
338
 
412
339
uninstall-server:
413
340
        -rm --force $(PREFIX)/sbin/mandos \
414
 
                $(PREFIX)/sbin/mandos-ctl \
415
 
                $(PREFIX)/sbin/mandos-monitor \
416
341
                $(MANDIR)/man8/mandos.8.gz \
417
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
418
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
419
342
                $(MANDIR)/man5/mandos.conf.5.gz \
420
343
                $(MANDIR)/man5/mandos-clients.conf.5.gz
421
344
        update-rc.d -f mandos remove
427
350
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
428
351
                $(DESTDIR)/etc/crypttab
429
352
        -rm --force $(PREFIX)/sbin/mandos-keygen \
430
 
                $(LIBDIR)/mandos/plugin-runner \
431
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
432
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
433
 
                $(LIBDIR)/mandos/plugins.d/usplash \
434
 
                $(LIBDIR)/mandos/plugins.d/splashy \
435
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
436
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
353
                $(PREFIX)/lib/mandos/plugin-runner \
 
354
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
355
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
356
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
357
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
358
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
437
359
                $(INITRAMFSTOOLS)/hooks/mandos \
438
360
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
439
361
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
362
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
440
363
                $(MANDIR)/man8/mandos-keygen.8.gz \
441
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
442
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
443
364
                $(MANDIR)/man8/password-prompt.8mandos.gz \
444
365
                $(MANDIR)/man8/usplash.8mandos.gz \
445
366
                $(MANDIR)/man8/splashy.8mandos.gz \
446
367
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
447
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
448
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
449
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
368
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
369
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
370
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
450
371
        update-initramfs -k all -u
451
372
 
452
373
purge: purge-server purge-client
453
374
 
454
375
purge-server: uninstall-server
455
376
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
456
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
457
377
                $(DESTDIR)/etc/default/mandos \
458
378
                $(DESTDIR)/etc/init.d/mandos \
459
 
                $(SYSTEMD)/mandos.service \
460
 
                $(DESTDIR)/run/mandos.pid \
461
379
                $(DESTDIR)/var/run/mandos.pid
462
380
        -rmdir $(CONFDIR)
463
381