/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: 2011-09-18 14:28:47 UTC
  • mto: (237.7.45 trunk)
  • mto: This revision was merged to the branch mainline in revision 286.
  • Revision ID: belorn@fukt.bsnet.se-20110918142847-wx9ru8lxxsc4timi
New feature:
extended timeout given once when password is sent to client

New dbus-API property (Expire):
Time and date when a client will be disabled

New dbus-API property (ExtendedTimeout):
The duration of extended timeout

Changed default values:
Timeout: Changed from 1 hour to 5 minutes
Interval: Changed from 5 minutes to 2 minutes

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
22
23
OPTIMIZE=-Os
23
24
LANGUAGE=-std=gnu99
24
25
htmldir=man
25
 
version=1.6.4
 
26
version=1.3.1
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=-Xlinker --as-needed $(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
 
238
218
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
239
219
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
240
220
 
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
 
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
246
224
 
247
225
clean:
248
226
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
250
228
distclean: clean
251
229
mostlyclean: clean
252
230
maintainer-clean: clean
253
 
        -rm --force --recursive keydir confdir statedir
 
231
        -rm --force --recursive keydir confdir
254
232
 
255
233
check:  all
256
234
        ./mandos --check
257
 
        ./mandos-ctl --check
258
235
 
259
236
# Run the client with a local config and key
260
237
run-client: all keydir/seckey.txt keydir/pubkey.txt
271
248
        @echo "###################################################################"
272
249
        ./plugin-runner --plugin-dir=plugins.d \
273
250
                --config-file=plugin-runner.conf \
274
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
251
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
275
252
                $(CLIENTARGS)
276
253
 
277
254
# Used by run-client
280
257
        ./mandos-keygen --dir keydir --force
281
258
 
282
259
# 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)
 
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)
286
268
 
287
269
# Used by run-server
288
270
confdir/mandos.conf: mandos.conf
293
275
        install --mode=u=rw $< $@
294
276
# Add a client password
295
277
        ./mandos-keygen --dir keydir --password >> $@
296
 
statedir:
297
 
        install --directory statedir
298
278
 
299
279
install: install-server install-client-nokey
300
280
 
305
285
 
306
286
install-server: doc
307
287
        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
288
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
315
289
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
316
290
                mandos-ctl
324
298
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
325
299
        install --mode=u=rwx,go=rx init.d-mandos \
326
300
                $(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
301
        install --mode=u=rw,go=r default-mandos \
331
302
                $(DESTDIR)/etc/default/mandos
332
303
        if [ -z $(DESTDIR) ]; then \
342
313
                > $(MANDIR)/man5/mandos.conf.5.gz
343
314
        gzip --best --to-stdout mandos-clients.conf.5 \
344
315
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
345
 
        gzip --best --to-stdout intro.8mandos \
346
 
                > $(MANDIR)/man8/intro.8mandos.gz
347
316
 
348
317
install-client-nokey: all doc
349
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
318
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
350
319
        install --directory --mode=u=rwx $(KEYDIR) \
351
 
                $(LIBDIR)/mandos/plugins.d
352
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
320
                $(PREFIX)/lib/mandos/plugins.d
 
321
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
353
322
                install --mode=u=rwx \
354
323
                        --directory "$(CONFDIR)/plugins.d"; \
355
324
        fi
356
 
        install --mode=u=rwx,go=rx --directory \
357
 
                "$(CONFDIR)/network-hooks.d"
358
325
        install --mode=u=rwx,go=rx \
359
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
326
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
360
327
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
361
328
                mandos-keygen
362
329
        install --mode=u=rwx,go=rx \
363
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
330
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
364
331
                plugins.d/password-prompt
365
332
        install --mode=u=rwxs,go=rx \
366
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
333
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
367
334
                plugins.d/mandos-client
368
335
        install --mode=u=rwxs,go=rx \
369
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
336
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
370
337
                plugins.d/usplash
371
338
        install --mode=u=rwxs,go=rx \
372
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
339
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
373
340
                plugins.d/splashy
374
341
        install --mode=u=rwxs,go=rx \
375
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
342
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
376
343
                plugins.d/askpass-fifo
377
344
        install --mode=u=rwxs,go=rx \
378
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
345
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
379
346
                plugins.d/plymouth
380
347
        install initramfs-tools-hook \
381
348
                $(INITRAMFSTOOLS)/hooks/mandos
427
394
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
428
395
                $(DESTDIR)/etc/crypttab
429
396
        -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 \
 
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 \
437
404
                $(INITRAMFSTOOLS)/hooks/mandos \
438
405
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
439
406
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
445
412
                $(MANDIR)/man8/splashy.8mandos.gz \
446
413
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
447
414
                $(MANDIR)/man8/plymouth.8mandos.gz \
448
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
449
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
415
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
416
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
450
417
        update-initramfs -k all -u
451
418
 
452
419
purge: purge-server purge-client
456
423
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
457
424
                $(DESTDIR)/etc/default/mandos \
458
425
                $(DESTDIR)/etc/init.d/mandos \
459
 
                $(SYSTEMD)/mandos.service \
460
 
                $(DESTDIR)/run/mandos.pid \
461
426
                $(DESTDIR)/var/run/mandos.pid
462
427
        -rmdir $(CONFDIR)
463
428