/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

Miscellaneous fixes prompted by lintian:

* debian/control (Conflicts): Changed to "Breaks:".
* debian/copyright: Updated format.
* debian/mandos-client.postinst: Use "set -e" instead of "#!/bin/sh -e".
* debian/mandos-client.postrm: - '' -
* debian/mandos.postinst: - '' -
* debian/mandos.prerm: Consistent magic.
* mandos: Small comment change.
* mandos-clients.conf.xml (OPTIONS/extended_timeout): Fix spelling.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
 
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
 
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
4
 
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
5
 
        -Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
 
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
 
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
6
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
7
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
8
 
        -Wconversion -Wlogical-op -Waggregate-return \
9
 
        -Wstrict-prototypes -Wold-style-definition \
10
 
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
 
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
12
 
        -Wvolatile-register-var -Woverlength-strings
 
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code
13
9
#DEBUG=-ggdb3
14
 
# 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>
15
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
16
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
17
14
LINK_FORTIFY_LD=-z relro -z now
23
20
LINK_FORTIFY += -pie
24
21
endif
25
22
#COVERAGE=--coverage
26
 
OPTIMIZE=-Os -fno-strict-aliasing
 
23
OPTIMIZE=-Os
27
24
LANGUAGE=-std=gnu99
28
25
htmldir=man
29
 
version=1.6.8
 
26
version=1.4.0
30
27
SED=sed
31
28
 
32
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
33
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
34
 
 
35
29
## Use these settings for a traditional /usr/local install
36
30
# PREFIX=$(DESTDIR)/usr/local
37
31
# CONFDIR=$(DESTDIR)/etc/mandos
38
32
# KEYDIR=$(DESTDIR)/etc/mandos/keys
39
33
# MANDIR=$(PREFIX)/man
40
34
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
41
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
42
 
# LIBDIR=$(PREFIX)/lib
43
35
##
44
36
 
45
37
## These settings are for a package-type install
48
40
KEYDIR=$(DESTDIR)/etc/keys/mandos
49
41
MANDIR=$(PREFIX)/share/man
50
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
51
 
STATEDIR=$(DESTDIR)/var/lib/mandos
52
 
LIBDIR=$(shell \
53
 
        for d in \
54
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
55
 
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
56
 
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
57
 
                        echo "$(DESTDIR)$$d"; \
58
 
                        break; \
59
 
                fi; \
60
 
        done)
61
43
##
62
44
 
63
 
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
64
 
 
65
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
66
46
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
67
47
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
71
51
        getconf LFS_LDFLAGS)
72
52
 
73
53
# Do not change these two
74
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
75
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
76
56
        -DVERSION='"$(version)"'
77
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
57
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
78
58
 
79
59
# Commands to format a DocBook <refentry> document into a manual page
80
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
83
63
        --param make.single.year.ranges         1 \
84
64
        --param man.output.quietly              1 \
85
65
        --param man.authors.section.enabled     0 \
86
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
87
67
        $(notdir $<); \
88
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
89
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
90
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
91
 
        fi >/dev/null)
 
68
        $(MANPOST) $(notdir $@))
 
69
# DocBook-to-man post-processing to fix a '\n' escape bug
 
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
92
71
 
93
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
94
73
        --param make.year.ranges                1 \
239
218
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
240
219
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
241
220
 
242
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
243
 
        check run-client run-server install install-html \
244
 
        install-server install-client-nokey install-client uninstall \
245
 
        uninstall-server uninstall-client purge purge-server \
246
 
        purge-client
 
221
.PHONY : all doc html clean distclean run-client run-server install \
 
222
        install-server install-client uninstall uninstall-server \
 
223
        uninstall-client purge purge-server purge-client
247
224
 
248
225
clean:
249
226
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
251
228
distclean: clean
252
229
mostlyclean: clean
253
230
maintainer-clean: clean
254
 
        -rm --force --recursive keydir confdir statedir
 
231
        -rm --force --recursive keydir confdir
255
232
 
256
233
check:  all
257
234
        ./mandos --check
258
 
        ./mandos-ctl --check
259
235
 
260
236
# Run the client with a local config and key
261
237
run-client: all keydir/seckey.txt keydir/pubkey.txt
264
240
        @echo "# ignored.  The messages are caused by not running as root, but   #"
265
241
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
266
242
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
267
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
268
 
        @echo "#                     setuid: Operation not permitted             #"
 
243
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
269
244
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
270
 
        @echo "# From mandos-client:                                             #"
271
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
272
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
245
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
246
        @echo "#                     seteuid: Operation not permitted            #"
 
247
        @echo "#                     klogctl: Operation not permitted            #"
273
248
        @echo "###################################################################"
274
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
275
249
        ./plugin-runner --plugin-dir=plugins.d \
276
250
                --config-file=plugin-runner.conf \
277
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
278
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
 
251
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
279
252
                $(CLIENTARGS)
280
253
 
281
254
# Used by run-client
284
257
        ./mandos-keygen --dir keydir --force
285
258
 
286
259
# Run the server with a local config
287
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
288
 
        ./mandos --debug --no-dbus --configdir=confdir \
289
 
                --statedir=statedir $(SERVERARGS)
 
260
run-server: confdir/mandos.conf confdir/clients.conf
 
261
        @echo "#################################################################"
 
262
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
 
263
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
 
264
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
 
265
        @echo "# server as root if you didn't also unpack and compile it thus. #"
 
266
        @echo "#################################################################"
 
267
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
290
268
 
291
269
# Used by run-server
292
270
confdir/mandos.conf: mandos.conf
296
274
        install --directory confdir
297
275
        install --mode=u=rw $< $@
298
276
# Add a client password
299
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
300
 
statedir:
301
 
        install --directory statedir
 
277
        ./mandos-keygen --dir keydir --password >> $@
302
278
 
303
279
install: install-server install-client-nokey
304
280
 
309
285
 
310
286
install-server: doc
311
287
        install --directory $(CONFDIR)
312
 
        if install --directory --mode=u=rwx --owner=$(USER) \
313
 
                --group=$(GROUP) $(STATEDIR); then \
314
 
                :; \
315
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
316
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
317
 
        fi
318
288
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
319
289
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
320
290
                mandos-ctl
328
298
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
329
299
        install --mode=u=rwx,go=rx init.d-mandos \
330
300
                $(DESTDIR)/etc/init.d/mandos
331
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
332
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
333
 
        fi
334
301
        install --mode=u=rw,go=r default-mandos \
335
302
                $(DESTDIR)/etc/default/mandos
336
303
        if [ -z $(DESTDIR) ]; then \
346
313
                > $(MANDIR)/man5/mandos.conf.5.gz
347
314
        gzip --best --to-stdout mandos-clients.conf.5 \
348
315
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
349
 
        gzip --best --to-stdout intro.8mandos \
350
 
                > $(MANDIR)/man8/intro.8mandos.gz
351
316
 
352
317
install-client-nokey: all doc
353
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
318
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
354
319
        install --directory --mode=u=rwx $(KEYDIR) \
355
 
                $(LIBDIR)/mandos/plugins.d
356
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
320
                $(PREFIX)/lib/mandos/plugins.d
 
321
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
357
322
                install --mode=u=rwx \
358
323
                        --directory "$(CONFDIR)/plugins.d"; \
359
324
        fi
360
 
        install --mode=u=rwx,go=rx --directory \
361
 
                "$(CONFDIR)/network-hooks.d"
362
325
        install --mode=u=rwx,go=rx \
363
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
326
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
364
327
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
365
328
                mandos-keygen
366
329
        install --mode=u=rwx,go=rx \
367
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
330
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
368
331
                plugins.d/password-prompt
369
332
        install --mode=u=rwxs,go=rx \
370
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
333
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
371
334
                plugins.d/mandos-client
372
335
        install --mode=u=rwxs,go=rx \
373
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
336
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
374
337
                plugins.d/usplash
375
338
        install --mode=u=rwxs,go=rx \
376
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
339
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
377
340
                plugins.d/splashy
378
341
        install --mode=u=rwxs,go=rx \
379
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
342
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
380
343
                plugins.d/askpass-fifo
381
344
        install --mode=u=rwxs,go=rx \
382
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
345
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
383
346
                plugins.d/plymouth
384
347
        install initramfs-tools-hook \
385
348
                $(INITRAMFSTOOLS)/hooks/mandos
431
394
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
432
395
                $(DESTDIR)/etc/crypttab
433
396
        -rm --force $(PREFIX)/sbin/mandos-keygen \
434
 
                $(LIBDIR)/mandos/plugin-runner \
435
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
436
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
437
 
                $(LIBDIR)/mandos/plugins.d/usplash \
438
 
                $(LIBDIR)/mandos/plugins.d/splashy \
439
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
440
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
397
                $(PREFIX)/lib/mandos/plugin-runner \
 
398
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
399
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
400
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
401
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
402
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
403
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
441
404
                $(INITRAMFSTOOLS)/hooks/mandos \
442
405
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
443
406
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
449
412
                $(MANDIR)/man8/splashy.8mandos.gz \
450
413
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
451
414
                $(MANDIR)/man8/plymouth.8mandos.gz \
452
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
453
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
415
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
416
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
454
417
        update-initramfs -k all -u
455
418
 
456
419
purge: purge-server purge-client
460
423
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
461
424
                $(DESTDIR)/etc/default/mandos \
462
425
                $(DESTDIR)/etc/init.d/mandos \
463
 
                $(SYSTEMD)/mandos.service \
464
 
                $(DESTDIR)/run/mandos.pid \
465
426
                $(DESTDIR)/var/run/mandos.pid
466
427
        -rmdir $(CONFDIR)
467
428