/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: 2010-09-12 02:51:19 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100912025119-7vvpqofpnbxf7i22
Rename all D-Bus properties to conform to D-Bus naming conventions;
all programs changed.

Also rename client setting "approved_delay" to "approval_delay", and
"approved_duration" to "approval_duration"; all programs changed.

* mandos (ClientDBus.NeedApproval): Bug fix: send an UInt64, not a
                                    float.
  (ClientDBus.ApprovedByDefault_dbus_property,
  ClientDBus.ApprovalDelay_dbus_property,
  ClientDBus.ApprovalDuration_dbus_property): Bug fix: send
                                              PropertyChanged signal.

Show diffs side-by-side

added added

removed removed

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