/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

* plugins.d/password-prompt.c: Use environment variables and prompt
                               text from cryptsetup 1.1.
* plugins.d/password-prompt.xml (ENVIRONMENT): Document change in
                                               environment variables
                                               used.

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>
13
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
14
LINK_FORTIFY_LD=-z relro -z now
15
15
LINK_FORTIFY=
16
 
 
17
 
# If BROKEN_PIE is set, do not build with -pie
18
16
ifndef BROKEN_PIE
19
17
FORTIFY += -fPIE
 
18
LINK_FORTIFY_LD += -fPIE
20
19
LINK_FORTIFY += -pie
21
20
endif
22
21
#COVERAGE=--coverage
23
22
OPTIMIZE=-Os
24
23
LANGUAGE=-std=gnu99
25
24
htmldir=man
26
 
version=1.5.3
 
25
version=1.0.14
27
26
SED=sed
28
27
 
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
28
## Use these settings for a traditional /usr/local install
33
29
# PREFIX=$(DESTDIR)/usr/local
34
30
# CONFDIR=$(DESTDIR)/etc/mandos
35
31
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
32
# MANDIR=$(PREFIX)/man
37
33
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
34
##
40
35
 
41
36
## These settings are for a package-type install
44
39
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
40
MANDIR=$(PREFIX)/share/man
46
41
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
48
42
##
49
43
 
50
44
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
59
53
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
54
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
55
        -DVERSION='"$(version)"'
62
 
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
56
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
63
57
 
64
58
# Commands to format a DocBook <refentry> document into a manual page
65
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
59
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
66
60
        --param man.charmap.use.subset          0 \
67
61
        --param make.year.ranges                1 \
68
62
        --param make.single.year.ranges         1 \
70
64
        --param man.authors.section.enabled     0 \
71
65
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
66
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
75
 
        --local-file $(notdir $@) >/dev/null)
 
67
        $(MANPOST) $(notdir $@)
76
68
# DocBook-to-man post-processing to fix a '\n' escape bug
77
69
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
78
70
 
79
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
71
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
80
72
        --param make.year.ranges                1 \
81
73
        --param make.single.year.ranges         1 \
82
74
        --param man.output.quietly              1 \
84
76
        --param citerefentry.link               1 \
85
77
        --output $@ \
86
78
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
87
 
        $<; $(HTMLPOST) $@)
 
79
        $<; $(HTMLPOST) $@
88
80
# Fix citerefentry links
89
81
HTMLPOST=$(SED) --in-place \
90
82
        --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
83
 
92
84
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
93
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
94
 
        plugins.d/plymouth
 
85
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
95
86
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 \
 
87
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
88
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
99
89
        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
 
90
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
91
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
92
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
103
93
 
104
94
htmldocs=$(addsuffix .xhtml,$(DOCS))
105
95
 
126
116
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
127
117
        $(DOCBOOKTOHTML)
128
118
 
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
119
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
135
120
                legalnotice.xml
136
121
        $(DOCBOOKTOMAN)
145
130
                 legalnotice.xml
146
131
        $(DOCBOOKTOHTML)
147
132
 
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
133
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
163
134
                legalnotice.xml
164
135
        $(DOCBOOKTOMAN)
186
157
 
187
158
# Update all these files with version number $(version)
188
159
common.ent: Makefile
189
 
        $(strip $(SED) --in-place \
 
160
        $(SED) --in-place \
190
161
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
191
 
                $@)
 
162
                $@
192
163
 
193
164
mandos: Makefile
194
 
        $(strip $(SED) --in-place \
 
165
        $(SED) --in-place \
195
166
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
196
 
                $@)
 
167
                $@
197
168
 
198
169
mandos-keygen: Makefile
199
 
        $(strip $(SED) --in-place \
 
170
        $(SED) --in-place \
200
171
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
201
 
                $@)
 
172
                $@
202
173
 
203
174
mandos-ctl: Makefile
204
 
        $(strip $(SED) --in-place \
205
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
206
 
                $@)
207
 
 
208
 
mandos-monitor: Makefile
209
 
        $(strip $(SED) --in-place \
210
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
211
 
                $@)
 
175
        $(SED) --in-place \
 
176
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
177
                $@
212
178
 
213
179
mandos.lsm: Makefile
214
 
        $(strip $(SED) --in-place \
 
180
        $(SED) --in-place \
215
181
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
216
 
                $@)
217
 
        $(strip $(SED) --in-place \
 
182
                $@
 
183
        $(SED) --in-place \
218
184
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
219
 
                $@)
220
 
        $(strip $(SED) --in-place \
 
185
                $@
 
186
        $(SED) --in-place \
221
187
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
222
 
                $@)
 
188
                $@
223
189
 
224
 
plugins.d/mandos-client: plugins.d/mandos-client.c
225
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
226
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
190
plugins.d/mandos-client: plugins.d/mandos-client.o
 
191
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
192
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
227
193
 
228
194
.PHONY : all doc html clean distclean run-client run-server install \
229
195
        install-server install-client uninstall uninstall-server \
235
201
distclean: clean
236
202
mostlyclean: clean
237
203
maintainer-clean: clean
238
 
        -rm --force --recursive keydir confdir statedir
 
204
        -rm --force --recursive keydir confdir
239
205
 
240
206
check:  all
241
207
        ./mandos --check
242
208
 
243
209
# Run the client with a local config and key
244
210
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 "###################################################################"
256
211
        ./plugin-runner --plugin-dir=plugins.d \
257
212
                --config-file=plugin-runner.conf \
258
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
213
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
259
214
                $(CLIENTARGS)
260
215
 
261
216
# Used by run-client
265
220
 
266
221
# Run the server with a local config
267
222
run-server: confdir/mandos.conf confdir/clients.conf
268
 
        ./mandos --debug --no-dbus --configdir=confdir \
269
 
                --statedir=statedir $(SERVERARGS)
 
223
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
270
224
 
271
225
# Used by run-server
272
226
confdir/mandos.conf: mandos.conf
277
231
        install --mode=u=rw $< $@
278
232
# Add a client password
279
233
        ./mandos-keygen --dir keydir --password >> $@
280
 
statedir:
281
 
        install --directory statedir
282
234
 
283
235
install: install-server install-client-nokey
284
236
 
289
241
 
290
242
install-server: doc
291
243
        install --directory $(CONFDIR)
292
 
        install --directory --mode=u=rwx --owner=$(USER) \
293
 
                --group=$(GROUP) $(STATEDIR)
294
244
        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
245
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
300
246
                mandos.conf
301
247
        install --mode=u=rw --target-directory=$(CONFDIR) \
302
248
                clients.conf
303
 
        install --mode=u=rw,go=r dbus-mandos.conf \
304
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
305
249
        install --mode=u=rwx,go=rx init.d-mandos \
306
250
                $(DESTDIR)/etc/init.d/mandos
307
251
        install --mode=u=rw,go=r default-mandos \
311
255
        fi
312
256
        gzip --best --to-stdout mandos.8 \
313
257
                > $(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
258
        gzip --best --to-stdout mandos.conf.5 \
319
259
                > $(MANDIR)/man5/mandos.conf.5.gz
320
260
        gzip --best --to-stdout mandos-clients.conf.5 \
321
261
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
322
 
        gzip --best --to-stdout intro.8mandos \
323
 
                > $(MANDIR)/man8/intro.8mandos.gz
324
262
 
325
263
install-client-nokey: all doc
326
264
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
330
268
                install --mode=u=rwx \
331
269
                        --directory "$(CONFDIR)/plugins.d"; \
332
270
        fi
333
 
        install --mode=u=rwx,go=rx --directory \
334
 
                "$(CONFDIR)/network-hooks.d"
335
271
        install --mode=u=rwx,go=rx \
336
272
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
337
273
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
351
287
        install --mode=u=rwxs,go=rx \
352
288
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
353
289
                plugins.d/askpass-fifo
354
 
        install --mode=u=rwxs,go=rx \
355
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
356
 
                plugins.d/plymouth
357
290
        install initramfs-tools-hook \
358
291
                $(INITRAMFSTOOLS)/hooks/mandos
359
292
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
365
298
                > $(MANDIR)/man8/mandos-keygen.8.gz
366
299
        gzip --best --to-stdout plugin-runner.8mandos \
367
300
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
301
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
302
                > $(MANDIR)/man8/password-prompt.8mandos.gz
368
303
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
369
304
                > $(MANDIR)/man8/mandos-client.8mandos.gz
370
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
371
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
372
305
        gzip --best --to-stdout plugins.d/usplash.8mandos \
373
306
                > $(MANDIR)/man8/usplash.8mandos.gz
374
307
        gzip --best --to-stdout plugins.d/splashy.8mandos \
375
308
                > $(MANDIR)/man8/splashy.8mandos.gz
376
309
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
377
310
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
378
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
379
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
380
311
 
381
312
install-client: install-client-nokey
382
313
# Post-installation stuff
388
319
 
389
320
uninstall-server:
390
321
        -rm --force $(PREFIX)/sbin/mandos \
391
 
                $(PREFIX)/sbin/mandos-ctl \
392
 
                $(PREFIX)/sbin/mandos-monitor \
393
322
                $(MANDIR)/man8/mandos.8.gz \
394
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
395
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
396
323
                $(MANDIR)/man5/mandos.conf.5.gz \
397
324
                $(MANDIR)/man5/mandos-clients.conf.5.gz
398
325
        update-rc.d -f mandos remove
410
337
                $(PREFIX)/lib/mandos/plugins.d/usplash \
411
338
                $(PREFIX)/lib/mandos/plugins.d/splashy \
412
339
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
413
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
414
340
                $(INITRAMFSTOOLS)/hooks/mandos \
415
341
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
416
342
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
343
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
417
344
                $(MANDIR)/man8/mandos-keygen.8.gz \
418
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
419
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
420
345
                $(MANDIR)/man8/password-prompt.8mandos.gz \
421
346
                $(MANDIR)/man8/usplash.8mandos.gz \
422
347
                $(MANDIR)/man8/splashy.8mandos.gz \
423
348
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
424
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
349
                $(MANDIR)/man8/mandos-client.8mandos.gz
425
350
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
426
351
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
427
352
        update-initramfs -k all -u
430
355
 
431
356
purge-server: uninstall-server
432
357
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
433
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
434
358
                $(DESTDIR)/etc/default/mandos \
435
359
                $(DESTDIR)/etc/init.d/mandos \
436
360
                $(DESTDIR)/var/run/mandos.pid