/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

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.4.1
 
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
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
43
##
49
44
 
50
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
59
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
56
        -DVERSION='"$(version)"'
62
 
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))
63
58
 
64
59
# Commands to format a DocBook <refentry> document into a manual page
65
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
70
65
        --param man.authors.section.enabled     0 \
71
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
67
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
75
 
        --local-file $(notdir $@) >/dev/null)
 
68
        $(MANPOST) $(notdir $@))
76
69
# DocBook-to-man post-processing to fix a '\n' escape bug
77
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
78
71
 
90
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'
91
84
 
92
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
93
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
94
 
        plugins.d/plymouth
 
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
95
87
CPROGS=plugin-runner $(PLUGINS)
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 \
 
88
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
89
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
99
90
        plugins.d/mandos-client.8mandos \
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
 
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
103
94
 
104
95
htmldocs=$(addsuffix .xhtml,$(DOCS))
105
96
 
126
117
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
127
118
        $(DOCBOOKTOHTML)
128
119
 
129
 
intro.8mandos: intro.xml common.ent legalnotice.xml
130
 
        $(DOCBOOKTOMAN)
131
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
132
 
        $(DOCBOOKTOHTML)
133
 
 
134
120
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
135
121
                legalnotice.xml
136
122
        $(DOCBOOKTOMAN)
145
131
                 legalnotice.xml
146
132
        $(DOCBOOKTOHTML)
147
133
 
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
 
 
162
134
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
163
135
                legalnotice.xml
164
136
        $(DOCBOOKTOMAN)
205
177
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
206
178
                $@)
207
179
 
208
 
mandos-monitor: Makefile
209
 
        $(strip $(SED) --in-place \
210
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
211
 
                $@)
212
 
 
213
180
mandos.lsm: Makefile
214
181
        $(strip $(SED) --in-place \
215
182
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
222
189
                $@)
223
190
 
224
191
plugins.d/mandos-client: plugins.d/mandos-client.c
225
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
226
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
192
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
193
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
227
194
 
228
195
.PHONY : all doc html clean distclean run-client run-server install \
229
196
        install-server install-client uninstall uninstall-server \
235
202
distclean: clean
236
203
mostlyclean: clean
237
204
maintainer-clean: clean
238
 
        -rm --force --recursive keydir confdir statedir
 
205
        -rm --force --recursive keydir confdir
239
206
 
240
207
check:  all
241
208
        ./mandos --check
255
222
        @echo "###################################################################"
256
223
        ./plugin-runner --plugin-dir=plugins.d \
257
224
                --config-file=plugin-runner.conf \
258
 
                --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 \
259
226
                $(CLIENTARGS)
260
227
 
261
228
# Used by run-client
265
232
 
266
233
# Run the server with a local config
267
234
run-server: confdir/mandos.conf confdir/clients.conf
268
 
        ./mandos --debug --no-dbus --configdir=confdir \
269
 
                --statedir=statedir $(SERVERARGS)
 
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)
270
243
 
271
244
# Used by run-server
272
245
confdir/mandos.conf: mandos.conf
277
250
        install --mode=u=rw $< $@
278
251
# Add a client password
279
252
        ./mandos-keygen --dir keydir --password >> $@
280
 
statedir:
281
 
        install --directory statedir
282
253
 
283
254
install: install-server install-client-nokey
284
255
 
289
260
 
290
261
install-server: doc
291
262
        install --directory $(CONFDIR)
292
 
        install --directory --mode=u=rwx --owner=$(USER) \
293
 
                --group=$(GROUP) $(STATEDIR)
294
263
        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
299
264
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
300
265
                mandos.conf
301
266
        install --mode=u=rw --target-directory=$(CONFDIR) \
302
267
                clients.conf
303
 
        install --mode=u=rw,go=r dbus-mandos.conf \
304
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
305
268
        install --mode=u=rwx,go=rx init.d-mandos \
306
269
                $(DESTDIR)/etc/init.d/mandos
307
270
        install --mode=u=rw,go=r default-mandos \
311
274
        fi
312
275
        gzip --best --to-stdout mandos.8 \
313
276
                > $(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
318
277
        gzip --best --to-stdout mandos.conf.5 \
319
278
                > $(MANDIR)/man5/mandos.conf.5.gz
320
279
        gzip --best --to-stdout mandos-clients.conf.5 \
328
287
                install --mode=u=rwx \
329
288
                        --directory "$(CONFDIR)/plugins.d"; \
330
289
        fi
331
 
        install --mode=u=rwx,go=rx --directory \
332
 
                "$(CONFDIR)/network-hooks.d"
333
290
        install --mode=u=rwx,go=rx \
334
291
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
335
292
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
349
306
        install --mode=u=rwxs,go=rx \
350
307
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
351
308
                plugins.d/askpass-fifo
352
 
        install --mode=u=rwxs,go=rx \
353
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
354
 
                plugins.d/plymouth
355
309
        install initramfs-tools-hook \
356
310
                $(INITRAMFSTOOLS)/hooks/mandos
357
311
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
363
317
                > $(MANDIR)/man8/mandos-keygen.8.gz
364
318
        gzip --best --to-stdout plugin-runner.8mandos \
365
319
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
320
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
321
                > $(MANDIR)/man8/password-prompt.8mandos.gz
366
322
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
367
323
                > $(MANDIR)/man8/mandos-client.8mandos.gz
368
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
369
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
370
324
        gzip --best --to-stdout plugins.d/usplash.8mandos \
371
325
                > $(MANDIR)/man8/usplash.8mandos.gz
372
326
        gzip --best --to-stdout plugins.d/splashy.8mandos \
373
327
                > $(MANDIR)/man8/splashy.8mandos.gz
374
328
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
375
329
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
376
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
377
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
378
330
 
379
331
install-client: install-client-nokey
380
332
# Post-installation stuff
386
338
 
387
339
uninstall-server:
388
340
        -rm --force $(PREFIX)/sbin/mandos \
389
 
                $(PREFIX)/sbin/mandos-ctl \
390
 
                $(PREFIX)/sbin/mandos-monitor \
391
341
                $(MANDIR)/man8/mandos.8.gz \
392
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
393
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
394
342
                $(MANDIR)/man5/mandos.conf.5.gz \
395
343
                $(MANDIR)/man5/mandos-clients.conf.5.gz
396
344
        update-rc.d -f mandos remove
408
356
                $(PREFIX)/lib/mandos/plugins.d/usplash \
409
357
                $(PREFIX)/lib/mandos/plugins.d/splashy \
410
358
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
411
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
412
359
                $(INITRAMFSTOOLS)/hooks/mandos \
413
360
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
414
361
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
362
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
415
363
                $(MANDIR)/man8/mandos-keygen.8.gz \
416
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
417
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
418
364
                $(MANDIR)/man8/password-prompt.8mandos.gz \
419
365
                $(MANDIR)/man8/usplash.8mandos.gz \
420
366
                $(MANDIR)/man8/splashy.8mandos.gz \
421
367
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
422
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
368
                $(MANDIR)/man8/mandos-client.8mandos.gz
423
369
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
424
370
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
425
371
        update-initramfs -k all -u
428
374
 
429
375
purge-server: uninstall-server
430
376
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
431
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
432
377
                $(DESTDIR)/etc/default/mandos \
433
378
                $(DESTDIR)/etc/init.d/mandos \
434
379
                $(DESTDIR)/var/run/mandos.pid