/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2011-09-18 15:59:05 UTC
  • mfrom: (24.1.179 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20110918155905-ngj2ig0yheralj1s
* DBUS-API: Document new "Expires" and "ExtendedTimeout" properties.
* README: Refer to the installed manual page more simply.
* mandos (Client.extended_timeout, Client.expires): New attributes.
  (Client.extended_timeout_milliseconds): New.
  (Client.__init__, Client.enable, Client.disable): Set new attributes.
  (Client.checked_ok): Take new "timeout" argument.
  (ClientDBus.expires): Transform into a property which sends a D-Bus
                        signal when changed.
  (ClientDBus._datetime_to_dbus): Return empty D-Bus string on None.
                                  All callers changed to use this.

  (ClientDBus.ApprovedByDefault_dbus_property,
  ClientDBus.ApprovalDelay_dbus_property,
  ClientDBus.ApprovalDuration_dbus_property,
  ClientDBus.Host_dbus_property, ClientDBus.Timeout_dbus_property,
  ClientDBus.Interval_dbus_property,
  ClientDBus.Checker_dbus_property): Bug fix: Only send D-Bus signal
                                     if new value is different.
  (ClientDBus.Timeout_dbus_property): Use new "expires" attribute.
  (ClientDBus.Expires_dbus_property,
  ClientDBus.ExtendedTimeout_dbus_property): New D-Bus properties.
  (ClientHandler.handle): Bump time using extended_timeout value.
  (main.client_defaults): Change default values of "timeout" and
                          "interval", added new default value for
                          "extended_timeout".
* mandos-clients.conf.xml (OPTIONS): Changed default values of
                                     "interval" and "timeout".  Add
                                     new "extended_timeout" option.
  (EXAMPLE): Updated default values.
* mandos-ctl: Show new "ExtendedTimeout" D-Bus property and change it
              using new "--extended-timeout" option.
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new
                                      "--extended-timeout" option.
* mandos-monitor (MandosClientWidget.update): Use new "Expires" D-Bus
                                              property.
* mandos.xml (DESCRIPTION): Add reference to intro(8mandos) manual
                            page.
  (CHECKING): Refer to the new "extended_timeout" option in
  clients.conf.

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.9
 
26
version=1.3.1
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)
69
49
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
70
50
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
71
51
        getconf LFS_LDFLAGS)
72
 
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
73
 
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
74
52
 
75
53
# Do not change these two
76
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
77
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
78
56
        -DVERSION='"$(version)"'
79
 
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))
80
58
 
81
59
# Commands to format a DocBook <refentry> document into a manual page
82
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
85
63
        --param make.single.year.ranges         1 \
86
64
        --param man.output.quietly              1 \
87
65
        --param man.authors.section.enabled     0 \
88
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
89
67
        $(notdir $<); \
90
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
91
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
92
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
93
 
        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'
94
71
 
95
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
96
73
        --param make.year.ranges                1 \
108
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
109
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
110
87
        plugins.d/plymouth
111
 
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
112
 
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
88
CPROGS=plugin-runner $(PLUGINS)
113
89
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
114
90
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
115
91
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
242
218
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
243
219
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
244
220
 
245
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
246
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
247
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
248
 
 
249
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
250
 
        check run-client run-server install install-html \
251
 
        install-server install-client-nokey install-client uninstall \
252
 
        uninstall-server uninstall-client purge purge-server \
253
 
        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
254
224
 
255
225
clean:
256
226
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
258
228
distclean: clean
259
229
mostlyclean: clean
260
230
maintainer-clean: clean
261
 
        -rm --force --recursive keydir confdir statedir
 
231
        -rm --force --recursive keydir confdir
262
232
 
263
233
check:  all
264
234
        ./mandos --check
265
 
        ./mandos-ctl --check
266
235
 
267
236
# Run the client with a local config and key
268
237
run-client: all keydir/seckey.txt keydir/pubkey.txt
271
240
        @echo "# ignored.  The messages are caused by not running as root, but   #"
272
241
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
273
242
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
274
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
275
 
        @echo "#                     setuid: Operation not permitted             #"
 
243
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
276
244
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
277
 
        @echo "# From mandos-client:                                             #"
278
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
279
 
        @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            #"
280
248
        @echo "###################################################################"
281
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
282
249
        ./plugin-runner --plugin-dir=plugins.d \
283
 
                --plugin-helper-dir=plugin-helpers \
284
250
                --config-file=plugin-runner.conf \
285
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
286
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
 
251
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
287
252
                $(CLIENTARGS)
288
253
 
289
254
# Used by run-client
292
257
        ./mandos-keygen --dir keydir --force
293
258
 
294
259
# Run the server with a local config
295
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
296
 
        ./mandos --debug --no-dbus --configdir=confdir \
297
 
                --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)
298
268
 
299
269
# Used by run-server
300
270
confdir/mandos.conf: mandos.conf
304
274
        install --directory confdir
305
275
        install --mode=u=rw $< $@
306
276
# Add a client password
307
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
308
 
statedir:
309
 
        install --directory statedir
 
277
        ./mandos-keygen --dir keydir --password >> $@
310
278
 
311
279
install: install-server install-client-nokey
312
280
 
317
285
 
318
286
install-server: doc
319
287
        install --directory $(CONFDIR)
320
 
        if install --directory --mode=u=rwx --owner=$(USER) \
321
 
                --group=$(GROUP) $(STATEDIR); then \
322
 
                :; \
323
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
324
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
325
 
        fi
326
288
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
327
289
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
328
290
                mandos-ctl
336
298
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
337
299
        install --mode=u=rwx,go=rx init.d-mandos \
338
300
                $(DESTDIR)/etc/init.d/mandos
339
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
340
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
341
 
        fi
342
301
        install --mode=u=rw,go=r default-mandos \
343
302
                $(DESTDIR)/etc/default/mandos
344
303
        if [ -z $(DESTDIR) ]; then \
354
313
                > $(MANDIR)/man5/mandos.conf.5.gz
355
314
        gzip --best --to-stdout mandos-clients.conf.5 \
356
315
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
357
 
        gzip --best --to-stdout intro.8mandos \
358
 
                > $(MANDIR)/man8/intro.8mandos.gz
359
316
 
360
317
install-client-nokey: all doc
361
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
318
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
362
319
        install --directory --mode=u=rwx $(KEYDIR) \
363
 
                $(LIBDIR)/mandos/plugins.d \
364
 
                $(LIBDIR)/mandos/plugin-helpers
365
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
320
                $(PREFIX)/lib/mandos/plugins.d
 
321
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
366
322
                install --mode=u=rwx \
367
323
                        --directory "$(CONFDIR)/plugins.d"; \
368
 
                install --directory "$(CONFDIR)/plugin-helpers"; \
369
324
        fi
370
 
        install --mode=u=rwx,go=rx --directory \
371
 
                "$(CONFDIR)/network-hooks.d"
372
325
        install --mode=u=rwx,go=rx \
373
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
326
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
374
327
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
375
328
                mandos-keygen
376
329
        install --mode=u=rwx,go=rx \
377
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
330
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
378
331
                plugins.d/password-prompt
379
332
        install --mode=u=rwxs,go=rx \
380
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
333
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
381
334
                plugins.d/mandos-client
382
335
        install --mode=u=rwxs,go=rx \
383
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
336
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
384
337
                plugins.d/usplash
385
338
        install --mode=u=rwxs,go=rx \
386
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
339
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
387
340
                plugins.d/splashy
388
341
        install --mode=u=rwxs,go=rx \
389
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
342
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
390
343
                plugins.d/askpass-fifo
391
344
        install --mode=u=rwxs,go=rx \
392
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
345
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
393
346
                plugins.d/plymouth
394
 
        install --mode=u=rwxs,go=rx \
395
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
396
 
                plugin-helpers/mandos-client-iprouteadddel
397
347
        install initramfs-tools-hook \
398
348
                $(INITRAMFSTOOLS)/hooks/mandos
399
349
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
444
394
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
445
395
                $(DESTDIR)/etc/crypttab
446
396
        -rm --force $(PREFIX)/sbin/mandos-keygen \
447
 
                $(LIBDIR)/mandos/plugin-runner \
448
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
449
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
450
 
                $(LIBDIR)/mandos/plugins.d/usplash \
451
 
                $(LIBDIR)/mandos/plugins.d/splashy \
452
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
453
 
                $(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 \
454
404
                $(INITRAMFSTOOLS)/hooks/mandos \
455
405
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
456
406
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
462
412
                $(MANDIR)/man8/splashy.8mandos.gz \
463
413
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
464
414
                $(MANDIR)/man8/plymouth.8mandos.gz \
465
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
466
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
415
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
416
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
467
417
        update-initramfs -k all -u
468
418
 
469
419
purge: purge-server purge-client
473
423
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
474
424
                $(DESTDIR)/etc/default/mandos \
475
425
                $(DESTDIR)/etc/init.d/mandos \
476
 
                $(SYSTEMD)/mandos.service \
477
 
                $(DESTDIR)/run/mandos.pid \
478
426
                $(DESTDIR)/var/run/mandos.pid
479
427
        -rmdir $(CONFDIR)
480
428