/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: 2012-01-15 20:27:28 UTC
  • Revision ID: teddy@recompile.se-20120115202728-185929ww2r84s8xg
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New
                                                           property.
* mandos (Client.last_checker_status): Use -2 instead of None to match
                                       D-Bus property.  All users
                                       changed.
  (Client.checked_ok): Remove "timeout" argument and call
                       "self.bump_timeout()" instead.
  (Client.bump_timeout): New; separated out from "checked_ok".
  (ClientDBus.last_checker_status): Hook to a D-Bus property.
  (ClientDBus.LastCheckerStatus_dbus_property): New D-Bus property.
  (ClientHandler.handle): Call client.bump_timeout() instead of
                          client.checked_ok().

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>
17
17
# If BROKEN_PIE is set, do not build with -pie
18
18
ifndef BROKEN_PIE
19
19
FORTIFY += -fPIE
20
 
LINK_FORTIFY_LD += -fPIE
21
20
LINK_FORTIFY += -pie
22
21
endif
23
22
#COVERAGE=--coverage
24
23
OPTIMIZE=-Os
25
24
LANGUAGE=-std=gnu99
26
25
htmldir=man
27
 
version=1.0.14
 
26
version=1.5.2
28
27
SED=sed
29
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
 
30
32
## Use these settings for a traditional /usr/local install
31
33
# PREFIX=$(DESTDIR)/usr/local
32
34
# CONFDIR=$(DESTDIR)/etc/mandos
33
35
# KEYDIR=$(DESTDIR)/etc/mandos/keys
34
36
# MANDIR=$(PREFIX)/man
35
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
36
39
##
37
40
 
38
41
## These settings are for a package-type install
41
44
KEYDIR=$(DESTDIR)/etc/keys/mandos
42
45
MANDIR=$(PREFIX)/share/man
43
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
47
STATEDIR=$(DESTDIR)/var/lib/mandos
44
48
##
45
49
 
46
50
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
55
59
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
56
60
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
57
61
        -DVERSION='"$(version)"'
58
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
62
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
59
63
 
60
64
# Commands to format a DocBook <refentry> document into a manual page
61
65
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
66
70
        --param man.authors.section.enabled     0 \
67
71
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
68
72
        $(notdir $<); \
69
 
        $(MANPOST) $(notdir $@))
 
73
        $(MANPOST) $(notdir $@);\
 
74
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
 
75
        --local-file $(notdir $@) >/dev/null)
70
76
# DocBook-to-man post-processing to fix a '\n' escape bug
71
77
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
72
78
 
84
90
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
85
91
 
86
92
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
87
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
93
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
 
94
        plugins.d/plymouth
88
95
CPROGS=plugin-runner $(PLUGINS)
89
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
90
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
96
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
97
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
98
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
91
99
        plugins.d/mandos-client.8mandos \
92
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
93
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
94
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
100
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
 
101
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
 
102
        plugins.d/plymouth.8mandos intro.8mandos
95
103
 
96
104
htmldocs=$(addsuffix .xhtml,$(DOCS))
97
105
 
118
126
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
119
127
        $(DOCBOOKTOHTML)
120
128
 
 
129
intro.8mandos: intro.xml common.ent legalnotice.xml
 
130
        $(DOCBOOKTOMAN)
 
131
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
132
        $(DOCBOOKTOHTML)
 
133
 
121
134
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
122
135
                legalnotice.xml
123
136
        $(DOCBOOKTOMAN)
132
145
                 legalnotice.xml
133
146
        $(DOCBOOKTOHTML)
134
147
 
 
148
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
 
149
                legalnotice.xml
 
150
        $(DOCBOOKTOMAN)
 
151
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
 
152
                 legalnotice.xml
 
153
        $(DOCBOOKTOHTML)
 
154
 
 
155
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
 
156
                legalnotice.xml
 
157
        $(DOCBOOKTOMAN)
 
158
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
 
159
                 legalnotice.xml
 
160
        $(DOCBOOKTOHTML)
 
161
 
135
162
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
136
163
                legalnotice.xml
137
164
        $(DOCBOOKTOMAN)
178
205
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
179
206
                $@)
180
207
 
 
208
mandos-monitor: Makefile
 
209
        $(strip $(SED) --in-place \
 
210
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
211
                $@)
 
212
 
181
213
mandos.lsm: Makefile
182
214
        $(strip $(SED) --in-place \
183
215
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
190
222
                $@)
191
223
 
192
224
plugins.d/mandos-client: plugins.d/mandos-client.c
193
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
194
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
225
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
226
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
195
227
 
196
228
.PHONY : all doc html clean distclean run-client run-server install \
197
229
        install-server install-client uninstall uninstall-server \
203
235
distclean: clean
204
236
mostlyclean: clean
205
237
maintainer-clean: clean
206
 
        -rm --force --recursive keydir confdir
 
238
        -rm --force --recursive keydir confdir statedir
207
239
 
208
240
check:  all
209
241
        ./mandos --check
210
242
 
211
243
# Run the client with a local config and key
212
244
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
245
        @echo "###################################################################"
 
246
        @echo "# The following error messages are harmless and can be safely     #"
 
247
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
248
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
249
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
250
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
251
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
252
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
253
        @echo "#                     seteuid: Operation not permitted            #"
 
254
        @echo "#                     klogctl: Operation not permitted            #"
 
255
        @echo "###################################################################"
213
256
        ./plugin-runner --plugin-dir=plugins.d \
214
257
                --config-file=plugin-runner.conf \
215
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
258
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
216
259
                $(CLIENTARGS)
217
260
 
218
261
# Used by run-client
222
265
 
223
266
# Run the server with a local config
224
267
run-server: confdir/mandos.conf confdir/clients.conf
225
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
268
        ./mandos --debug --no-dbus --configdir=confdir \
 
269
                --statedir=statedir $(SERVERARGS)
226
270
 
227
271
# Used by run-server
228
272
confdir/mandos.conf: mandos.conf
233
277
        install --mode=u=rw $< $@
234
278
# Add a client password
235
279
        ./mandos-keygen --dir keydir --password >> $@
 
280
statedir:
 
281
        install --directory statedir
236
282
 
237
283
install: install-server install-client-nokey
238
284
 
243
289
 
244
290
install-server: doc
245
291
        install --directory $(CONFDIR)
 
292
        install --directory --mode=u=rwx --owner=$(USER) \
 
293
                --group=$(GROUP) $(STATEDIR)
246
294
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
295
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
296
                mandos-ctl
 
297
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
298
                mandos-monitor
247
299
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
248
300
                mandos.conf
249
301
        install --mode=u=rw --target-directory=$(CONFDIR) \
250
302
                clients.conf
 
303
        install --mode=u=rw,go=r dbus-mandos.conf \
 
304
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
251
305
        install --mode=u=rwx,go=rx init.d-mandos \
252
306
                $(DESTDIR)/etc/init.d/mandos
253
307
        install --mode=u=rw,go=r default-mandos \
257
311
        fi
258
312
        gzip --best --to-stdout mandos.8 \
259
313
                > $(MANDIR)/man8/mandos.8.gz
 
314
        gzip --best --to-stdout mandos-monitor.8 \
 
315
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
316
        gzip --best --to-stdout mandos-ctl.8 \
 
317
                > $(MANDIR)/man8/mandos-ctl.8.gz
260
318
        gzip --best --to-stdout mandos.conf.5 \
261
319
                > $(MANDIR)/man5/mandos.conf.5.gz
262
320
        gzip --best --to-stdout mandos-clients.conf.5 \
263
321
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
322
        gzip --best --to-stdout intro.8mandos \
 
323
                > $(MANDIR)/man8/intro.8mandos.gz
264
324
 
265
325
install-client-nokey: all doc
266
326
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
270
330
                install --mode=u=rwx \
271
331
                        --directory "$(CONFDIR)/plugins.d"; \
272
332
        fi
 
333
        install --mode=u=rwx,go=rx --directory \
 
334
                "$(CONFDIR)/network-hooks.d"
273
335
        install --mode=u=rwx,go=rx \
274
336
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
275
337
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
289
351
        install --mode=u=rwxs,go=rx \
290
352
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
291
353
                plugins.d/askpass-fifo
 
354
        install --mode=u=rwxs,go=rx \
 
355
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
356
                plugins.d/plymouth
292
357
        install initramfs-tools-hook \
293
358
                $(INITRAMFSTOOLS)/hooks/mandos
294
359
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
300
365
                > $(MANDIR)/man8/mandos-keygen.8.gz
301
366
        gzip --best --to-stdout plugin-runner.8mandos \
302
367
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
368
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
369
                > $(MANDIR)/man8/mandos-client.8mandos.gz
303
370
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
304
371
                > $(MANDIR)/man8/password-prompt.8mandos.gz
305
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
306
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
307
372
        gzip --best --to-stdout plugins.d/usplash.8mandos \
308
373
                > $(MANDIR)/man8/usplash.8mandos.gz
309
374
        gzip --best --to-stdout plugins.d/splashy.8mandos \
310
375
                > $(MANDIR)/man8/splashy.8mandos.gz
311
376
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
312
377
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
378
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
379
                > $(MANDIR)/man8/plymouth.8mandos.gz
313
380
 
314
381
install-client: install-client-nokey
315
382
# Post-installation stuff
321
388
 
322
389
uninstall-server:
323
390
        -rm --force $(PREFIX)/sbin/mandos \
 
391
                $(PREFIX)/sbin/mandos-ctl \
 
392
                $(PREFIX)/sbin/mandos-monitor \
324
393
                $(MANDIR)/man8/mandos.8.gz \
 
394
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
395
                $(MANDIR)/man8/mandos-ctl.8.gz \
325
396
                $(MANDIR)/man5/mandos.conf.5.gz \
326
397
                $(MANDIR)/man5/mandos-clients.conf.5.gz
327
398
        update-rc.d -f mandos remove
339
410
                $(PREFIX)/lib/mandos/plugins.d/usplash \
340
411
                $(PREFIX)/lib/mandos/plugins.d/splashy \
341
412
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
413
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
342
414
                $(INITRAMFSTOOLS)/hooks/mandos \
343
415
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
344
416
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
417
                $(MANDIR)/man8/mandos-keygen.8.gz \
345
418
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
346
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
419
                $(MANDIR)/man8/mandos-client.8mandos.gz
347
420
                $(MANDIR)/man8/password-prompt.8mandos.gz \
348
421
                $(MANDIR)/man8/usplash.8mandos.gz \
349
422
                $(MANDIR)/man8/splashy.8mandos.gz \
350
423
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
351
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
424
                $(MANDIR)/man8/plymouth.8mandos.gz \
352
425
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
353
426
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
354
427
        update-initramfs -k all -u
357
430
 
358
431
purge-server: uninstall-server
359
432
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
433
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
360
434
                $(DESTDIR)/etc/default/mandos \
361
435
                $(DESTDIR)/etc/init.d/mandos \
362
436
                $(DESTDIR)/var/run/mandos.pid